diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-08 16:07:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-08 16:07:56 -0400 |
| commit | 12bf89626d44184e332294d85bd2fc5ef39ec371 (patch) | |
| tree | f0a6b65625afb8905a493056efdd2aa357ee6147 | |
| parent | 553e5001e997890ce4374bf97968e760edcbfbfb (diff) | |
| parent | b46f89e2806a5f7a4d2b11304e4d285d2de32241 (diff) | |
merge changes for vwr-25753
| -rwxr-xr-x | indra/newview/llfloaterworldmap.cpp | 2 |
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( ) |