diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-03 16:57:25 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-03 16:57:25 -0700 |
| commit | 046e90a8f74f3c13107a7edc72e912799a5e62e9 (patch) | |
| tree | 9b2282a46ca626ecec094ecdce6ed75db40b28e3 | |
| parent | 11d2f5a2d7a1f38f0965ce9a1511ed6a19888212 (diff) | |
| parent | f2510ca0d629a2cd6cd85588698672f5a0c4e64a (diff) | |
merging in latest changes
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index a76dbcac53..248685b964 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -42,6 +42,7 @@ #include "llappviewer.h" // for gLastVersionChannel #include "llcachename.h" #include "llcallingcard.h" // for LLAvatarTracker +#include "llconversationlog.h" #include "llfloateravatarpicker.h" // for LLFloaterAvatarPicker #include "llfloatergroupinvite.h" #include "llfloatergroups.h" @@ -900,7 +901,17 @@ void LLAvatarActions::inviteToGroup(const LLUUID& id) // static void LLAvatarActions::viewChatHistory(const LLUUID& id) { - LLFloaterReg::showInstance("preview_conversation", id, true); + const std::vector<LLConversation>& conversations = LLConversationLog::instance().getConversations(); + std::vector<LLConversation>::const_iterator iter = conversations.begin(); + + for (; iter != conversations.end(); ++iter) + { + if (iter->getParticipantID() == id) + { + LLFloaterReg::showInstance("preview_conversation", iter->getSessionID(), true); + break; + } + } } //== private methods ======================================================================================== |