diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-11 12:18:47 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-11 12:18:47 -0700 |
| commit | 9df2e7e4cb11a3ca7fabc2a3c443564da18b9a13 (patch) | |
| tree | 29f0229aa5ad443ed36d56a2dca0102fd83c1447 /indra/newview/llstartup.cpp | |
| parent | 5a0025026cee93eb657290544b95eb00557ae5f1 (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
Merge
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")) { |