summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-08-05 23:31:10 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-08-05 23:31:10 +0300
commitba475c35eba02b370088f8efb41edc21390cf4dc (patch)
tree6a17b6ada45b1b9659c8f34f09337d6013c41a8f
parent812ad1b67924f8ab92400dacfeebaff93526d506 (diff)
STORM-1427 FIXED Fixed a debug assertion triggered in the world map floater.
Apparently, passing empty region name to the MapNameRequest makes server return empty name in MapBlockReply, which triggered the assertion.
-rwxr-xr-xindra/newview/llfloaterworldmap.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index d5f0648f3b..98a14f72dc 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -1221,6 +1221,12 @@ void LLFloaterWorldMap::onLocationCommit()
{ // Set the value in the UI if any spaces were removed
getChild<LLUICtrl>("location")->setValue(str);
}
+
+ // Don't try completing empty name (STORM-1427).
+ if (str.empty())
+ {
+ return;
+ }
LLStringUtil::toLower(str);
mCompletingRegionName = str;