diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:45:49 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:45:49 +0300 |
| commit | f94a19e09ebcf51e3e6cd3437fe364b60755406f (patch) | |
| tree | fa4f585008c6f5aa7850b2f5128a681b0065fcdc /indra/newview/llstartup.cpp | |
| parent | d04a3b6d4e67dafa0b6dd8e88b752c5a929de5b0 (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
Merge downstream code and become version 3.8.3
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index e1d3c9efe0..965aad517d 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1879,6 +1879,11 @@ bool idle_startup() } display_startup(); + + // *TODO : Uncomment that line once the whole grid migrated to SLM and suppress it from LLAgent::handleTeleportFinished() (llagent.cpp) + //check_merchant_status(); + + display_startup(); if (gSavedSettings.getBOOL("HelpFloaterOpen")) { |