diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:59:19 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:59:19 +0100 |
| commit | 4fbdfe637049e0a2e93c6fed030e61b32a43ae07 (patch) | |
| tree | e502796c9f39a790f8004edfba5383b1ac7617a2 /indra/newview/llsettingsvo.cpp | |
| parent | a0598b12656cdcf22ba95cacd01b5ff36f8f1b26 (diff) | |
| parent | 8365945f8af6e27e7180b40aae79f210f99bb7c8 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index b5fb889669..0ec7db2ed7 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -104,7 +104,7 @@ void LLSettingsVOBase::createInventoryItem(const LLSettingsBase::ptr_t &settings create_inventory_settings(gAgent.getID(), gAgent.getSessionID(), parentFolder, tid, settings->getName(), "new settings collection.", - settings->getSettingTypeValue(), nextOwnerPerm, cb); + settings->getSettingsTypeValue(), nextOwnerPerm, cb); } void LLSettingsVOBase::onInventoryItemCreated(const LLUUID &inventoryId, LLSettingsBase::ptr_t settings, inventory_result_fn callback) |