From 12f9f521ee6baeb39b403dfe15168de7ecfd9349 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 13 Apr 2011 13:43:32 -0500
Subject: [PATCH] Fix for bad default setting and libpng using /GL
---
autobuild.xml | 4 ++--
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/llpolymesh.cpp | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 43d297df6dd..03db2f8d49e 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1026,9 +1026,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>735a955e6442733e2342ab12c1087488</string>
+ <string>f194ba857ca8dd86483a3ef24535d0db</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.5.1-windows-20110221.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/226532/arch/CYGWIN/installer/libpng-1.5.1-windows-20110413.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 37a9c7304d0..73f63458a31 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7178,7 +7178,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1.0</integer>
+ <integer>0</integer>
</map>
<key>RenderLocalLights</key>
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp
index 24f84b2ddfa..4b2c569cc3a 100644
--- a/indra/newview/llpolymesh.cpp
+++ b/indra/newview/llpolymesh.cpp
@@ -768,9 +768,9 @@ LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_
// Allocate memory without initializing every vector
// NOTE: This makes asusmptions about the size of LLVector[234]
int nverts = mSharedData->mNumVertices;
- int nfloats = nverts * (2*4 + 3*3 + 2 + 4);
- //use 16 byte aligned vertex data to make LLPolyMesh SSE friendly
- mVertexData = (F32*) malloc(nfloats*4);
+ int nfloats = nverts * (2*4 + 3*3 + 2 + 4);
+ //use 16 byte aligned vertex data to make LLPolyMesh SSE friendly
+ mVertexData = (F32*) malloc(nfloats*4);
int offset = 0;
mCoords = (LLVector4*)(mVertexData + offset); offset += 4*nverts;
mNormals = (LLVector4*)(mVertexData + offset); offset += 4*nverts;
--
GitLab