diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-11-29 11:31:08 -0800 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-11-29 11:31:08 -0800 |
| commit | a12e282cd473d5b7fc3e23fdd8fdfed11cc88864 (patch) | |
| tree | cf07df2ae2219009bdc8337f4f9b4f1247fbd65d /indra/newview/llcommandhandler.cpp | |
| parent | 28f3b032076929bf595c34ab10666930c7ea1464 (diff) | |
| parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
merge changes for 5.0.9-release
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) { |