diff options
| author | callum_linden <none@none> | 2015-08-04 15:47:37 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-08-04 15:47:37 -0700 |
| commit | 230bc8614765c0973fb91bca68238b9abcd12adf (patch) | |
| tree | 8ccde7ba65ba2eb2d964c9e44e4a2ad6653111b2 /indra/newview/llstartup.cpp | |
| parent | a75a4e2a4f0b8bc65aa45368326fce0e6635c4ac (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
Merge with viewer release
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 d7bfd22cc9..6622fa7d9c 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1880,6 +1880,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")) { |