diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-08-31 11:57:36 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-08-31 11:57:36 +0300 |
| commit | dab6788c42260135d298b619ff92a71838bba2b8 (patch) | |
| tree | a2bfbd3c4338bd2b611017bc25062a9ddae54015 /indra/newview/llfloaterconversationlog.cpp | |
| parent | ab37263a5cda14227724181c771ac1d3ef55f467 (diff) | |
CHUI-157 FIXED (Implement menu bar for conversation floater)
- Added View Nearby chat history option
- Also replaced menu item "Add Friend / Remove" with two separate menus: Add Friend and Remove Friend. So if user is a Friend the Remove Friend option would be shown there. If the user is not a friend, the Add Friend option would be shown.
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) |