summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.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/llinventorypanel.cpp
parentaaae230bb135b9e57edb12a7374c711fd7e4adb4 (diff)
parent7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff)
merge.
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 7e71ac90b4..12a2c370d2 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -759,7 +759,9 @@ bool LLInventoryPanel::beginIMSession()
S32 count = item_array.count();
if(count > 0)
{
- LLFloaterReg::showInstance("communicate");
+ //*TODO by what to replace that?
+ //LLFloaterReg::showInstance("communicate");
+
// create the session
LLAvatarTracker& at = LLAvatarTracker::instance();
LLUUID id;