diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index aeaecb15d..ef9ecb967 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -486,6 +486,13 @@ BOOL LLAgentWearables::isWearableCopyable(LLWearableType::EType type) const
 	return FALSE;
 }
 
+BOOL LLAgentWearables::areWearablesLoaded() const
+{
+	if(gSavedSettings.getBOOL("RenderUnloadedAvatar"))
+		return TRUE;
+	return mWearablesLoaded;
+}
+
 U32 LLAgentWearables::getWearablePermMask(LLWearableType::EType type) const
 {
 	LLUUID item_id = getWearableItemID(type);
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
index f64c6c5e8..6d052142b 100644
--- a/indra/newview/llagentwearables.h
+++ b/indra/newview/llagentwearables.h
@@ -84,7 +84,7 @@ public:
 	BOOL			isWearableModifiable(const LLUUID& item_id) const;
 
 	BOOL			isWearableCopyable(LLWearableType::EType type) const;
-	BOOL			areWearablesLoaded() const { return mWearablesLoaded; };
+	BOOL			areWearablesLoaded() const;
 	//void			updateWearablesLoaded();
 	//void			checkWearablesLoaded() const;
 	//bool			canMoveWearable(const LLUUID& item_id, bool closer_to_body);