diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:17:02 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:17:02 +0000 |
| commit | 15ce532ccf0d1fb387b1b048a2ed7153fad83dc2 (patch) | |
| tree | 4a78afd7409559501a709c30447745215051155c /indra/newview/llviewerinventory.cpp | |
| parent | 1687719a2523e1a6a9d8ebc8aeac52c530fa8fd0 (diff) | |
| parent | cbe4cac78cf48cb9144dc2f6c194585cff87a1ce (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index d6f48a4c55..f5c08a4b0f 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1166,7 +1166,7 @@ void create_inventory_settings(const LLUUID& agent_id, const LLUUID& session_id, const LLUUID& parent, const LLTransactionID& transaction_id, const std::string& name, const std::string& desc, - LLSettingsType settype, + LLSettingsType::type_e settype, U32 next_owner_perm, LLPointer<LLInventoryCallback> cb) { |