diff options
Diffstat (limited to 'indra/newview/llinventorygallerymenu.cpp')
| -rw-r--r-- | indra/newview/llinventorygallerymenu.cpp | 65 |
1 files changed, 16 insertions, 49 deletions
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp index 388e1604ea..3fede1a001 100644 --- a/indra/newview/llinventorygallerymenu.cpp +++ b/indra/newview/llinventorygallerymenu.cpp @@ -252,20 +252,6 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata) { ungroup_folder_items(mUUIDs.front()); } - else if ("add_to_favorites" == action) - { - for (const LLUUID& id : mUUIDs) - { - set_favorite(id, true); - } - } - else if ("remove_from_favorites" == action) - { - for (const LLUUID& id : mUUIDs) - { - set_favorite(id, false); - } - } else if ("replaceoutfit" == action) { modify_outfit(false, mUUIDs.front(), &gInventory); @@ -488,7 +474,22 @@ void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLS void LLInventoryGalleryContextMenu::fileUploadLocation(const LLSD& userdata) { const std::string param = userdata.asString(); - LLInventoryAction::fileUploadLocation(mUUIDs.front(), param); + if (param == "model") + { + gSavedPerAccountSettings.setString("ModelUploadFolder", mUUIDs.front().asString()); + } + else if (param == "texture") + { + gSavedPerAccountSettings.setString("TextureUploadFolder", mUUIDs.front().asString()); + } + else if (param == "sound") + { + gSavedPerAccountSettings.setString("SoundUploadFolder", mUUIDs.front().asString()); + } + else if (param == "animation") + { + gSavedPerAccountSettings.setString("AnimationUploadFolder", mUUIDs.front().asString()); + } } bool LLInventoryGalleryContextMenu::canSetUploadLocation(const LLSD& userdata) @@ -788,7 +789,6 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men { items.push_back(std::string("New Folder")); } - items.push_back(std::string("upload_options")); items.push_back(std::string("upload_def")); } @@ -810,18 +810,6 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men } } - if (!is_trash && !is_in_trash && gInventory.getRootFolderID() != selected_id) - { - if (get_is_favorite(obj)) - { - items.push_back(std::string("Remove from Favorites")); - } - else - { - items.push_back(std::string("Add to Favorites")); - } - } - items.push_back(std::string("Subfolder Separator")); if (!is_system_folder && !isRootFolder() && !is_outfits) { @@ -867,17 +855,6 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men if(is_agent_inventory) { items.push_back(std::string("Cut")); - if (!is_in_trash) - { - if (get_is_favorite(obj)) - { - items.push_back(std::string("Remove from Favorites")); - } - else - { - items.push_back(std::string("Add to Favorites")); - } - } if (!is_link || !is_cof || !get_is_item_worn(selected_id)) { items.push_back(std::string("Delete")); @@ -1016,7 +993,6 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men } disabled_items.push_back(std::string("New Folder")); - disabled_items.push_back(std::string("upload_options")); disabled_items.push_back(std::string("upload_def")); disabled_items.push_back(std::string("create_new")); } @@ -1067,15 +1043,6 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men disabled_items.push_back(std::string("Marketplace Move")); } } - - if (get_is_favorite(obj)) - { - items.push_back(std::string("Remove from Favorites")); - } - else if (is_agent_inventory) - { - items.push_back(std::string("Add to Favorites")); - } } hide_context_entries(*menu, items, disabled_items); |