summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchatterbox.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-29 17:12:57 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-29 17:12:57 -0800
commit04bfd00a5d8ae7326211d867af7c3f577ff06763 (patch)
treeb0547199d04dc7ccec94b451f05b5ce7e24e3703 /indra/newview/llfloaterchatterbox.cpp
parentaaae230bb135b9e57edb12a7374c711fd7e4adb4 (diff)
parent7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff)
merge.
Diffstat (limited to 'indra/newview/llfloaterchatterbox.cpp')
-rw-r--r--indra/newview/llfloaterchatterbox.cpp4
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();
- }
+ }*/
}
}