summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-08-24 17:31:12 -0700
committerMerov Linden <merov@lindenlab.com>2012-08-24 17:31:12 -0700
commitfd62242dd6e5fa464db07e0b8ebf3ab54a6067a2 (patch)
tree22702b94c2e4bb14a0d41356eb4cf94ca02806de /indra/newview/llconversationmodel.cpp
parentb19e6c295972c83a2637a29007bc5d0a92711ea9 (diff)
CHUI-280 : Make LLParticipantList derives from LLConversationItemSession
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
-rw-r--r--indra/newview/llconversationmodel.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index f54e6d2d48..a5c0244bd4 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -40,6 +40,13 @@ LLConversationItem::LLConversationItem(std::string display_name, const LLUUID& u
{
}
+LLConversationItem::LLConversationItem(const LLUUID& uuid, LLFolderViewModelInterface& root_view_model) :
+ LLFolderViewModelItemCommon(root_view_model),
+ mName(""),
+ mUUID(uuid)
+{
+}
+
LLConversationItem::LLConversationItem(LLFolderViewModelInterface& root_view_model) :
LLFolderViewModelItemCommon(root_view_model),
mName(""),
@@ -85,8 +92,8 @@ LLConversationItemSession::LLConversationItemSession(std::string display_name, c
{
}
-LLConversationItemSession::LLConversationItemSession(LLFolderViewModelInterface& root_view_model) :
- LLConversationItem(root_view_model)
+LLConversationItemSession::LLConversationItemSession(const LLUUID& uuid, LLFolderViewModelInterface& root_view_model) :
+ LLConversationItem(uuid,root_view_model)
{
}
@@ -99,8 +106,8 @@ LLConversationItemParticipant::LLConversationItemParticipant(std::string display
{
}
-LLConversationItemParticipant::LLConversationItemParticipant(LLFolderViewModelInterface& root_view_model) :
- LLConversationItem(root_view_model)
+LLConversationItemParticipant::LLConversationItemParticipant(const LLUUID& uuid, LLFolderViewModelInterface& root_view_model) :
+ LLConversationItem(uuid,root_view_model)
{
}