diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2010-01-06 13:13:59 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2010-01-06 13:13:59 -0500 |
| commit | 84ff7485ae161fe35963da2f35e111b685719ece (patch) | |
| tree | 0a82b35b786667411b4e1d74f7cfce8cc2b8e0bd /indra | |
| parent | 64de7f8e645271624b6c888d7af6a4ccc9683475 (diff) | |
Minor merge fix of redundant test
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpaneloutfitsinventory.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp index 2d4c034f8f..29fa4b319c 100644 --- a/indra/newview/llpaneloutfitsinventory.cpp +++ b/indra/newview/llpaneloutfitsinventory.cpp @@ -363,7 +363,7 @@ void LLPanelOutfitsInventory::onCustomAction(const LLSD& userdata) BOOL LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata) { const std::string command_name = userdata.asString(); - if (command_name == "delete") + if (command_name == "delete" || command_name == "remove") { BOOL can_delete = FALSE; LLFolderView *folder = getActivePanel()->getRootFolder(); @@ -423,7 +423,6 @@ BOOL LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata) } if (command_name == "edit" || - command_name == "wear" || command_name == "add" ) { |