diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-01 09:35:58 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-01 09:35:58 -0700 |
| commit | 40316f8431279d925bc677a7e2ef7b4d79bc843a (patch) | |
| tree | 218b97ae3d0173a9b8c106c09306aef03f42c7f6 /indra/newview/llcommandhandler.cpp | |
| parent | a4fef135b110045500d9afc1b558127bc2f5cd89 (diff) | |
| parent | 6c422a881499c0d7649a59db47905a584bbd2bc1 (diff) | |
Pulled merge to use xcode 7.
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; |