summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimnearbychathandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterimnearbychathandler.cpp')
-rw-r--r--indra/newview/llfloaterimnearbychathandler.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index b107188417..3f1fe50b73 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -528,7 +528,7 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
if (!gSavedSettings.getBOOL("ShowScriptErrors"))
return;
- if (gSavedSettings.getBOOL("ExternalWebsocketSyncEnable") && gSavedSettings.getBOOL("ExternalWebsocketForwardDebug"))
+ if (LLScriptEditorWSServer::isEnabled() && gSavedSettings.getBOOL("ExternalWebsocketForwardDebug"))
{
LLScriptEditorWSServer::ptr_t server = LLScriptEditorWSServer::getServer();
if (server)
@@ -556,8 +556,7 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
return;
}
}
- else if ((chat_msg.mChatType == CHAT_TYPE_OWNER) &&
- gSavedSettings.getBOOL("ExternalWebsocketSyncEnable") &&
+ else if ((chat_msg.mChatType == CHAT_TYPE_OWNER) && LLScriptEditorWSServer::isEnabled() &&
gSavedSettings.getBOOL("ExternalWebsocketForwardDebug"))
{
LLScriptEditorWSServer::ptr_t server = LLScriptEditorWSServer::getServer();