summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2009-11-12 20:23:43 +0200
committerAndrew Dyukov <adyukov@productengine.com>2009-11-12 20:23:43 +0200
commit74d5a6605bac7ae76889ce3697fc8f59d982d675 (patch)
tree1ac87e5348b17b69e6218ccef434ee83a88c6780 /indra/newview
parent978dd80c963911372b0d311fec01b9d4de279c11 (diff)
Fixed normal bug EXT-2375 (Nearby Chat: Click on object name spawns Person
Inspector instead of Object Inspector) --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llchathistory.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 43a1aeaefb..046e1d92dc 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -167,7 +167,15 @@ public:
void onHeaderPanelClick(S32 x, S32 y, MASK mask)
{
- LLFloaterReg::showInstance("inspect_avatar", LLSD().insert("avatar_id", mAvatarID));
+ if (mSourceType == CHAT_SOURCE_OBJECT)
+ {
+ LLFloaterReg::showInstance("inspect_object", LLSD().insert("object_id", mAvatarID));
+ }
+ else if (mSourceType == CHAT_SOURCE_AGENT)
+ {
+ LLFloaterReg::showInstance("inspect_avatar", LLSD().insert("avatar_id", mAvatarID));
+ }
+ //if chat source is system, you may add "else" here to define behaviour.
}
const LLUUID& getAvatarId () const { return mAvatarID;}