diff options
author | dolphin <dolphin@lindenlab.com> | 2013-08-27 16:51:05 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-08-27 16:51:05 -0700 |
commit | d29268f331380eb89224c5b0168bf89bd0116422 (patch) | |
tree | 47973dc2fbe434066e1de0c1695c3033eb76cc80 /indra/newview/llconversationview.h | |
parent | eaf847e60df3c078d15f8991e9448b06ffa83bf7 (diff) | |
parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) |
Merge
Diffstat (limited to 'indra/newview/llconversationview.h')
-rwxr-xr-x | indra/newview/llconversationview.h | 4 |
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: |