summaryrefslogtreecommitdiff
path: root/indra/newview/llcommandhandler.cpp
diff options
context:
space:
mode:
authorAnkur Ahlawat <anchor@lindenlab.com>2018-01-04 00:54:41 -0800
committerAnkur Ahlawat <anchor@lindenlab.com>2018-01-04 00:54:41 -0800
commitd4ce47b09122d1f76601ba402c2b9ad6bb504950 (patch)
tree2f9a4aca02618d53d31ac62625645f89fb30c52f /indra/newview/llcommandhandler.cpp
parent93100236ae34eaa9cd3fa314e7e770339c13eba7 (diff)
parent1693ccba58eef676df1f91e50627545ac35bb819 (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llcommandhandler.cpp')
-rw-r--r--indra/newview/llcommandhandler.cpp6
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)
{