diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2012-06-07 00:59:05 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2012-06-07 00:59:05 +0300 |
| commit | d11f542ffefdc5db845028d5a260b5b0ad12dea6 (patch) | |
| tree | 3819d70dbbdd353298ea57f2398864e2e4ff27b5 /indra/newview/llstartup.cpp | |
| parent | 05d721cecfa0c20a6fd8498a18f36cde7014248e (diff) | |
CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P chat, after adding more participants.
- Added a parameter to LLAvatarActions::startConference() and LLIMMgr::addSession() to pass the uuid of a P2P IM floater which should be used to start a new conference in it.
- In LLChicletBar::sessionRemoved() we don't close the IM floater if it is going to be re-used for a new conference.
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 2f13ba5ab1..320a602916 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2153,7 +2153,6 @@ bool idle_startup() LLAgentPicksInfo::getInstance()->requestNumberOfPicks(); - LLIMFloater::initIMFloater(); display_startup(); return TRUE; |