diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-28 17:06:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-28 17:06:49 -0700 |
| commit | 19069ce25c30f6744310e015dbf767954efbd8ae (patch) | |
| tree | 99791a0d1345efa1faabc7aedcb3d96cab1e4202 /indra/newview/llviewerinventory.cpp | |
| parent | 1eda16b31989448a211808a8144f0a5ffb0bce49 (diff) | |
Creating settings objects in the correct folders. Correctly check if clouds paused.
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index ec457c1b5d..09b07b83b8 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1823,8 +1823,6 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLFolderBridge *bridge, } else if (("sky" == type_name) || ("water" == type_name) || ("daycycle" == type_name)) { - LL_WARNS("LAPRAS") << "Creating settings object of type: '" << type_name << "'" << LL_ENDL; - LLSettingsBase::ptr_t settings; std::string name; @@ -1852,8 +1850,10 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLFolderBridge *bridge, return; } + LLUUID parent_id = bridge ? bridge->getUUID() : gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS); + settings->setName(name); - LLSettingsVOBase::createInventoryItem(settings); + LLSettingsVOBase::createInventoryItem(settings, parent_id); } else { |