Merge pull request #6043 from secondlife/rider/option_fix

Two issues.

1 files changed, 15 insertions, 6 deletions

diff --git a/indra/newview/llscripteditorws.cpp b/indra/newview/llscripteditorws.cpp
index e0bf9b0b61..17ebd03ed2 100644
--- a/indra/newview/llscripteditorws.cpp
+++ b/indra/newview/llscripteditorws.cpp
@@ -156,11 +156,8 @@ namespace
         }
         return std::string(s);
     }
-}
-
-LLCachedControl<bool> LLScriptEditorWSServer::sEnableScriptEditorWS(gSavedSettings, "ExternalWebsocketSyncEnable", false);
-LLCachedControl<bool> LLScriptEditorWSServer::sTightIntegration(gSavedSettings, "ExternalEditorTightIntegration", false);
 
+}
 
 class LLPublishedPrimListener : public LLVOInventoryListener
 {
@@ -203,8 +200,8 @@ private:
 };
 
 //========================================================================
-LLScriptEditorWSServer::LLScriptEditorWSServer(const std::string& name, U16 port, bool local_only)
-    : LLJSONRPCServer(name, port, local_only)
+LLScriptEditorWSServer::LLScriptEditorWSServer(const std::string& name, U16 port, bool local_only):
+    LLJSONRPCServer(name, port, local_only)
 {
     LL_INFOS("ScriptEditorWS") << "Created JSON-RPC script editor server: " << name
                                << " on port " << port << LL_ENDL;
@@ -221,6 +218,18 @@ LLScriptEditorWSServer::ptr_t LLScriptEditorWSServer::getServer()
             wsmgr.findServerByName(LLScriptEditorWSServer::DEFAULT_SERVER_NAME));
 }
 
+bool LLScriptEditorWSServer::isEnabled()
+{
+    static LLCachedControl<bool> OPT_ENABLESCRIPTEDITORWS(gSavedSettings, "ExternalWebsocketSyncEnable", false);
+    return OPT_ENABLESCRIPTEDITORWS;
+}
+
+bool LLScriptEditorWSServer::isTightIntegration()
+{
+    static LLCachedControl<bool> OPT_TIGHTINTEGRATION(gSavedSettings, "ExternalWebsocketSyncTightIntegration", false);
+    return OPT_TIGHTINTEGRATION;
+}
+
 LLScriptEditorWSServer::ptr_t LLScriptEditorWSServer::ensureServerRunning()
 {
     if (!LLScriptEditorWSServer::isEnabled())