diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-05 17:51:10 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-05 17:51:10 -0500 |
commit | d348deb7049cbaef7c228000525c7ee5a265464c (patch) | |
tree | 810010b25bc5f0ba4511b40752f5f9ca7cb59b06 /indra/newview/llfloaterimsessiontab.h | |
parent | f7100331ebc7913d7117501ccac86f93f4ffb0e3 (diff) | |
parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) |
merge changes for 3.5.0-beta2
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.h')
-rw-r--r-- | indra/newview/llfloaterimsessiontab.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h index e90fcbb806..d55b021df7 100644 --- a/indra/newview/llfloaterimsessiontab.h +++ b/indra/newview/llfloaterimsessiontab.h @@ -54,6 +54,7 @@ public: // reload all message with new settings of visual modes static void processChatHistoryStyleUpdate(bool clean_messages = false); + static void reloadEmptyFloaters(); /** * Returns true if chat is displayed in multi tabbed floater @@ -95,8 +96,8 @@ public: void initBtns(); virtual void updateMessages() {} LLConversationItem* getCurSelectedViewModelItem(); - void forceReshape(); + virtual BOOL handleKeyHere( KEY key, MASK mask ); protected: |