summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-01 14:01:00 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-01 14:01:00 -0700
commitc179c687db4caba0d88a7be9e04c47d7f0e1952a (patch)
treed0819729d56d5221bb4829f8bf36c9e343ba74c5 /indra/newview/llavataractions.cpp
parent8e1a9e2813da6b9d5c17795b375098fb6a386ee1 (diff)
parentd54eded93ba270402349f5f337bbe12339255ece (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rwxr-xr-xindra/newview/llavataractions.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 42a0376774..a76dbcac53 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -897,6 +897,12 @@ void LLAvatarActions::inviteToGroup(const LLUUID& id)
}
}
+// static
+void LLAvatarActions::viewChatHistory(const LLUUID& id)
+{
+ LLFloaterReg::showInstance("preview_conversation", id, true);
+}
+
//== private methods ========================================================================================
// static