merge

4 files changed, 9 insertions, 10 deletions

diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 4d6a84b29e..b860a09de9 100755
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -9,17 +9,16 @@ use_prebuilt_binary(libxml)
 set(LLPRIMITIVE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llprimitive
     )
-
 if (WINDOWS)
 	set(LLPRIMITIVE_LIBRARIES 
         debug llprimitive
         optimized llprimitive
         debug libcollada14dom22-d
         optimized libcollada14dom22
-        debug libboost_filesystem-d
-        optimized libboost_filesystem
-        debug libboost_system-d
-        optimized libboost_system
+        debug libboost_filesystem-vc100-mt-gd-1_45
+        optimized libboost_filesystem-vc100-mt-1_45
+        debug libboost_system-vc100-mt-gd-1_45
+        optimized libboost_system-vc100-mt-1_45
         )
 else (WINDOWS)
     set(LLPRIMITIVE_LIBRARIES 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 991669d271..24bd3299f1 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1455,7 +1455,7 @@ if (WINDOWS)
         PROPERTIES
         # *TODO -reenable this once we get server usage sorted out
         #LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\""
-        LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS"
+        LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc"
         LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
         LINK_FLAGS_RELEASE ""
         )
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 37a9c7304d..73f63458a3 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 90e835cda8..4b2c569cc3 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 * (3*5 + 2 + 4);
+		int nfloats = nverts * (2*4 + 3*3 + 2 + 4);
 		//use 16 byte aligned vertex data to make LLPolyMesh SSE friendly
-		mVertexData = new F32[nfloats];
+		mVertexData = (F32*) malloc(nfloats*4);
 		int offset = 0;
 		mCoords				= 	(LLVector4*)(mVertexData + offset); offset += 4*nverts;
 		mNormals			=	(LLVector4*)(mVertexData + offset); offset += 4*nverts;
@@ -799,7 +799,7 @@ LLPolyMesh::~LLPolyMesh()
                 mJointRenderData[i] = NULL;
         }
 
-		delete [] mVertexData;
+		free(mVertexData);
 
 }