From a0392ec5ec5703bd54bc4e091820d1c1423bbad4 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 2 Dec 2012 21:29:43 +0100
Subject: Refactor LLFloaterDebugMaterials::convertToPrintableMaterialID() as
 LLMaterialID::asString() so it can be used everywhere

---
 indra/llprimitive/llmaterialid.cpp | 15 +++++++++++++++
 indra/llprimitive/llmaterialid.h   |  1 +
 2 files changed, 16 insertions(+)

(limited to 'indra/llprimitive')

diff --git a/indra/llprimitive/llmaterialid.cpp b/indra/llprimitive/llmaterialid.cpp
index 7df23e5ee0..73a61f9c54 100644
--- a/indra/llprimitive/llmaterialid.cpp
+++ b/indra/llprimitive/llmaterialid.cpp
@@ -111,6 +111,21 @@ LLSD LLMaterialID::asLLSD() const
 	return materialID;
 }
 
+std::string LLMaterialID::asString() const
+{
+	std::string materialIDString;
+	for (unsigned int i = 0U; i < 4; ++i)
+	{
+		if (i != 0U)
+		{
+			materialIDString += "-";
+		}
+		const U32 *value = reinterpret_cast<const U32*>(&mID[i * 4]);
+		materialIDString += llformat("%08x", *value);
+	}
+	return materialIDString;
+}
+
 void LLMaterialID::parseFromBinary (const LLSD::Binary& pMaterialID)
 {
 	llassert(pMaterialID.size() == (MATERIAL_ID_SIZE * sizeof(U8)));
diff --git a/indra/llprimitive/llmaterialid.h b/indra/llprimitive/llmaterialid.h
index 1578172aec..a474703f79 100644
--- a/indra/llprimitive/llmaterialid.h
+++ b/indra/llprimitive/llmaterialid.h
@@ -50,6 +50,7 @@ public:
 	void          clear();
 
 	LLSD          asLLSD() const;
+	std::string   asString() const;
 
 	static const LLMaterialID null;
 
-- 
cgit v1.3