diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
commit | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch) | |
tree | c6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/newview/llimfloater.cpp | |
parent | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff) | |
parent | 465a3356a2f32362837d5231a21b9151f45f890b (diff) |
Merge
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r-- | indra/newview/llimfloater.cpp | 7 |
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 { |