Add another patch for times where the user has no inventory items being worn and the viewer refusing to wearing new ones.

Conflicts:

	indra/newview/llagentwearables.cpp
	indra/newview/llagentwearables.h
This commit is contained in:
Siana Gearz
2011-10-06 00:12:01 +02:00
parent e849458c1d
commit 5ef79d571b
2 changed files with 8 additions and 1 deletions

View File

@@ -486,6 +486,13 @@ BOOL LLAgentWearables::isWearableCopyable(LLWearableType::EType type) const
return FALSE; return FALSE;
} }
BOOL LLAgentWearables::areWearablesLoaded() const
{
if(gSavedSettings.getBOOL("RenderUnloadedAvatar"))
return TRUE;
return mWearablesLoaded;
}
U32 LLAgentWearables::getWearablePermMask(LLWearableType::EType type) const U32 LLAgentWearables::getWearablePermMask(LLWearableType::EType type) const
{ {
LLUUID item_id = getWearableItemID(type); LLUUID item_id = getWearableItemID(type);

View File

@@ -84,7 +84,7 @@ public:
BOOL isWearableModifiable(const LLUUID& item_id) const; BOOL isWearableModifiable(const LLUUID& item_id) const;
BOOL isWearableCopyable(LLWearableType::EType type) const; BOOL isWearableCopyable(LLWearableType::EType type) const;
BOOL areWearablesLoaded() const { return mWearablesLoaded; }; BOOL areWearablesLoaded() const;
//void updateWearablesLoaded(); //void updateWearablesLoaded();
//void checkWearablesLoaded() const; //void checkWearablesLoaded() const;
//bool canMoveWearable(const LLUUID& item_id, bool closer_to_body); //bool canMoveWearable(const LLUUID& item_id, bool closer_to_body);