diff options
author | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
---|---|---|
committer | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
commit | f6a59081a7959e21f952a93bc3809315f2fa361e (patch) | |
tree | d77373c86810e505892cfb483001fe535201db46 /indra/newview/llfloaterchatterbox.cpp | |
parent | b8856efd5ff0e4899bb369dfd0815e824cd3a432 (diff) | |
parent | 682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff) |
Merge in latest viewer-2-0 changes.
Diffstat (limited to 'indra/newview/llfloaterchatterbox.cpp')
-rw-r--r-- | indra/newview/llfloaterchatterbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterchatterbox.cpp b/indra/newview/llfloaterchatterbox.cpp index 84b423399e..774caaec90 100644 --- a/indra/newview/llfloaterchatterbox.cpp +++ b/indra/newview/llfloaterchatterbox.cpp @@ -216,11 +216,11 @@ void LLFloaterChatterBox::onOpen(const LLSD& key) } else if (key.isDefined()) { - LLFloaterIMPanel* impanel = gIMMgr->findFloaterBySession(key.asUUID()); + /*LLFloaterIMPanel* impanel = gIMMgr->findFloaterBySession(key.asUUID()); if (impanel) { impanel->openFloater(); - } + }*/ } } |