diff options
author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
---|---|---|
committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llfloaterworldmap.cpp | |
parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
-rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 365926863e..996e90ed8e 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -1222,6 +1222,14 @@ void LLFloaterWorldMap::onLocationCommit( void* userdata ) LLString str = self->childGetValue("location").asString(); + // Trim any leading and trailing spaces in the search target + LLString saved_str = str; + LLString::trim( str ); + if ( str != saved_str ) + { // Set the value in the UI if any spaces were removed + self->childSetValue("location", str); + } + LLString::toLower(str); gFloaterWorldMap->mCompletingRegionName = str; gWorldMap->mIsTrackingCommit = TRUE; |