CHUI-342 : Fixed : Use user name and display name correctly. Sort according to user names.

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 18c5dd1ce1..30f94d51ae 100755
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -170,6 +170,8 @@ public:
 	LLConversationItemParticipant(const LLUUID& uuid, LLFolderViewModelInterface& root_view_model);
 	virtual ~LLConversationItemParticipant() {}
 	
+	virtual const std::string& getDisplayName() const { return mDisplayName; }
+
 	bool isMuted() { return mIsMuted; }
 	bool isModerator() {return mIsModerator; }
 	void setIsMuted(bool is_muted) { mIsMuted = is_muted; mNeedsRefresh = true; }
@@ -186,6 +188,7 @@ public:
 private:
 	bool mIsMuted;		// default is false
 	bool mIsModerator;	// default is false
+	std::string mDisplayName;
 	F64  mDistToAgent;  // Distance to the agent. A negative (meaningless) value means the distance has not been set.
 };