From a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 4 Mar 2008 16:59:57 +0000
Subject: svn merge -r 81304:81392
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge

QAR-343 - merge maint-ui-7 and maint-ui-8 to release
---
 indra/newview/lltracker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
index cc45b121ae..6938c62d84 100644
--- a/indra/newview/lltracker.cpp
+++ b/indra/newview/lltracker.cpp
@@ -607,7 +607,7 @@ void LLTracker::stopTrackingAvatar(BOOL clear_ui)
 	}
 
 	purgeBeaconText();
-	gFloaterWorldMap->clearAvatarSelection(clear_ui);
+	//gFloaterWorldMap->clearAvatarSelection(clear_ui);
 	mTrackingStatus = TRACKING_NOTHING;
 }
 
-- 
cgit v1.2.3