diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-14 16:47:43 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-14 16:47:43 -0700 |
| commit | c238027dd9917b1633ff5f16911fbdbe437f9a55 (patch) | |
| tree | 0cebf0fe916b1d0b02e48e73ac9918cc7fd9720e /indra/newview/llimfloatercontainer.cpp | |
| parent | b01ab3b9b2d55a8536894a049354b87bb1d71cdb (diff) | |
CHUI-139 : Use the Chat toolbar button to open and close the conversations multi floater. Force Nearby Conversation if floater is empty.
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 77bb103bda..c01a167169 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -27,6 +27,7 @@ #include "llviewerprecompiledheaders.h" +#include "llimfloater.h" #include "llimfloatercontainer.h" #include "llfloaterreg.h" @@ -86,7 +87,15 @@ BOOL LLIMFloaterContainer::postBuild() void LLIMFloaterContainer::onOpen(const LLSD& key) { LLMultiFloater::onOpen(key); -/* + if (getFloaterCount() == 0) + { + // If there's *no* conversation open so far, we force the opening of the nearby chat conversation + // *TODO: find a way to move this to XML as a default panel or something like that + LLSD name("chat_bar"); + LLSD key(""); + LLFloaterReg::toggleInstanceOrBringToFront(name,key); + } + /* if (key.isDefined()) { LLIMFloater* im_floater = LLIMFloater::findInstance(key.asUUID()); @@ -95,7 +104,7 @@ void LLIMFloaterContainer::onOpen(const LLSD& key) im_floater->openFloater(); } } -*/ + */ } // virtual |