From a3f3ab7e113e44309461b26399d627814f0ce4f9 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 17 Apr 2008 02:56:14 +0000
Subject: QAR-449 Viewer 1.20 RC 1 merge Branch_1-20-Viewer -r 84432 : 84760 ->
 release

---
 indra/newview/llstartup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index f918403320..6cd4d90e5f 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2262,7 +2262,7 @@ BOOL idle_startup()
 		if(gFloaterWorldMap)
 		{
 			gFloaterWorldMap->observeInventory(&gInventory);
-			//gFloaterWorldMap->observeFriends();
+			gFloaterWorldMap->observeFriends();
 		}
 
 		gViewerWindow->showCursor();
-- 
cgit v1.2.3