diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-09-30 01:25:49 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-09-30 01:25:49 +0300 |
| commit | 358b29060fc3caf8de212985b17686b4460cc6d9 (patch) | |
| tree | 8921d2d219d4d4443aaafc9cfe98daa9760d780f /indra/newview/llcommandhandler.cpp | |
| parent | c84fe50f18d39adf1bb712927a71628d343781d0 (diff) | |
| parent | 2d52b62e67cf46222396c724d00d2de874819197 (diff) | |
Merge downstream code, version 3.8.5
Diffstat (limited to 'indra/newview/llcommandhandler.cpp')
| -rwxr-xr-x | indra/newview/llcommandhandler.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp index 19dba3f917..5ea7efc045 100755 --- a/indra/newview/llcommandhandler.cpp +++ b/indra/newview/llcommandhandler.cpp @@ -30,6 +30,7 @@ #include "llcommandhandler.h" #include "llnotificationsutil.h" #include "llcommanddispatcherlistener.h" +#include "llstartup.h" #include "stringize.h" // system includes @@ -116,7 +117,11 @@ bool LLCommandHandlerRegistry::dispatch(const std::string& cmd, LL_WARNS_ONCE("SLURL") << "Blocked SLURL command from untrusted browser" << LL_ENDL; if (! slurl_blocked) { - LLNotificationsUtil::add("BlockedSLURL"); + if (LLStartUp::getStartupState() >= STATE_BROWSER_INIT) + { + // Note: commands can arrive before we initialize everything we need for Notification. + LLNotificationsUtil::add("BlockedSLURL"); + } slurl_blocked = true; } return true; @@ -138,7 +143,10 @@ bool LLCommandHandlerRegistry::dispatch(const std::string& cmd, LL_WARNS_ONCE("SLURL") << "Throttled SLURL command from untrusted browser" << LL_ENDL; if (! slurl_throttled) { - LLNotificationsUtil::add("ThrottledSLURL"); + if (LLStartUp::getStartupState() >= STATE_BROWSER_INIT) + { + LLNotificationsUtil::add("ThrottledSLURL"); + } slurl_throttled = true; } return true; |