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/llworldmapmessage.cpp | |
parent | 648ce247d693daa0b9479286ea2acf4064fb2336 (diff) |
EXP-1459 FIX Places panel shown on logni when destination selected from login page
Diffstat (limited to 'indra/newview/llworldmapmessage.cpp')
-rw-r--r-- | indra/newview/llworldmapmessage.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp index 66d0d698ba..8307d32336 100644 --- a/indra/newview/llworldmapmessage.cpp +++ b/indra/newview/llworldmapmessage.cpp @@ -210,15 +210,14 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**) } // Handle the SLURL callback if any - if(LLWorldMapMessage::getInstance()->mSLURLCallback != NULL) + url_callback_t callback = LLWorldMapMessage::getInstance()->mSLURLCallback; + if(callback != NULL) { U64 handle = to_region_handle(x_world, y_world); // Check if we reached the requested region if ((LLStringUtil::compareInsensitive(LLWorldMapMessage::getInstance()->mSLURLRegionName, name)==0) || (LLWorldMapMessage::getInstance()->mSLURLRegionHandle == handle)) { - url_callback_t callback = LLWorldMapMessage::getInstance()->mSLURLCallback; - LLWorldMapMessage::getInstance()->mSLURLCallback = NULL; LLWorldMapMessage::getInstance()->mSLURLRegionName.clear(); LLWorldMapMessage::getInstance()->mSLURLRegionHandle = 0; |