diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 01:15:46 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 01:15:46 +0000 |
| commit | 1db494f58ad378b8028c1f071196be82af5fe964 (patch) | |
| tree | fd9cb0ab556ce32aaeca8e524f26cb46f60794e4 /indra/newview/llimview.cpp | |
| parent | 61ae45fb80f5bccf0481659a4b16094f6c46047e (diff) | |
* Added a few safety checks to LLScrollContainer
* Minor change to LLIMView so that IM windows don't get hidden after they are displayed
* Changed default action for avatar list to be IM as per spec
* Fixed merge of home tab from avatar code.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index fa0ab0ea3f..6ad483a2f1 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1372,7 +1372,6 @@ LLUUID LLIMMgr::addSession( //LLFloaterReg::showInstance("communicate", session_id); // *NOTE: Is this right? Or should we only do it for // dialog == IM_NOTHING_SPECIAL and some group types? - LLIMFloater::show(session_id); // Only warn for regular IMs - not group IMs if( dialog == IM_NOTHING_SPECIAL ) @@ -1388,6 +1387,7 @@ LLUUID LLIMMgr::addSession( } //mTabContainer->selectTabPanel(panel); floater->setInputFocus(TRUE); + LLIMFloater::show(session_id); notifyObserverSessionAdded(floater->getSessionID(), name, other_participant_id); return floater->getSessionID(); } |