diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2012-09-27 20:00:48 +0000 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2012-09-27 20:00:48 +0000 |
| commit | 421094a00622ad83c45d35ce06e09f274b07233d (patch) | |
| tree | 13d47237d5bc130d989e96cb1ae1ee008347f8d3 | |
| parent | 33099f4b7b55c166ba77a3e862573cd68ec4acef (diff) | |
| parent | 4f93192e7d00f1f03e0e5241e9f1d2f31623729c (diff) | |
merge
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/llrender/llgl.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llviewerwearable.cpp | 3 |
3 files changed, 8 insertions, 4 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/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(); } 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; |