1 files changed, 15 insertions, 11 deletions
diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h
index 7be68ccfc7..7bc54cf3da 100644
--- a/indra/newview/llfloaterimsession.h
+++ b/indra/newview/llfloaterimsession.h
@@ -64,15 +64,15 @@ public:
     void initIMFloater();
 
     // LLView overrides
-    /*virtual*/ BOOL postBuild();
-    /*virtual*/ void setMinimized(BOOL b);
-    /*virtual*/ void setVisible(BOOL visible);
-    /*virtual*/ BOOL getVisible();
-    /*virtual*/ void setFocus(BOOL focus);
+    /*virtual*/ bool postBuild();
+    /*virtual*/ void setMinimized(bool b);
+    /*virtual*/ void setVisible(bool visible);
+    /*virtual*/ bool getVisible();
+    /*virtual*/ void setFocus(bool focus);
     // Check typing timeout timer.
 
     /*virtual*/ void draw();
-    /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+    /*virtual*/ bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
         EDragAndDropType cargo_type,
         void* cargo_data,
         EAcceptance* accept,
@@ -114,15 +114,14 @@ public:
 
     // Implements LLVoiceClientStatusObserver::onChange() to enable the call
     // button when voice is available
-    void onChange(EStatusType status, const std::string &channelURI,
-            bool proximal);
+    void onChange(EStatusType status, const LLSD& channelInfo, bool proximal);
 
     virtual LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::IM; }
     virtual void onVoiceChannelStateChanged(
             const LLVoiceChannel::EState& old_state,
             const LLVoiceChannel::EState& new_state);
 
-    void processIMTyping(const LLUUID& from_id, BOOL typing);
+    void processIMTyping(const LLUUID& from_id, bool typing);
     void processAgentListUpdates(const LLSD& body);
     void processSessionUpdate(const LLSD& session_update);
 
@@ -148,8 +147,8 @@ private:
 
     bool dropPerson(LLUUID* person_id, bool drop);
 
-    BOOL isInviteAllowed() const;
-    BOOL inviteToSession(const uuid_vec_t& agent_ids);
+    bool isInviteAllowed() const;
+    bool inviteToSession(const uuid_vec_t& agent_ids);
     static void onInputEditorFocusReceived( LLFocusableElement* caller,void* userdata );
     static void onInputEditorFocusLost(LLFocusableElement* caller, void* userdata);
     static void onInputEditorKeystroke(LLTextEditor* caller, void* userdata);
@@ -162,6 +161,8 @@ private:
 
     void onCallButtonClicked();
 
+    void onVoiceChannelChanged(const LLUUID &session_id);
+
     void boundVoiceChannel();
 
     // Add the "User is typing..." indicator.
@@ -196,6 +197,9 @@ private:
     uuid_vec_t mInvitedParticipants;
     uuid_vec_t mPendingParticipants;
 
+    // notification when the voice channel is swapped out from beneath us.
+    boost::signals2::connection mVoiceChannelChanged;
+
     // connection to voice channel state change signal
     boost::signals2::connection mVoiceChannelStateChangeConnection;