summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloatercontainer.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llimfloatercontainer.h')
-rw-r--r--indra/newview/llimfloatercontainer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h
index 5cfdb41ad3..d04ac873fa 100644
--- a/indra/newview/llimfloatercontainer.h
+++ b/indra/newview/llimfloatercontainer.h
@@ -46,7 +46,7 @@ class LLTabContainer;
// CHUI-137 : Temporary implementation of conversations list
class LLConversationItem;
-typedef std::list<LLConversationItem> conversations_items_list_t;
+typedef std::list<LLConversationItem*> conversations_items_list_t;
typedef std::list<LLFolderViewItem*> conversations_widgets_list_t;
// Conversation items: we hold a list of those and create an LLFolderViewItem widget for each that we tuck
@@ -110,7 +110,7 @@ public:
std::string& tooltip_msg) { return FALSE; }
private:
std::string mName;
- LLUUID mUUID;
+ const LLUUID mUUID;
};
// CHUI-137 : End