diff options
| author | Richard Linden <none@none> | 2011-11-07 16:23:40 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-07 16:23:40 -0800 |
| commit | f4afd56f263816a7d767b29833cf62ae2eb51560 (patch) | |
| tree | 825444598ee6d2d07692c21fdc7942777588ce98 /indra/newview/llstartup.cpp | |
| parent | 648ce247d693daa0b9479286ea2acf4064fb2336 (diff) | |
EXP-1459 FIX Places panel shown on logni when destination selected from login page
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 9d8d1be0f5..66187f6b42 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2034,7 +2034,7 @@ bool idle_startup() show_debug_menus(); // Debug menu visiblity and First Use trigger // If we've got a startup URL, dispatch it - LLStartUp::dispatchURL(); + //LLStartUp::dispatchURL(); // Retrieve information about the land data // (just accessing this the first time will fetch it, @@ -2694,12 +2694,12 @@ void LLStartUp::cleanupNameCache() bool LLStartUp::dispatchURL() { // ok, if we've gotten this far and have a startup URL - if (!getStartSLURL().isValid()) + if (!getStartSLURL().isValid()) { return false; } - if(getStartSLURL().getType() != LLSLURL::APP) - { + if(getStartSLURL().getType() != LLSLURL::APP) + { // If we started with a location, but we're already // at that location, don't pop dialogs open. |