diff options
| author | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:02:14 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:02:14 -0700 |
| commit | 461550a8ff492dadd026d68949ef732d447bf592 (patch) | |
| tree | d03f59b0f663218b681abf124af9eef0dd44b8f6 /indra/newview/llfloaterconversationlog.cpp | |
| parent | 1aadf94fe44036d6012eb7d4f8a0b9288a719f37 (diff) | |
| parent | c2bb1a189c5f4c2367ee38e03371b28948e3ea81 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llfloaterconversationlog.cpp')
| -rw-r--r-- | indra/newview/llfloaterconversationlog.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterconversationlog.cpp b/indra/newview/llfloaterconversationlog.cpp index c77a9e74bb..4375ce5726 100644 --- a/indra/newview/llfloaterconversationlog.cpp +++ b/indra/newview/llfloaterconversationlog.cpp @@ -28,6 +28,7 @@ #include "llconversationloglist.h" #include "llfiltereditor.h" #include "llfloaterconversationlog.h" +#include "llfloaterreg.h" #include "llmenubutton.h" LLFloaterConversationLog::LLFloaterConversationLog(const LLSD& key) @@ -97,6 +98,10 @@ void LLFloaterConversationLog::onCustomAction (const LLSD& userdata) { mConversationLogList->toggleSortFriendsOnTop(); } + else if ("view_nearby_chat_history" == command_name) + { + LLFloaterReg::showInstance("preview_conversation", LLSD(LLUUID::null), true); + } } bool LLFloaterConversationLog::isActionEnabled(const LLSD& userdata) |