diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 22:09:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-05 22:09:54 +0200 |
commit | 9f0faf5c892bba9703c713a29202a8ac48bfdf8b (patch) | |
tree | 8e64e6074c11005fbb1dac606c176e4470de03e4 /indra/newview/llpathfindingobjectlist.h | |
parent | aa52c852d600aa6b2ea17cdd86f53972c95cca4a (diff) | |
parent | e3e1672ac40dd4f1f4e458ed09cd7279f0a45fc3 (diff) |
Merge pull request #735 from secondlife/marchcat/yz-merge
Merge Maint Z into Maint YZ
Diffstat (limited to 'indra/newview/llpathfindingobjectlist.h')
-rw-r--r-- | indra/newview/llpathfindingobjectlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpathfindingobjectlist.h b/indra/newview/llpathfindingobjectlist.h index 61580582d3..e2e0dce4da 100644 --- a/indra/newview/llpathfindingobjectlist.h +++ b/indra/newview/llpathfindingobjectlist.h @@ -36,7 +36,7 @@ class LLPathfindingObjectList; -typedef boost::shared_ptr<LLPathfindingObjectList> LLPathfindingObjectListPtr; +typedef std::shared_ptr<LLPathfindingObjectList> LLPathfindingObjectListPtr; typedef std::map<std::string, LLPathfindingObjectPtr> LLPathfindingObjectMap; class LLPathfindingObjectList |