Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup cof_pending code and attempt to restore old bodypart adding behavior.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-09-11 17:26:24 -04:00
parent bb4109f982
commit b21dbc46bb
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llinventorybridge.cpp
View File

@@ -5911,7 +5911,6 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
// Disable wear and take off based on whether the item is worn. // Disable wear and take off based on whether the item is worn.
if(item) if(item)
{ {
bool cof_pending = LLUpdateAppearanceOnDestroy::sActiveCallbacks;
switch (item->getType()) switch (item->getType())
{ {
case LLAssetType::AT_CLOTHING: case LLAssetType::AT_CLOTHING:
@@ -5920,12 +5919,20 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
case LLAssetType::AT_BODYPART: case LLAssetType::AT_BODYPART:
items.push_back(std::string("Wearable And Object Wear")); items.push_back(std::string("Wearable And Object Wear"));
if (!cof_pending && get_is_item_worn(item->getUUID())) if (LLUpdateAppearanceOnDestroy::sActiveCallbacks) // cof_pending
{
disabled_items.push_back(std::string("Wearable And Object Wear"));
disabled_items.push_back(std::string("Wearable Add"));
disabled_items.push_back(std::string("Take Off"));
disabled_items.push_back(std::string("Wearable Move Forward"));
disabled_items.push_back(std::string("Wearable Move Back"));
}
else if (get_is_item_worn(item->getUUID()))
{ {
disabled_items.push_back(std::string("Wearable And Object Wear")); disabled_items.push_back(std::string("Wearable And Object Wear"));
disabled_items.push_back(std::string("Wearable Add")); disabled_items.push_back(std::string("Wearable Add"));
// [RLVa:KB] - Checked: 2010-04-04 (RLVa-1.2.0c) | Added: RLVa-1.2.0c // [RLVa:KB] - Checked: 2010-04-04 (RLVa-1.2.0c) | Added: RLVa-1.2.0c
if (cof_pending || (rlv_handler_t::isEnabled()) && (!gRlvWearableLocks.canRemove(item))) if ((rlv_handler_t::isEnabled()) && (!gRlvWearableLocks.canRemove(item)))
disabled_items.push_back(std::string("Take Off")); disabled_items.push_back(std::string("Take Off"));
// [/RLVa:KB] // [/RLVa:KB]
} }
@@ -5933,11 +5940,11 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{ {
disabled_items.push_back(std::string("Take Off")); disabled_items.push_back(std::string("Take Off"));
disabled_items.push_back(std::string("Wearable Edit")); disabled_items.push_back(std::string("Wearable Edit"));
if (cof_pending || gAgentWearables.getWearableFromAssetID(item->getAssetUUID())) if (gAgentWearables.getWearableFromAssetID(item->getAssetUUID()))
{ {
disabled_items.push_back(std::string("Wearable Add")); disabled_items.push_back(std::string("Wearable Add"));
LLViewerWearable* wearable = gAgentWearables.getWearableFromAssetID(item->getAssetUUID()); LLViewerWearable* wearable = gAgentWearables.getWearableFromAssetID(item->getAssetUUID());
if (cof_pending || (wearable && wearable != gAgentWearables.getTopWearable(mWearableType))) if (wearable && wearable != gAgentWearables.getTopWearable(mWearableType))
disabled_items.push_back(std::string("Wearable And Object Wear")); disabled_items.push_back(std::string("Wearable And Object Wear"));
} }
// [RLVa:KB] - Checked: 2010-06-09 (RLVa-1.2.0g) | Modified: RLVa-1.2.0g // [RLVa:KB] - Checked: 2010-06-09 (RLVa-1.2.0g) | Modified: RLVa-1.2.0g
@@ -5959,12 +5966,13 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
items.push_back(std::string("Wearable Move Back")); items.push_back(std::string("Wearable Move Back"));
bool is_worn = get_is_item_worn(item->getUUID()); bool is_worn = get_is_item_worn(item->getUUID());
if (cof_pending || !is_worn || !gAgentWearables.canMoveWearable(item->getUUID(), false)) if (!is_worn || !gAgentWearables.canMoveWearable(item->getUUID(), false))
disabled_items.push_back(std::string("Wearable Move Forward")); disabled_items.push_back(std::string("Wearable Move Forward"));
if (cof_pending || !is_worn || !gAgentWearables.canMoveWearable(item->getUUID(), true)) if (!is_worn || !gAgentWearables.canMoveWearable(item->getUUID(), true))
disabled_items.push_back(std::string("Wearable Move Back")); disabled_items.push_back(std::string("Wearable Move Back"));
if (cof_pending || !gAgentWearables.canAddWearable(mWearableType)) // <singu/> Allow adding for the behavior of replacing bodyparts but keeping worn things else.
if (item->getType() != LLAssetType::AT_BODYPART && !gAgentWearables.canAddWearable(mWearableType))
{ {
disabled_items.push_back(std::string("Wearable Add")); disabled_items.push_back(std::string("Wearable Add"));
} }