Skip to content
Snippets Groups Projects
Commit 84ff7485 authored by Eric M. Tulla (BigPapi)'s avatar Eric M. Tulla (BigPapi)
Browse files

Minor merge fix of redundant test

parent 64de7f8e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llpaneloutfitsinventory.cpp
+ 1
− 2
View file @ 84ff7485
...@@ -363,7 +363,7 @@ void LLPanelOutfitsInventory::onCustomAction(const LLSD& userdata) ...@@ -363,7 +363,7 @@ void LLPanelOutfitsInventory::onCustomAction(const LLSD& userdata)
BOOL LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata) BOOL LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata)
{ {
const std::string command_name = userdata.asString(); const std::string command_name = userdata.asString();
if (command_name == "delete") if (command_name == "delete" || command_name == "remove")
{ {
BOOL can_delete = FALSE; BOOL can_delete = FALSE;
LLFolderView *folder = getActivePanel()->getRootFolder(); LLFolderView *folder = getActivePanel()->getRootFolder();
...@@ -423,7 +423,6 @@ BOOL LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata) ...@@ -423,7 +423,6 @@ BOOL LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata)
} }
if (command_name == "edit" || if (command_name == "edit" ||
command_name == "wear" ||
command_name == "add" command_name == "add"
) )
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment