Merge branch 'master' into DRTVWR-543-maint

# Conflicts:
#	indra/newview/llagentwearables.cpp
#	indra/newview/llvoicevivox.cpp

1 files changed, 17 insertions, 0 deletions

diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp
index 37c718b4c6..58b2d00d44 100644
--- a/indra/llprimitive/llmaterialtable.cpp
+++ b/indra/llprimitive/llmaterialtable.cpp
@@ -559,6 +559,23 @@ LLUUID LLMaterialTable::getCollisionSoundUUID(U8 mcode, U8 mcode2)
 	}
 }
 
+bool LLMaterialTable::isCollisionSound(const LLUUID &uuid)
+{
+	for (U8 i = 0; i < LL_MCODE_END; i++)
+	{
+		for (U8 j = 0; j < LL_MCODE_END; j++)
+		{
+			i &= LL_MCODE_MASK;
+			j &= LL_MCODE_MASK;
+			if (mCollisionSoundMatrix[i * LL_MCODE_END + j] == uuid)
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 LLUUID LLMaterialTable::getSlidingSoundUUID(U8 mcode, U8 mcode2)
 {	
 	mcode &= LL_MCODE_MASK;