summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-02-10 16:09:42 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-02-10 16:09:42 -0500
commitcc8b983398b66253d9331f3b9d6055f8b00998b9 (patch)
tree2c901fc33f6a390ef5b15c0446365b70074bbfa1 /indra/newview/llimfloater.cpp
parent662ce9b1fd6fcdf817e8fd825ce2c35e4fa52ca3 (diff)
parentda3ad612dffa422deabc5cc9afb775442f13bb45 (diff)
merge
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r--indra/newview/llimfloater.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 34ab541a8e..53cdfcc9b2 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -407,12 +407,7 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
}
}
- if (floater_container)
- {
- //selecting the panel resets a chiclet's counter
- floater_container->selectFloater(floater);
- floater_container->setVisible(TRUE);
- }
+ floater->openFloater(floater->getKey());
}
else
{