summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-07-08 18:26:08 -0700
committerDon Kjer <don@lindenlab.com>2011-07-08 18:26:08 -0700
commite63dd834ab84d740b242686d6e5315f7b47d03da (patch)
tree826c36a664dc609dc49c203d760b44f5abe8f514 /indra/newview/llfloaterworldmap.cpp
parentb9d6b5ef9a9797709397be983ec74c30cd1e0ce2 (diff)
parent187bc5211437718016a22e60c7b5ed29823c8510 (diff)
Merge viewer-development -> mesh-development
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( )