From ba475c35eba02b370088f8efb41edc21390cf4dc Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 5 Aug 2011 23:31:10 +0300
Subject: [PATCH] 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.
---
indra/newview/llfloaterworldmap.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index d5f0648f3b9..98a14f72dc8 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;
--
GitLab