diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-12-14 14:12:01 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-12-14 14:12:01 -0600 |
| commit | 3c858d7e2d6633df14df473a918d2fb848403972 (patch) | |
| tree | 62b36692a0c1df2f34a85bc7fd4111afb2737d81 /indra/newview/llconversationmodel.h | |
| parent | 8b86e2ad1b1326cb3e98acd857dc93f4f1455b8c (diff) | |
| parent | 32de0cb67d824498d0fc9d489ce19731ebfddfdf (diff) | |
Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601
Diffstat (limited to 'indra/newview/llconversationmodel.h')
| -rw-r--r-- | indra/newview/llconversationmodel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index 3f607d434e..0cbfad8b73 100644 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -40,7 +40,7 @@ class LLConversationItem; class LLConversationItemSession; class LLConversationItemParticipant; -typedef std::map<LLUUID, LLConversationItem*> conversations_items_map; +typedef std::map<LLUUID, LLPointer<LLConversationItem> > conversations_items_map; typedef std::map<LLUUID, LLFolderViewItem*> conversations_widgets_map; typedef std::vector<std::string> menuentry_vec_t; |