diff options
| author | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
| commit | 8f7ec64899c54dcee6caa0307510cc4003ba7bdd (patch) | |
| tree | 513093c8550e0baf567d10168b9f750ba869fc21 /indra/newview/llbottomtray.cpp | |
| parent | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (diff) | |
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index d84dd09812..963946e888 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -32,11 +32,14 @@ #include "llviewerprecompiledheaders.h" // must be first include #include "llbottomtray.h" + #include "llagent.h" #include "llchiclet.h" #include "llfloaterreg.h" #include "llflyoutbutton.h" +#include "llimpanel.h" #include "llkeyboard.h" +#include "lllineeditor.h" #include "llgesturemgr.h" #include "llanimationstates.h" #include "llmultigesture.h" @@ -233,7 +236,13 @@ void LLBottomTray::onChicletClick(LLUICtrl* ctrl) LLIMChiclet* chiclet = dynamic_cast<LLIMChiclet*>(ctrl); if (chiclet) { + // Until you can type into an IM Window and have a conversation, + // still show the old communicate window LLFloaterReg::showInstance("communicate", chiclet->getSessionId()); + // DISABLED IN VIEWER-2 BRANCH UNTIL FEATURE IS DONE -- James + //// Show after comm window so it is frontmost (and hence will not + //// auto-hide) + //LLIMFloater::show(chiclet->getSessionId()); } } |