summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-02-04 17:49:12 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2013-02-04 17:49:12 -0800
commitcfb8d6abcbefad02b7297dc1d513fb3395a8da26 (patch)
tree5dfcb1ff0dd7072d559fc0f762df67aaa92be0a8 /indra/newview
parentaef695dcef8eb5a8cf83b2d4732d38e817095fec (diff)
parente5c593682af3a4958316d7747d39f41e2a65e88c (diff)
merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 5acb0b6374..1cceb68e2a 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1591,6 +1591,11 @@ LLUUID LLIMMgr::computeSessionID(
session_id = other_participant_id ^ agent_id;
}
}
+
+ if (gAgent.isInGroup(session_id) && (session_id != other_participant_id))
+ {
+ llwarns << "Group session id different from group id: IM type = " << dialog << ", session id = " << session_id << ", group id = " << other_participant_id << llendl;
+ }
return session_id;
}