Skip to content
Snippets Groups Projects
Commit d11f542f authored by Seth ProductEngine's avatar Seth ProductEngine
Browse files

CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P chat,... 

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.
parent 05d721ce
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 117 additions and 96 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment