summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationview.h
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-08-26 14:31:53 -0700
committerGraham Linden <graham@lindenlab.com>2013-08-26 14:31:53 -0700
commit6e410c31c4f84247586312fa7763a2eb3a8db9da (patch)
tree9540cc49b0c7aabd56869feaa9fbf48b34f12f2e /indra/newview/llconversationview.h
parent8675ed0491efee860ac1b2d1d5fe88d150768217 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
Merge the CHUIstorm 3.6.5
Diffstat (limited to 'indra/newview/llconversationview.h')
-rwxr-xr-xindra/newview/llconversationview.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index 3eb2e63792..5a74974302 100755
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -69,6 +69,7 @@ public:
/*virtual*/ void draw();
/*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask );
/*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
+ /*virtual*/ BOOL handleMouseUp( S32 x, S32 y, MASK mask );
/*virtual*/ S32 arrange(S32* width, S32* height);
@@ -86,6 +87,9 @@ public:
virtual void refresh();
/*virtual*/ void setFlashState(bool flash_state);
+ void setHighlightState(bool hihglight_state);
+
+ LLFloater* getSessionFloater();
private: