summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2017-08-08 19:04:18 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2017-08-08 19:04:18 +0300
commit902cfb7a2266929eccf5ec1cef960b14771e1eea (patch)
tree10e1c6f331b5341a09e3de4f1c6c7ffed01380ea /indra/newview/llstartup.cpp
parent6302b0a9c71c5d83d3d7e76cb01c2c401bac7afb (diff)
MAINT-7671 display_startup() was called twice per frame on login screen
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 1a480b1838..fcde03244a 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -830,7 +830,8 @@ bool idle_startup()
// Don't do anything. Wait for the login view to call the login_callback,
// which will push us to the next state.
- display_startup();
+
+ // display() function will be the one to run display_startup()
// Sleep so we don't spin the CPU
ms_sleep(1);
return FALSE;