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/llinventorybridge.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/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 3cbbd68e51..6f06f3b36d 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -794,7 +794,7 @@ struct LLMoveInv void* mUserData; }; -void warn_move_inventory(LLViewerObject* object, boost::shared_ptr<LLMoveInv> move_inv); -bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, boost::shared_ptr<LLMoveInv>); +void warn_move_inventory(LLViewerObject* object, std::shared_ptr<LLMoveInv> move_inv); +bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, std::shared_ptr<LLMoveInv>); #endif // LL_LLINVENTORYBRIDGE_H |