diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-04 10:14:41 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-04 10:14:41 -0800 |
| commit | 3d1ec8b462bc091e9d63c385ec0bc595937f31c5 (patch) | |
| tree | 7d6dda88bf45d2fae769e1ae1bf6e570bf1678a2 /indra/newview/llfloaterimcontainer.h | |
| parent | 9f965be297422ddab79ff9be47fb6d5c64a5096f (diff) | |
| parent | a26c1672235578f3a4e21be370b11522207e2c57 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterimcontainer.h')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h index 419239f90b..c84d4978ec 100644 --- a/indra/newview/llfloaterimcontainer.h +++ b/indra/newview/llfloaterimcontainer.h @@ -69,9 +69,11 @@ public: void returnFloaterToHost(); void showConversation(const LLUUID& session_id); void selectConversation(const LLUUID& session_id); - void selectNextConversation(const LLUUID& session_id); - BOOL selectConversationPair(const LLUUID& session_id, bool select_widget); + void selectNextConversationByID(const LLUUID& session_id); + BOOL selectConversationPair(const LLUUID& session_id, bool select_widget, bool focus_floater = true); void clearAllFlashStates(); + bool selectNextorPreviousConversation(bool select_next); + void expandConversation(); /*virtual*/ void tabClose(); void showStub(bool visible); @@ -109,7 +111,7 @@ public: void doToParticipants(const std::string& item, uuid_vec_t& selectedIDS); void assignResizeLimits(); - + virtual BOOL handleKeyHere(KEY key, MASK mask ); /*virtual*/ void closeFloater(bool app_quitting = false); private: |