summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationview.h
diff options
context:
space:
mode:
authorprep@lindenlab.com <prep@lindenlab.com>2013-03-20 17:53:51 -0500
committerprep@lindenlab.com <prep@lindenlab.com>2013-03-20 17:53:51 -0500
commitf2948cb1eb8866716a84868cccbfafcd742c0771 (patch)
tree394df20f229f87428252c02d2402c511b9fa7aa8 /indra/newview/llconversationview.h
parent779e132cbfc46a0eda97a0331e39cbc6e686c07b (diff)
parent4a2fb4c64f2079089b78202e53bbe1dbe8ac09c7 (diff)
Merge with viewer-chui
Diffstat (limited to 'indra/newview/llconversationview.h')
-rwxr-xr-xindra/newview/llconversationview.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index 76d3d079ea..3eb2e63792 100755
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -68,6 +68,7 @@ public:
/*virtual*/ BOOL postBuild();
/*virtual*/ void draw();
/*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask );
+ /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
/*virtual*/ S32 arrange(S32* width, S32* height);
@@ -90,6 +91,7 @@ private:
void onCurrentVoiceSessionChanged(const LLUUID& session_id);
void startFlashing();
+ void selectConversationItem();
LLPanel* mItemPanel;
LLPanel* mCallIconLayoutPanel;