diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-13 13:43:43 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-13 13:43:43 -0500 |
| commit | b2d3f5009efb97ba13800ecf26da1bd6b2e90fa3 (patch) | |
| tree | e23c3daecd42d76091da9174ff0eb31a0ea3da5e | |
| parent | c6da212dc20138599cb945ff77f3c8a59b57e736 (diff) | |
| parent | 12f9f521ee6baeb39b403dfe15168de7ecfd9349 (diff) | |
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/newview/llpolymesh.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/autobuild.xml b/autobuild.xml index 43d297df6d..03db2f8d49 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/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index 24f84b2ddf..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 * (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; |