diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-05-06 16:40:12 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-06 16:40:12 -0700 |
| commit | 4af9128db1fb65ff99d1e8086352698f46e049b4 (patch) | |
| tree | 4b98d8afb138a4a1ac9f2d4b01a7d83dce314d17 /indra/newview/llfloateruipreview.cpp | |
| parent | 05b2dd913fcb1c5485ce19885e4e60f26752e6b0 (diff) | |
| parent | 10aa7f4254fd04c24f15f507188705146f92ee60 (diff) | |
Merge branch 'main' of https://github.com/secondlife/viewer into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
| -rw-r--r-- | indra/newview/llfloateruipreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index db69c3e2c3..553d09bec2 100644 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -158,7 +158,7 @@ public: // typedef std::map<std::string,std::pair<std::list<std::string>,std::list<std::string> > > DiffMap; // this version copies the lists etc., and thus is bad memory-wise typedef std::list<std::string> StringList; - typedef boost::shared_ptr<StringList> StringListPtr; + typedef std::shared_ptr<StringList> StringListPtr; typedef std::map<std::string, std::pair<StringListPtr,StringListPtr> > DiffMap; DiffMap mDiffsMap; // map, of filename to pair of list of changed element paths and list of errors |