summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.h
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-12-18 18:15:28 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-12-18 18:15:28 -0800
commit13a619cb5fc8da621d4e7becbf95ca2a8014deb3 (patch)
tree038191ae7942deaaf539acf99d645f26fe9b702c /indra/newview/llfloaterimsession.h
parent610b25ad3a070c984cb303250428a4a9b8301c6f (diff)
CHUI-385: Problem: When the new session was created with multiple participants the old conversation floater was being recycled. When the conversation floater was re-initialized it did not remove and update the chat messages. Resolution: When the conversation floater is recycled simply call reloadMessages().
Diffstat (limited to 'indra/newview/llfloaterimsession.h')
-rw-r--r--indra/newview/llfloaterimsession.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h
index 43d84eb8c0..6a2f4b29eb 100644
--- a/indra/newview/llfloaterimsession.h
+++ b/indra/newview/llfloaterimsession.h
@@ -127,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);
@@ -188,8 +186,6 @@ private:
bool mSessionInitialized;
LLSD mQueuedMsgsForInit;
- bool mStartConferenceInSameFloater;
-
uuid_vec_t mInvitedParticipants;
// connection to voice channel state change signal