summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-05-12 11:37:46 +0200
committerGitHub <noreply@github.com>2020-05-12 11:37:46 +0200
commit02bcaa7a460b3ac607c9838b341f8a473d17656d (patch)
tree1236cfa1960b2c6ee629e433547dc6f0073c7acc /core
parent2f9ad38ba7983d371436a82b509a858cf09efcf9 (diff)
parentc6fbbdf15de5c86e057183a5d138c41558748cab (diff)
Merge pull request #38689 from Calinou/rename-ssl-certificate-setting
Rename SSL certificate bundle setting to clarify the "overriding" aspect
Diffstat (limited to 'core')
-rw-r--r--core/register_core_types.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index 23f549be1a..4cf7e45205 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -233,8 +233,8 @@ void register_core_settings() {
GLOBAL_DEF_RST("network/limits/packet_peer_stream/max_buffer_po2", (16));
ProjectSettings::get_singleton()->set_custom_property_info("network/limits/packet_peer_stream/max_buffer_po2", PropertyInfo(Variant::INT, "network/limits/packet_peer_stream/max_buffer_po2", PROPERTY_HINT_RANGE, "0,64,1,or_greater"));
- GLOBAL_DEF("network/ssl/certificates", "");
- ProjectSettings::get_singleton()->set_custom_property_info("network/ssl/certificates", PropertyInfo(Variant::STRING, "network/ssl/certificates", PROPERTY_HINT_FILE, "*.crt"));
+ GLOBAL_DEF("network/ssl/certificate_bundle_override", "");
+ ProjectSettings::get_singleton()->set_custom_property_info("network/ssl/certificate_bundle_override", PropertyInfo(Variant::STRING, "network/ssl/certificate_bundle_override", PROPERTY_HINT_FILE, "*.crt"));
}
void register_core_singletons() {