diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-04 20:28:01 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-04 20:28:01 -0800 |
| commit | fbc414c02b80da1c0c5c1ebbbbcb84958938be6e (patch) | |
| tree | 27a1ff7592fa9f9de9e0f3d228076c59174bdd41 /indra/newview/llfloaterimsession.h | |
| parent | 12554bffb34895533ed11013a780bfa088756a67 (diff) | |
| parent | 39ff545bab2c1e05b7b9fe14ee99828795f1f78f (diff) | |
Merge with viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimsession.h')
| -rw-r--r-- | indra/newview/llfloaterimsession.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h index 1d8957b1d9..6a2f4b29eb 100644 --- a/indra/newview/llfloaterimsession.h +++ b/indra/newview/llfloaterimsession.h @@ -99,6 +99,9 @@ public: void setPositioned(bool b) { mPositioned = b; }; void onVisibilityChange(const LLSD& new_visibility); + bool enableGearMenuItem(const LLSD& userdata); + void GearDoToSelected(const LLSD& userdata); + bool checkGearMenuItem(const LLSD& userdata); // Implements LLVoiceClientStatusObserver::onChange() to enable the call // button when voice is available @@ -124,8 +127,6 @@ public: //used as a callback on receiving new IM message static void sRemoveTypingIndicator(const LLSD& data); static void onIMChicletCreated(const LLUUID& session_id); - - bool getStartConferenceInSameFloater() const { return mStartConferenceInSameFloater; } const LLUUID& getOtherParticipantUUID() {return mOtherParticipantUUID;} static boost::signals2::connection setIMFloaterShowedCallback(const floater_showed_signal_t::slot_type& cb); @@ -185,8 +186,6 @@ private: bool mSessionInitialized; LLSD mQueuedMsgsForInit; - bool mStartConferenceInSameFloater; - uuid_vec_t mInvitedParticipants; // connection to voice channel state change signal |