From 7fa2a621039da49c3b6dffce02735c0755a61d2f Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 13 Jul 2011 03:59:37 -0500
Subject: [PATCH] Renamed vivox icons from nonsensical uuids to something
 readable, as per v2.

---
 indra/newview/llvoicevisualizer.cpp             |  16 ++++++++--------
 ...e49-41e9320507d5.j2c => voice_meter_dot.j2c} | Bin
 ...b-f9e686d31e83.j2c => voice_meter_rings.j2c} | Bin
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename indra/newview/skins/default/textures/{041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c => voice_meter_dot.j2c} (100%)
 rename indra/newview/skins/default/textures/{29de489d-0491-fb00-7dab-f9e686d31e83.j2c => voice_meter_rings.j2c} (100%)

diff --git a/indra/newview/llvoicevisualizer.cpp b/indra/newview/llvoicevisualizer.cpp
index 1a899db7f..00f75df00 100644
--- a/indra/newview/llvoicevisualizer.cpp
+++ b/indra/newview/llvoicevisualizer.cpp
@@ -42,7 +42,7 @@
 #include "llvoicevisualizer.h"
 #include "llviewercamera.h"
 #include "llviewerobject.h"
-#include "llimagegl.h"
+#include "llviewertexture.h"
 #include "llviewertexturelist.h"
 #include "llvoiceclient.h"
 #include "llrender.h"
@@ -130,13 +130,13 @@ LLVoiceVisualizer::LLVoiceVisualizer( const U8 type )
 	
 	const char* sound_level_img[] = 
 	{
-		"041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c",
-		"29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
-		"29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
-		"29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
-		"29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
-		"29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
-		"29de489d-0491-fb00-7dab-f9e686d31e83.j2c"
+		"voice_meter_dot.j2c",
+		"voice_meter_rings.j2c",
+		"voice_meter_rings.j2c",
+		"voice_meter_rings.j2c",
+		"voice_meter_rings.j2c",
+		"voice_meter_rings.j2c",
+		"voice_meter_rings.j2c"
 	};
 
 	for (int i=0; i<NUM_VOICE_SYMBOL_WAVES; i++)
diff --git a/indra/newview/skins/default/textures/041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c b/indra/newview/skins/default/textures/voice_meter_dot.j2c
similarity index 100%
rename from indra/newview/skins/default/textures/041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c
rename to indra/newview/skins/default/textures/voice_meter_dot.j2c
diff --git a/indra/newview/skins/default/textures/29de489d-0491-fb00-7dab-f9e686d31e83.j2c b/indra/newview/skins/default/textures/voice_meter_rings.j2c
similarity index 100%
rename from indra/newview/skins/default/textures/29de489d-0491-fb00-7dab-f9e686d31e83.j2c
rename to indra/newview/skins/default/textures/voice_meter_rings.j2c