EXT-7818 FIXED Click on Take Off on my shoes fro inventory doesn't remove shoe
Added additional logic to tell if you're in edit outfit mode, removed some bad code that was causing removed wearables to never send out an appearance update.master
parent
9196490315
commit
1d683a65a2
|
|
@ -804,7 +804,7 @@ void LLAgentWearables::popWearable(const LLWearableType::EType type, U32 index)
|
|||
if (wearable)
|
||||
{
|
||||
mWearableDatas[type].erase(mWearableDatas[type].begin() + index);
|
||||
gAgentAvatarp->wearableUpdated(wearable->getType(), FALSE);
|
||||
gAgentAvatarp->wearableUpdated(wearable->getType(), TRUE);
|
||||
wearable->setLabelUpdated();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -341,7 +341,8 @@ BOOL LLTexLayerSetBuffer::isReadyToUpload() const
|
|||
{
|
||||
if (!mNeedsUpload) return FALSE; // Don't need to upload if we haven't requested one.
|
||||
if (!gAgentQueryManager.hasNoPendingQueries()) return FALSE; // Can't upload if there are pending queries.
|
||||
|
||||
if (isAgentAvatarValid() && !gAgentAvatarp->isUsingBakedTextures()) return FALSE; // Don't upload if avatar is using composites.
|
||||
|
||||
// If we requested an upload and have the final LOD ready, then upload.
|
||||
const BOOL can_highest_lod = mTexLayerSet->isLocalTextureDataFinal();
|
||||
if (can_highest_lod) return TRUE;
|
||||
|
|
|
|||
|
|
@ -2261,6 +2261,16 @@ void LLVOAvatarSelf::processRebakeAvatarTextures(LLMessageSystem* msg, void**)
|
|||
}
|
||||
}
|
||||
|
||||
BOOL LLVOAvatarSelf::isUsingBakedTextures() const
|
||||
{
|
||||
// Composite textures are used during appearance mode.
|
||||
if (gAgentCamera.cameraCustomizeAvatar())
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
void LLVOAvatarSelf::forceBakeAllTextures(bool slam_for_debug)
|
||||
{
|
||||
llinfos << "TAT: forced full rebake. " << llendl;
|
||||
|
|
|
|||
|
|
@ -217,6 +217,7 @@ public:
|
|||
void setCachedBakedTexture(LLVOAvatarDefines::ETextureIndex i, const LLUUID& uuid);
|
||||
void forceBakeAllTextures(bool slam_for_debug = false);
|
||||
static void processRebakeAvatarTextures(LLMessageSystem* msg, void**);
|
||||
BOOL isUsingBakedTextures() const; // e.g. false if in appearance edit mode
|
||||
protected:
|
||||
/*virtual*/ void removeMissingBakedTextures();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue