1 files changed, 56 insertions, 24 deletions

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 96e701a6cb..4e233d479a 100644..100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -201,6 +201,8 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
 	mTotalCRC(0),
 	mListIndex(-1),
 	mTEImages(NULL),
+	mTENormalMaps(NULL),
+	mTESpecularMaps(NULL),
 	mGLName(0),
 	mbCanSelect(TRUE),
 	mFlags(0),
@@ -321,6 +323,18 @@ void LLViewerObject::deleteTEImages()
 {
 	delete[] mTEImages;
 	mTEImages = NULL;
+	
+	if (mTENormalMaps != NULL)
+	{
+		delete[] mTENormalMaps;
+		mTENormalMaps = NULL;
+	}
+	
+	if (mTESpecularMaps != NULL)
+	{
+		delete[] mTESpecularMaps;
+		mTESpecularMaps = NULL;
+	}	
 }
 
 void LLViewerObject::markDead()
@@ -516,6 +530,17 @@ void LLViewerObject::setNameValueList(const std::string& name_value_list)
 	}
 }
 
+void LLViewerObject::setSelected(BOOL sel)
+{
+	mUserSelected = sel;
+	resetRot();
+
+	if (!sel)
+	{
+		setAllTESelected(false);
+	}
+}
+
 // This method returns true if the object is over land owned by the
 // agent.
 bool LLViewerObject::isReturnable()
@@ -2135,7 +2160,8 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 		if (mDrawable->isState(LLDrawable::FORCE_INVISIBLE) && !mOrphaned)
 		{
 // 			lldebugs << "Clearing force invisible: " << mID << ":" << getPCodeString() << ":" << getPositionAgent() << llendl;
-			mDrawable->setState(LLDrawable::CLEAR_INVISIBLE);
+			mDrawable->clearState(LLDrawable::FORCE_INVISIBLE);
+			gPipeline.markRebuild( mDrawable, LLDrawable::REBUILD_ALL, TRUE );
 		}
 	}
 
@@ -4102,14 +4128,8 @@ S32 LLViewerObject::setTENormalMapCore(const U8 te, LLViewerTexture *image)
 		{
 			mat->setNormalID(uuid);
 		}
-
-		setChanged(TEXTURE);
-		if (mDrawable.notNull())
-		{
-			gPipeline.markTextured(mDrawable);
-		}
 	}
-	mTENormalMaps[te] = image;	
+	changeTENormalMap(te,image);	
 	return retval;
 }
 
@@ -4131,13 +4151,8 @@ S32 LLViewerObject::setTESpecularMapCore(const U8 te, LLViewerTexture *image)
 		{
 			mat->setSpecularID(uuid);
 		}		
-		setChanged(TEXTURE);
-		if (mDrawable.notNull())
-		{
-			gPipeline.markTextured(mDrawable);
-		}
 	}
-	mTESpecularMaps[te] = image;
+	changeTESpecularMap(te, image);
 	return retval;
 }
 
@@ -4157,6 +4172,11 @@ void LLViewerObject::changeTENormalMap(S32 index, LLViewerTexture* new_image)
 	{
 		return ;
 	}
+	setChanged(TEXTURE);
+	if (mDrawable.notNull())
+	{
+		gPipeline.markTextured(mDrawable);
+	}
 	mTENormalMaps[index] = new_image ;
 }
 
@@ -4166,6 +4186,11 @@ void LLViewerObject::changeTESpecularMap(S32 index, LLViewerTexture* new_image)
 	{
 		return ;
 	}
+	setChanged(TEXTURE);
+	if (mDrawable.notNull())
+	{
+		gPipeline.markTextured(mDrawable);
+	}
 	mTESpecularMaps[index] = new_image ;
 }
 
@@ -4361,17 +4386,23 @@ S32 LLViewerObject::setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID
 							 << ", material " << pMaterialID
 							 << LL_ENDL;
 	}
-	else if (pMaterialID != tep->getMaterialID())
+	//else if (pMaterialID != tep->getMaterialID())
 	{
 		LL_DEBUGS("Material") << "Changing texture entry for te " << (S32)te
 							 << ", object " << mID
 							 << ", material " << pMaterialID
 							 << LL_ENDL;
 		retval = LLPrimitive::setTEMaterialID(te, pMaterialID);
-		setChanged(TEXTURE);
-		if (mDrawable.notNull() && retval)
+		if (retval)
 		{
-			gPipeline.markTextured(mDrawable);
+			// Kitty would like to know if this is necessary?
+			// Since we should get a setTEMaterialParams that does it anyway?
+			//
+			setChanged(TEXTURE);
+			if (mDrawable.notNull())
+			{
+				gPipeline.markTextured(mDrawable);
+			}
 		}
 	}
 	return retval;
@@ -4384,22 +4415,23 @@ S32 LLViewerObject::setTEMaterialParams(const U8 te, const LLMaterialPtr pMateri
 	if (!tep)
 	{
 		llwarns << "No texture entry for te " << (S32)te << ", object " << mID << llendl;
+		return 0;
 	}
-	else if (pMaterialParams != tep->getMaterialParams())
-	{
+
 		retval = LLPrimitive::setTEMaterialParams(te, pMaterialParams);
 		LL_DEBUGS("Material") << "Changing material params for te " << (S32)te
 							  << ", object " << mID
 			                  << " (" << retval << ")"
 							  << LL_ENDL;
-		setTENormalMap(te, tep->getMaterialParams()->getNormalID());
-		setTESpecularMap(te, tep->getMaterialParams()->getSpecularID());
+		setTENormalMap(te, (pMaterialParams) ? pMaterialParams->getNormalID() : LLUUID::null);
+		setTESpecularMap(te, (pMaterialParams) ? pMaterialParams->getSpecularID() : LLUUID::null);
+
 		setChanged(TEXTURE);
-		if (mDrawable.notNull() && retval)
+		if (mDrawable.notNull())
 		{
 			gPipeline.markTextured(mDrawable);
 		}
-	}
+
 	return retval;
 }