summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-15 14:51:21 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-15 14:51:21 -0400
commit832d972fe86325bfafad542c7c548dbecaf5ee65 (patch)
tree85d0a25e92646ebbc8f0cf5ee02da13573334233 /indra/newview/llfloaterworldmap.cpp
parent5c0df02df5abdadbf17235ae5d7208963c25f1ce (diff)
parentb21e63cc1260b1b8db87f52fb9b7a2f80b055327 (diff)
merge
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;