diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-16 02:29:45 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-16 02:29:45 +0300 |
| commit | a30a2045f56909586aff5cb74a1e85dd010ad1ae (patch) | |
| tree | 9595f6d812a79319e32eca2e83aee9e2defc1ae5 /indra/newview/llcommandhandler.cpp | |
| parent | 9a24b487e2e0407d4bde6091eae020acb543b741 (diff) | |
| parent | c1e3f778cb377999edf49764088f3f23a2302afc (diff) | |
Merge
--HG--
branch : develop
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; |