From 8016e73cc0a2a27062fae27e609535e002eef362 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 9 Jul 2009 22:30:15 +0000
Subject: svn merge -r126726:126727
 svn+ssh://svn.lindenlab.com/linden/branches/skinning/skinning-15/ DEV-35109 
 Nav bar does not record teleports taken by any method other than typing into
 nav bar DEV-35117  Hard to open local chat, needs bottom bar widget for now
 hiding test IM floaters

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

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

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index e5b05d9f51..9bf147584a 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2074,7 +2074,7 @@ void LLIMFloater::show(const LLUUID& session_id, S32 center_x)
 		floater->setVisible(false);
 	}
 
-	floater->setVisibleAndFrontmost(true);
+	//floater->setVisibleAndFrontmost(true);
 
 	floater->updateMessages(session_id);
 
-- 
cgit v1.3