Merge from default branch.

This reverts Angela's fixes to panel_classified_info. I'll fix that a bit
later.

--HG--
branch : product-engine

1 files changed, 8 insertions, 6 deletions

diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 662e6dcabe..6ed95f2cbf 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -1130,7 +1130,8 @@ LLTexLayerInterface::LLTexLayerInterface(LLTexLayerSet* const layer_set):
 }
 
 LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWearable *wearable):
-	mTexLayerSet( layer.mTexLayerSet )
+	mTexLayerSet( layer.mTexLayerSet ),
+	mInfo(NULL)
 {
 	// don't add visual params for cloned layers
 	setInfo(layer.getInfo(), wearable);
@@ -1140,11 +1141,12 @@ LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWea
 
 BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable  ) // This sets mInfo and calls initialization functions
 {
-	//llassert(mInfo == NULL); // nyx says this is probably bogus but needs investigating
-        if (mInfo != NULL) // above llassert(), but softened into a warning
-        {
-                llwarns << "BAD STUFF!  mInfo != NULL" << llendl;
-        }
+	// setInfo should only be called once. Code is not robust enough to handle redefinition of a texlayer.
+	// Not a critical warning, but could be useful for debugging later issues. -Nyx
+	if (mInfo != NULL) 
+	{
+			llwarns << "mInfo != NULL" << llendl;
+	}
 	mInfo = info;
 	//mID = info->mID; // No ID