From 3d698286fbdcdfc0c9bdcb873f0d2af124640a0b Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Tue, 25 Sep 2012 23:27:15 +0000
Subject: Wrapping failing llgl assert in gDebugGL

---
 indra/llrender/llgl.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index a53c3ca9b7..e28e3157d2 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1951,7 +1951,10 @@ LLGLState::LLGLState(LLGLenum state, S32 enabled) :
 	if (mState)
 	{
 		mWasEnabled = sStateMap[state];
-		llassert(mWasEnabled == glIsEnabled(state));
+		if (gDebugGL)
+		{
+			llassert(mWasEnabled == glIsEnabled(state));
+		}
 		setEnabled(enabled);
 		stop_glerror();
 	}
-- 
cgit v1.2.3


From 4f93192e7d00f1f03e0e5241e9f1d2f31623729c Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Thu, 27 Sep 2012 00:38:52 +0000
Subject: Fix for mac/linux 'ruth' appearance.  Fix for linux build issue

---
 autobuild.xml                      | 4 ++--
 indra/newview/llviewerwearable.cpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 0c2fb6783f..d91ea05238 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1254,9 +1254,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9ddf0bb2238a937f0115d6c9f0cf723f</string>
+              <string>e737558cc184667f23f01a103cc9a41a</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/265084/arch/Linux/installer/llappearanceutility_source-0.1-linux-20120923.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/265214/arch/Linux/installer/llappearanceutility_source-0.1-linux-20120926.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp
index 162c20837a..41cef237ed 100644
--- a/indra/newview/llviewerwearable.cpp
+++ b/indra/newview/llviewerwearable.cpp
@@ -319,7 +319,8 @@ void LLViewerWearable::writeToAvatar(LLAvatarAppearance *avatarp)
 
 	if (!viewer_avatar->isValid()) return;
 
-#if 1
+	// *TODO: Check with Vir on this:
+#if 0
 	if (!viewer_avatar->isUsingLocalAppearance())
 	{
 		return;
-- 
cgit v1.2.3