SH-3455 WIP - post-SSA cleanup

master
Brad Payne (Vir Linden) 2013-09-23 17:17:29 -04:00
parent 029642b2bc
commit d50be6a8a9
4 changed files with 1 additions and 21 deletions

View File

@ -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)

View File

@ -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?

View File

@ -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;

View File

@ -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;