summaryrefslogtreecommitdiff
path: root/indra/newview/llimpanel.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2009-07-09 22:30:15 +0000
committerLeyla Farazha <leyla@lindenlab.com>2009-07-09 22:30:15 +0000
commit8016e73cc0a2a27062fae27e609535e002eef362 (patch)
tree2275ae830416ccc606e0c0c576445c50b310222f /indra/newview/llimpanel.cpp
parent4cbf65be95dfb2320642c018b15a904075283339 (diff)
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
Diffstat (limited to 'indra/newview/llimpanel.cpp')
-rw-r--r--indra/newview/llimpanel.cpp2
1 files changed, 1 insertions, 1 deletions
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);