summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-11 16:31:19 -0400
committerOz Linden <oz@lindenlab.com>2011-08-11 16:31:19 -0400
commitf452138f29fa58f618a8f0be5346fc06035c5943 (patch)
tree078b5e008c96636f55138783c9b4e68aedcb5beb /indra/newview/llfloaterworldmap.cpp
parent3e47d9aea9193b6073ab8cfd67a16a101ffcbdc0 (diff)
parentba475c35eba02b370088f8efb41edc21390cf4dc (diff)
merge changes for storm-1427
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
-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;