SH-3455 WIP - post-SSA cleanup
parent
029642b2bc
commit
d50be6a8a9
|
|
@ -1477,16 +1477,6 @@ void LLAgentWearables::setWearableFinal(LLInventoryItem* new_item, LLViewerWeara
|
|||
updateServer();
|
||||
}
|
||||
|
||||
// virtual
|
||||
void LLAgentWearables::invalidateBakedTextureHash(LLMD5& hash) const
|
||||
{
|
||||
// Add some garbage into the hash so that it becomes invalid.
|
||||
if (isAgentAvatarValid())
|
||||
{
|
||||
hash.update((const unsigned char*)gAgentAvatarp->getID().mData, UUID_BYTES);
|
||||
}
|
||||
}
|
||||
|
||||
// User has picked "remove from avatar" from a menu.
|
||||
// static
|
||||
void LLAgentWearables::userRemoveWearable(const LLWearableType::EType &type, const U32 &index)
|
||||
|
|
|
|||
|
|
@ -162,7 +162,6 @@ public:
|
|||
static void processAgentInitialWearablesUpdate(LLMessageSystem* mesgsys, void** user_data);
|
||||
|
||||
protected:
|
||||
/*virtual*/ void invalidateBakedTextureHash(LLMD5& hash) const;
|
||||
// SUNSHINE CLEANUP dead
|
||||
void sendAgentWearablesUpdate();
|
||||
// SUNSHINE CLEANUP remove?
|
||||
|
|
|
|||
|
|
@ -497,13 +497,6 @@ void LLViewerWearable::refreshName()
|
|||
}
|
||||
}
|
||||
|
||||
// virtual
|
||||
void LLViewerWearable::addToBakedTextureHash(LLMD5& hash) const
|
||||
{
|
||||
LLUUID asset_id = getAssetID();
|
||||
hash.update((const unsigned char*)asset_id.mData, UUID_BYTES);
|
||||
}
|
||||
|
||||
struct LLWearableSaveData
|
||||
{
|
||||
LLWearableType::EType mType;
|
||||
|
|
|
|||
|
|
@ -90,9 +90,7 @@ public:
|
|||
// the wearable was worn. make sure the name of the wearable object matches the LLViewerInventoryItem,
|
||||
// not the wearable asset itself.
|
||||
void refreshName();
|
||||
|
||||
// Update the baked texture hash.
|
||||
/*virtual*/void addToBakedTextureHash(LLMD5& hash) const;
|
||||
/*virtual*/void addToBakedTextureHash(LLMD5& hash) const {}
|
||||
|
||||
protected:
|
||||
LLAssetID mAssetID;
|
||||
|
|
|
|||
Loading…
Reference in New Issue