summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-09-28 17:38:34 -0700
committerMerov Linden <merov@lindenlab.com>2012-09-28 17:38:34 -0700
commitd1ada50b9e6f9a357d04498cf138208ee7653d7c (patch)
treece023fc35c03a105d023028798f2bc423cbe4426 /indra/newview/llavataractions.cpp
parent7fc33cc47fdc080bbc7674cf118011b689ba1485 (diff)
parent8b2ed2e2050fcb8836be120902f44417613adb13 (diff)
Mer ge pull from richard/viewer-chui
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