diff options
author | Rider Linden <rider@lindenlab.com> | 2017-11-30 11:42:49 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-11-30 11:42:49 -0800 |
commit | 1df10afa2a7802763330475e1a90547c3cff7c06 (patch) | |
tree | 8a8cdb8c02f1e18e8cfacefc1efbc2ab43c6157e /indra/newview/llcommandhandler.cpp | |
parent | d7dd10b88bc3fda88f6528ecc5936e4889f019f3 (diff) | |
parent | e3a2c5e3217ae74a0277f2e6d4e1e708fe398a1c (diff) |
Merge
Diffstat (limited to 'indra/newview/llcommandhandler.cpp')
-rw-r--r-- | indra/newview/llcommandhandler.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp index 5ea7efc045..76d965b1f1 100644 --- a/indra/newview/llcommandhandler.cpp +++ b/indra/newview/llcommandhandler.cpp @@ -134,7 +134,11 @@ bool LLCommandHandlerRegistry::dispatch(const std::string& cmd, { break; } - + //skip initial request from external browser before STATE_BROWSER_INIT + if (LLStartUp::getStartupState() == STATE_FIRST) + { + return true; + } cur_time = LLTimer::getElapsedSeconds(); if (cur_time < last_throttle_time + THROTTLE_PERIOD) { |