summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.cpp
diff options
context:
space:
mode:
authorAaron Stone <stone@lindenlab.com>2011-07-12 15:52:14 -0700
committerAaron Stone <stone@lindenlab.com>2011-07-12 15:52:14 -0700
commit450b64981c878f558b597a2855bc18318555a532 (patch)
treed84598caf68980baa4eb3f058ada5b3ffb1c4dff /indra/newview/llfloaterworldmap.cpp
parent42daa3497b6626cbb5f32ba54162558cd025069b (diff)
parent44c7c6feaa824f4049d326965cb066e76ebefee3 (diff)
Merge for STORM-1482
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
-rwxr-xr-xindra/newview/llfloaterworldmap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index b3910982d1..eb3c7ee469 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -1070,7 +1070,7 @@ void LLFloaterWorldMap::onComboTextEntry()
// Reset the tracking whenever we start typing into any of the search fields,
// so that hitting <enter> does an auto-complete versus teleporting us to the
// previously selected landmark/friend.
- LLTracker::clearFocus();
+ LLTracker::stopTracking(NULL);
}
void LLFloaterWorldMap::onSearchTextEntry( )