Initial pass at getting a list of viewer objects with non-null material IDs.

8 files changed, 110 insertions, 12 deletions

diff --git a/indra/newview/llfloaterdebugmaterials.cpp b/indra/newview/llfloaterdebugmaterials.cpp
index 471e8e3dbf..85a0fc7a2f 100644
--- a/indra/newview/llfloaterdebugmaterials.cpp
+++ b/indra/newview/llfloaterdebugmaterials.cpp
@@ -44,6 +44,7 @@
 #include "llfontgl.h"
 #include "llhttpclient.h"
 #include "lllineeditor.h"
+#include "llmaterialid.h"
 #include "llscrolllistcell.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
@@ -56,7 +57,9 @@
 #include "lltextvalidate.h"
 #include "lluicolortable.h"
 #include "lluictrl.h"
+#include "lluuid.h"
 #include "llviewerobject.h"
+#include "llviewerobjectlist.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "v4color.h"
@@ -217,6 +220,10 @@ BOOL LLFloaterDebugMaterials::postBuild()
 	mPutScrollList = findChild<LLScrollListCtrl>("put_scroll_list");
 	llassert(mPutScrollList != NULL);
 
+	mQueryVisibleObjectsButton = findChild<LLButton>("query_visible_object_button");
+	llassert(mQueryVisibleObjectsButton != NULL);
+	mQueryVisibleObjectsButton->setCommitCallback(boost::bind(&LLFloaterDebugMaterials::onQueryVisibleObjectsClicked, this));
+
 	mGoodPostButton = findChild<LLButton>("good_post_button");
 	llassert(mGoodPostButton != NULL);
 	mGoodPostButton->setCommitCallback(boost::bind(&LLFloaterDebugMaterials::onGoodPostClicked, this));
@@ -316,6 +323,7 @@ LLFloaterDebugMaterials::LLFloaterDebugMaterials(const LLSD& pParams)
 	mPutSetButton(NULL),
 	mPutClearButton(NULL),
 	mPutScrollList(NULL),
+	mQueryVisibleObjectsButton(NULL),
 	mGoodPostButton(NULL),
 	mBadPostButton(NULL),
 	mPostScrollList(NULL),
@@ -365,6 +373,42 @@ void LLFloaterDebugMaterials::onPutClearClicked()
 	requestPutMaterials(false);
 }
 
+void LLFloaterDebugMaterials::onQueryVisibleObjectsClicked()
+{
+	S32 numViewerObjects = gObjectList.getNumObjects();
+	for (S32 viewerObjectIndex = 0; viewerObjectIndex < numViewerObjects; ++viewerObjectIndex)
+	{
+		const LLViewerObject *viewerObject = gObjectList.getObject(viewerObjectIndex);
+		if ((viewerObject != NULL) && !viewerObject->isDead())
+		{
+			U8 objectNumTEs = viewerObject->getNumTEs();
+
+			if (objectNumTEs > 0U)
+			{
+				const LLUUID& objectId = viewerObject->getID();
+				U32 objectLocalId = viewerObject->getLocalID();
+				S32 objectNumFaces = viewerObject->getNumFaces();
+				const LLViewerRegion* objectRegion = viewerObject->getRegion();
+				for (U8 curTEIndex = 0U; curTEIndex < objectNumTEs; ++curTEIndex)
+				{
+					const LLTextureEntry* objectTE = viewerObject->getTE(curTEIndex);
+					llassert(objectTE != NULL);
+					const LLMaterialID& objectMaterialID = objectTE->getMaterialID();
+					if (!objectMaterialID.isNull())
+					{
+						llinfos << "STINSON DEBUG: #" << (viewerObjectIndex + 1) << ": " << objectId.asString()
+							<< " (" << ((objectRegion != NULL) ? objectRegion->getRegionID().asString() : "<null>")
+							<< ") [" << objectLocalId << "]  {" << static_cast<unsigned int>(curTEIndex)
+							<< "} : numFaces(" << objectNumFaces << ")  material("
+							<< convertToPrintableMaterialID(objectMaterialID) << ")" << llendl;
+					}
+				}
+			}
+
+		}
+	}
+}
+
 void LLFloaterDebugMaterials::onGoodPostClicked()
 {
 	requestPostMaterials(true);
@@ -1357,6 +1401,22 @@ std::string LLFloaterDebugMaterials::convertToPrintableMaterialID(const LLSD& pB
 	return materialIDString;
 }
 
+std::string LLFloaterDebugMaterials::convertToPrintableMaterialID(const LLMaterialID& pMaterialID) const
+{
+	std::string materialID(reinterpret_cast<const char *>(pMaterialID.get()), 16);
+	std::string materialIDString;
+	for (unsigned int i = 0U; i < 4; ++i)
+	{
+		if (i != 0U)
+		{
+			materialIDString += "-";
+		}
+		const U32 *value = reinterpret_cast<const U32*>(&materialID.c_str()[i * 4]);
+		materialIDString += llformat("%08x", *value);
+	}
+	return materialIDString;
+}
+
 S32 LLFloaterDebugMaterials::getNormalMapOffsetX() const
 {
 	return getLineEditorValue(mNormalMapOffsetX);
diff --git a/indra/newview/llfloaterdebugmaterials.h b/indra/newview/llfloaterdebugmaterials.h
index 92543d5ae1..8419535ac0 100644
--- a/indra/newview/llfloaterdebugmaterials.h
+++ b/indra/newview/llfloaterdebugmaterials.h
@@ -38,6 +38,7 @@
 class LLButton;
 class LLColorSwatchCtrl;
 class LLLineEditor;
+class LLMaterialID;
 class LLScrollListCtrl;
 class LLSD;
 class LLTextBase;
@@ -74,6 +75,7 @@ private:
 	void          onValueEntered(LLUICtrl* pUICtrl);
 	void          onPutSetClicked();
 	void          onPutClearClicked();
+	void          onQueryVisibleObjectsClicked();
 	void          onGoodPostClicked();
 	void          onBadPostClicked();
 	void          onRegionCross();
@@ -114,6 +116,7 @@ private:
 	void          updateStatusMessage();
 	void          updateControls();
 	std::string   convertToPrintableMaterialID(const LLSD& pBinaryHash) const;
+	std::string   convertToPrintableMaterialID(const LLMaterialID& pMaterialID) const;
 
 	S32           getNormalMapOffsetX() const;
 	S32           getNormalMapOffsetY() const;
@@ -158,6 +161,7 @@ private:
 	LLButton*                   mPutSetButton;
 	LLButton*                   mPutClearButton;
 	LLScrollListCtrl*           mPutScrollList;
+	LLButton*                   mQueryVisibleObjectsButton;
 	LLButton*                   mGoodPostButton;
 	LLButton*                   mBadPostButton;
 	LLScrollListCtrl*           mPostScrollList;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 2bc7430e06..212b135a78 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -41,6 +41,7 @@
 #include "llframetimer.h"
 #include "llinventory.h"
 #include "llinventorydefines.h"
+#include "llmaterialid.h"
 #include "llmaterialtable.h"
 #include "llmutelist.h"
 #include "llnamevalue.h"
@@ -4267,6 +4268,26 @@ S32 LLViewerObject::setTEGlow(const U8 te, const F32 glow)
 	return retval;
 }
 
+S32 LLViewerObject::setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID)
+{
+	S32 retval = 0;
+	const LLTextureEntry *tep = getTE(te);
+	if (!tep)
+	{
+		llwarns << "No texture entry for te " << (S32)te << ", object " << mID << llendl;
+	}
+	else if (pMaterialID != tep->getMaterialID())
+	{
+		retval = LLPrimitive::setTEMaterialID(te, pMaterialID);
+		setChanged(TEXTURE);
+		if (mDrawable.notNull() && retval)
+		{
+			gPipeline.markTextured(mDrawable);
+		}
+	}
+	return retval;
+}
+
 
 S32 LLViewerObject::setTEScale(const U8 te, const F32 s, const F32 t)
 {
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 1fb30db8f2..255d0cd080 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -56,6 +56,7 @@ class LLDrawable;
 class LLHost;
 class LLHUDText;
 class LLWorld;
+class LLMaterialID;
 class LLNameValue;
 class LLNetMap;
 class LLMessageSystem;
@@ -88,18 +89,6 @@ typedef void (*inventory_callback)(LLViewerObject*,
 								   S32 serial_num,
 								   void*);
 
-// for exporting textured materials from SL
-struct LLMaterialExportInfo
-{
-public:
-	LLMaterialExportInfo(S32 mat_index, S32 texture_index, LLColor4 color) : 
-	  mMaterialIndex(mat_index), mTextureIndex(texture_index), mColor(color) {};
-
-	S32			mMaterialIndex;
-	S32			mTextureIndex;
-	LLColor4	mColor;
-};
-
 struct PotentialReturnableObject
 {
 	LLBBox			box;
@@ -320,6 +309,7 @@ public:
 	/*virtual*/	S32		setTEFullbright(const U8 te, const U8 fullbright );
 	/*virtual*/	S32		setTEMediaFlags(const U8 te, const U8 media_flags );
 	/*virtual*/ S32     setTEGlow(const U8 te, const F32 glow);
+	/*virtual*/ S32     setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID);
 	/*virtual*/	BOOL	setMaterial(const U8 material);
 	virtual		void	setTEImage(const U8 te, LLViewerTexture *imagep); // Not derived from LLPrimitive
 	virtual     void    changeTEImage(S32 index, LLViewerTexture* new_image)  ;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index e99898a83c..fb53e5c677 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -36,6 +36,7 @@
 #include "lldir.h"
 #include "llflexibleobject.h"
 #include "llfloatertools.h"
+#include "llmaterialid.h"
 #include "llmaterialtable.h"
 #include "llprimitive.h"
 #include "llvolume.h"
@@ -1960,6 +1961,17 @@ S32 LLVOVolume::setTEGlow(const U8 te, const F32 glow)
 	return  res;
 }
 
+S32 LLVOVolume::setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID)
+{
+	S32 res = LLViewerObject::setTEMaterialID(te, pMaterialID);
+	if (res)
+	{
+		gPipeline.markTextured(mDrawable);
+		mFaceMappingChanged = TRUE;
+	}
+	return  res;
+}
+
 S32 LLVOVolume::setTEScale(const U8 te, const F32 s, const F32 t)
 {
 	S32 res = LLViewerObject::setTEScale(te, s, t);
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 5482c80f2b..ff6dca9737 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -37,6 +37,7 @@
 
 class LLViewerTextureAnim;
 class LLDrawPool;
+class LLMaterialID;
 class LLSelectNode;
 class LLObjectMediaDataClient;
 class LLObjectMediaNavigateClient;
@@ -185,6 +186,7 @@ public:
 	/*virtual*/ S32		setTEBumpShinyFullbright(const U8 te, const U8 bump);
 	/*virtual*/ S32		setTEMediaFlags(const U8 te, const U8 media_flags);
 	/*virtual*/ S32		setTEGlow(const U8 te, const F32 glow);
+	/*virtual*/ S32		setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID);
 	/*virtual*/ S32		setTEScale(const U8 te, const F32 s, const F32 t);
 	/*virtual*/ S32		setTEScaleS(const U8 te, const F32 s);
 	/*virtual*/ S32		setTEScaleT(const U8 te, const F32 t);
diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index 0e6e1d7901..17ca0e3450 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -827,6 +827,14 @@
         <button
             follows="left|top"
             height="22"
+            label="Query Visible Objects"
+            layout="topleft"
+            name="query_visible_object_button"
+            top_pad="0"
+            width="214"/>
+        <button
+            follows="left|top"
+            height="22"
             label="Post Good Material ID"
             layout="topleft"
             name="good_post_button"
diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp
index 0254c5881f..37f94b82df 100644
--- a/indra/newview/tests/llmediadataclient_test.cpp
+++ b/indra/newview/tests/llmediadataclient_test.cpp
@@ -39,6 +39,7 @@
 #include "../llvovolume.h"
 
 #include "../../llprimitive/llmediaentry.cpp"
+#include "../../llprimitive/llmaterialid.cpp"
 #include "../../llprimitive/lltextureentry.cpp"
 #include "../../llmessage/tests/llcurl_stub.cpp"