CHUI-147 FIX Added updating conference participants in IM floater title

- The title is updated with the data from participants list widget in IM floater.
- Creating the participants list is fixed for the case of starting the ad hoc session when the session id changes upon initialization (see LLIMConversation::buildParticipantList()).
- LLEventTimer replaced with simple LLTimer to avoid crashes in LLEventTimer::tick().
- Moved the build_residents_string() code to LLAvatarActions::buildResidentsString() to use it in LLIMFloater::onParticipantsListChanged().

1 files changed, 6 insertions, 4 deletions

diff --git a/indra/newview/llimconversation.h b/indra/newview/llimconversation.h
index 47c98d6f8b..50663137ac 100644
--- a/indra/newview/llimconversation.h
+++ b/indra/newview/llimconversation.h
@@ -40,7 +40,6 @@ class LLChatHistory;
 
 class LLIMConversation
 	: public LLTransientDockableFloater
-	, public LLEventTimer
 {
 
 public:
@@ -65,6 +64,7 @@ public:
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void onClose(bool app_quitting);
 	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void draw();
 
 protected:
 
@@ -89,8 +89,6 @@ protected:
 	void buildParticipantList();
 	void onSortMenuItemClicked(const LLSD& userdata);
 
-	/*virtual*/ BOOL tick();
-
 	bool mIsNearbyChat;
 	bool mIsP2PChat;
 
@@ -103,6 +101,9 @@ protected:
 	LLButton* mCloseBtn;
 
 private:
+	/// Refreshes the floater at a constant rate.
+	virtual void refresh() = 0;
+
 	/// Update floater header and toolbar buttons when hosted/torn off state is toggled.
 	void updateHeaderAndToolbar();
 
@@ -113,10 +114,11 @@ private:
 	 */
 	void reshapeChatHistory();
 
-
 	LLChatHistory* mChatHistory;
 	LLChatEntry* mInputEditor;
 	int mInputEditorTopPad; // padding between input field and chat history
+
+	LLTimer* mRefreshTimer; ///< Defines the rate at which refresh() is called.
 };