diff options
| -rw-r--r-- | indra/newview/app_settings/types_lua_default.llsd | 8 | ||||
| -rw-r--r-- | indra/newview/llscripteditorws.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llscripteditorws.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/app_settings/types_lua_default.llsd b/indra/newview/app_settings/types_lua_default.llsd index ab812ef226..5881df5ba5 100644 --- a/indra/newview/app_settings/types_lua_default.llsd +++ b/indra/newview/app_settings/types_lua_default.llsd @@ -419,7 +419,7 @@ </map> <map> <key>name</key> - <string>outher</string> + <string>other</string> <key>type</key> <string>integer</string> </map> @@ -440,7 +440,7 @@ </map> <map> <key>name</key> - <string>outher</string> + <string>other</string> <key>type</key> <string>number</string> </map> @@ -464,7 +464,7 @@ </map> <map> <key>name</key> - <string>outher</string> + <string>other</string> <key>type</key> <string>integer</string> </map> @@ -485,7 +485,7 @@ </map> <map> <key>name</key> - <string>outher</string> + <string>other</string> <key>type</key> <string>number</string> </map> diff --git a/indra/newview/llscripteditorws.cpp b/indra/newview/llscripteditorws.cpp index 53ef1d4dc2..cecac23383 100644 --- a/indra/newview/llscripteditorws.cpp +++ b/indra/newview/llscripteditorws.cpp @@ -83,7 +83,7 @@ void LLScriptEditorWSServer::onStarted() auto server = that.lock(); if (server && server->isRunning()) { - server->broadcastLangugeChange(); + server->broadcastLanguageChange(); } }); } @@ -150,15 +150,15 @@ void LLScriptEditorWSServer::unsubscribeEditor(const std::string &script_id) auto it = mSubscriptions.find(script_id); if (it != mSubscriptions.end()) { - mSubscriptions.erase(it); S32 connection_id = it->second.mConnectionID; + auto connection = it->second.mConnection.lock(); + mSubscriptions.erase(it); ptrdiff_t count = std::count_if(mSubscriptions.begin(), mSubscriptions.end(), [connection_id](const auto& pair) { return pair.second.mConnectionID == connection_id; }); - auto connection = it->second.mConnection.lock(); if (connection && !count) { // We have removed the last subscription, close the connection - LL_DEBUGS("ScriptEditorWS") << "Closing connection ID " << it->second.mConnectionID << + LL_DEBUGS("ScriptEditorWS") << "Closing connection ID " << connection_id << " as last subscription was removed" << LL_ENDL; connection->sendDisconnect(LLScriptEditorWSConnection::REASON_EDITOR_CLOSED, "Editor closed"); } diff --git a/indra/newview/llscripteditorws.h b/indra/newview/llscripteditorws.h index 3ed23a0b7e..1c8745001b 100644 --- a/indra/newview/llscripteditorws.h +++ b/indra/newview/llscripteditorws.h @@ -188,7 +188,7 @@ protected: void setupConnectionMethods(LLJSONRPCConnection::ptr_t connection) override; - void broadcastLangugeChange(); + void broadcastLanguageChange(); LLSD handleLanguageIdRequest() const; LLSD handleSyntaxRequest(const LLSD ¶ms) const; |