summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-29 12:09:37 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-29 12:09:37 -0800
commite2612effbe463cd89853d3d6a047b3aa7e275975 (patch)
tree148fb7fb1bdbf84c148d8ccb6496a6fba7ef9afb /indra/newview/llinventorypanel.cpp
parent5a34cf1af83314774f11b0d24279794794bc9147 (diff)
parentfab60b8c05a89498bd8efeafdea8acfa5f94f06c (diff)
merge from viewer2
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;