From facf67ae3226105910c983a8fa8760414bf703e9 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Wed, 5 Dec 2007 23:43:56 +0000
Subject: EFFECTIVE MERGE: svn merge -r 71520:73420 
 svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE:
 svn merge -r 75074:75114
 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release

---
 indra/newview/lltracker.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/lltracker.cpp')

diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
index 4bab92269c..594ecb5591 100644
--- a/indra/newview/lltracker.cpp
+++ b/indra/newview/lltracker.cpp
@@ -639,6 +639,10 @@ void LLTracker::stopTrackingLocation(BOOL clear_ui)
 	mTrackingLocationType = LOCATION_NOTHING;
 }
 
+void LLTracker::clearFocus()
+{
+	instance()->mTrackingStatus = TRACKING_NOTHING;
+}
 
 void LLTracker::drawMarker(const LLVector3d& pos_global, const LLColor4& color)
 {
-- 
cgit v1.2.3