EXT-1822 changing textures in appearance not immediate

Texture changes in appearance editor were not taking effect immediately. Changed texture setting code to refresh local bake of textures.

Code reviewed by Vir

1 files changed, 17 insertions, 3 deletions

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index c1866c36a2..af2f3613b8 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -668,9 +668,17 @@ U32 LLAgentWearables::pushWearable(const EWearableType type, LLWearable *wearabl
 	return MAX_WEARABLES_PER_TYPE;
 }
 
-void LLAgentWearables::popWearable(const EWearableType type, LLWearable *wearable)
+void LLAgentWearables::popWearable(LLWearable *wearable)
 {
-	U32 index = getWearableIndex(type, wearable);
+	if (wearable == NULL)
+	{
+		// nothing to do here. move along.
+		return;
+	}
+
+	U32 index = getWearableIndex(wearable);
+	EWearableType type = wearable->getType();
+
 	if (index < MAX_WEARABLES_PER_TYPE && index < getWearableCount(type))
 	{
 		popWearable(type, index);
@@ -685,8 +693,14 @@ void LLAgentWearables::popWearable(const EWearableType type, U32 index)
 	}
 }
 
-U32	LLAgentWearables::getWearableIndex(const EWearableType type, LLWearable *wearable)
+U32	LLAgentWearables::getWearableIndex(LLWearable *wearable)
 {
+	if (wearable == NULL)
+	{
+		return MAX_WEARABLES_PER_TYPE;
+	}
+
+	const EWearableType type = wearable->getType();
 	wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type);
 	if (wearable_iter == mWearableDatas.end())
 	{