summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterconversationpreview.h
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2012-08-31 11:57:36 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2012-08-31 11:57:36 +0300
commitdab6788c42260135d298b619ff92a71838bba2b8 (patch)
treea2bfbd3c4338bd2b611017bc25062a9ddae54015 /indra/newview/llfloaterconversationpreview.h
parentab37263a5cda14227724181c771ac1d3ef55f467 (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/llfloaterconversationpreview.h')
-rw-r--r--indra/newview/llfloaterconversationpreview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterconversationpreview.h b/indra/newview/llfloaterconversationpreview.h
index 5105ef3702..2246a44761 100644
--- a/indra/newview/llfloaterconversationpreview.h
+++ b/indra/newview/llfloaterconversationpreview.h
@@ -39,7 +39,7 @@ public:
virtual BOOL postBuild();
virtual void draw();
- virtual void onOpen(const LLSD& session_id);
+ virtual void onOpen(const LLSD& key);
private:
void onMoreHistoryBtnClick();