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

Experimental disabling of adding/removing wearables when link-creation/old-link-deletion is still pending a response from the server.

Browse Source
This commit is contained in:
Shyotl
2015-07-23 01:35:58 -05:00
parent 22b12223ef
commit f5fcf385e4
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llappearancemgr.cpp
View File

@@ -494,6 +494,7 @@ LLUpdateAppearanceOnDestroy::LLUpdateAppearanceOnDestroy(bool enforce_item_restr
mEnforceOrdering(enforce_ordering),
mPostUpdateFunc(post_update_func)
{
sActiveCallbacks++;
selfStartPhase("update_appearance_on_destroy");
}
@@ -509,6 +510,7 @@ void LLUpdateAppearanceOnDestroy::fire(const LLUUID& inv_item)
LLUpdateAppearanceOnDestroy::~LLUpdateAppearanceOnDestroy()
{
--sActiveCallbacks;
if (!LLApp::isExiting())
{
// speculative fix for MAINT-1150
@@ -522,6 +524,7 @@ LLUpdateAppearanceOnDestroy::~LLUpdateAppearanceOnDestroy()
}
}
U32 LLUpdateAppearanceOnDestroy::sActiveCallbacks = 0;
void edit_wearable_and_customize_avatar(LLUUID item_id)
{

1
indra/newview/llappearancemgr.h
View File

@@ -336,6 +336,7 @@ public:
virtual ~LLUpdateAppearanceOnDestroy();
/* virtual */ void fire(const LLUUID& inv_item);
static U32 sActiveCallbacks;
private:
U32 mFireCount;
bool mEnforceItemRestrictions;

15
indra/newview/llinventorybridge.cpp
View File

@@ -5926,6 +5926,7 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
// Disable wear and take off based on whether the item is worn.
if(item)
{
bool cof_pending = LLUpdateAppearanceOnDestroy::sActiveCallbacks;
switch (item->getType())
{
case LLAssetType::AT_CLOTHING:
@@ -5934,12 +5935,12 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
case LLAssetType::AT_BODYPART:
items.push_back(std::string("Wearable And Object Wear"));
if (get_is_item_worn(item->getUUID()))
if (!cof_pending && get_is_item_worn(item->getUUID()))
{
disabled_items.push_back(std::string("Wearable And Object Wear"));
disabled_items.push_back(std::string("Wearable Add"));
// [RLVa:KB] - Checked: 2010-04-04 (RLVa-1.2.0c) | Added: RLVa-1.2.0c
if ( (rlv_handler_t::isEnabled()) && (!gRlvWearableLocks.canRemove(item)) )
if (cof_pending || (rlv_handler_t::isEnabled()) && (!gRlvWearableLocks.canRemove(item)))
disabled_items.push_back(std::string("Take Off"));
// [/RLVa:KB]
}
@@ -5947,11 +5948,11 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
disabled_items.push_back(std::string("Take Off"));
disabled_items.push_back(std::string("Wearable Edit"));
if (gAgentWearables.getWearableFromAssetID(item->getAssetUUID()))
if (cof_pending || gAgentWearables.getWearableFromAssetID(item->getAssetUUID()))
{
disabled_items.push_back(std::string("Wearable Add"));
LLViewerWearable* wearable = gAgentWearables.getWearableFromAssetID(item->getAssetUUID());
if ((wearable && wearable != gAgentWearables.getTopWearable(mWearableType)))
if (cof_pending || (wearable && wearable != gAgentWearables.getTopWearable(mWearableType)))
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
@@ -5973,12 +5974,12 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
items.push_back(std::string("Wearable Move Back"));
bool is_worn = get_is_item_worn(item->getUUID());
if(!is_worn || !gAgentWearables.canMoveWearable(item->getUUID(),false))
if (cof_pending || !is_worn || !gAgentWearables.canMoveWearable(item->getUUID(), false))
disabled_items.push_back(std::string("Wearable Move Forward"));
if(!is_worn || !gAgentWearables.canMoveWearable(item->getUUID(),true))
if (cof_pending || !is_worn || !gAgentWearables.canMoveWearable(item->getUUID(), true))
disabled_items.push_back(std::string("Wearable Move Back"));
if (!gAgentWearables.canAddWearable(mWearableType))
if (cof_pending || !gAgentWearables.canAddWearable(mWearableType))
{
disabled_items.push_back(std::string("Wearable Add"));
}