diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:18 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:18 -0800 |
| commit | 4c791e098d3abafa406e0e269038c40aae67f66c (patch) | |
| tree | d566be04939faf3dc29655a8113afc067b2b7c99 /indra/newview/llconversationmodel.h | |
| parent | c74dbc6e5b117bcd020c0efecf5255ad731f310f (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-596
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; |