Second Life viewer sources 1.21.0-RC

1 files changed, 18 insertions, 10 deletions

diff --git a/linden/indra/newview/llpolymesh.cpp b/linden/indra/newview/llpolymesh.cpp
index 3884b31..0a1e2ce 100644
--- a/linden/indra/newview/llpolymesh.cpp
+++ b/linden/indra/newview/llpolymesh.cpp
@@ -261,12 +261,12 @@ BOOL LLPolyMeshSharedData::allocateJointNames( U32 numJointNames )
 //--------------------------------------------------------------------
 // LLPolyMeshSharedData::loadMesh()
 //--------------------------------------------------------------------
-BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
+BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 {
         //-------------------------------------------------------------------------
         // Open the file
         //-------------------------------------------------------------------------
-        if(!fileName)
+        if(fileName.empty())
         {
                 llerrs << "Filename is Empty!" << llendl;
                 return FALSE;
@@ -595,7 +595,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                                         // we reached the end of the morphs
                                         break;
                                 }
-                                LLPolyMorphData* morph_data = new LLPolyMorphData(morphName);
+                                LLPolyMorphData* morph_data = new LLPolyMorphData(std::string(morphName));
 
                                 BOOL result = morph_data->loadBinary(fp, this);
 
@@ -679,7 +679,9 @@ const LLVector2 &LLPolyMeshSharedData::getUVs(U32 index)
 // LLPolyMesh()
 //-----------------------------------------------------------------------------
 LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_mesh)
-{
+{       
+        LLMemType mt(LLMemType::MTYPE_AVATAR_MESH);
+
         llassert(shared_data);
 
         mSharedData = shared_data;
@@ -687,6 +689,12 @@ LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_
         mAvatarp = NULL;
         mVertexData = NULL;
 
+        mCurVertexCount = 0;
+        mFaceIndexCount = 0;
+        mFaceIndexOffset = 0;
+        mFaceVertexCount = 0;
+        mFaceVertexOffset = 0;
+
         if (shared_data->isLOD() && reference_mesh)
         {
                 mCoords = reference_mesh->mCoords;
@@ -755,7 +763,7 @@ LLPolyMesh::~LLPolyMesh()
 //-----------------------------------------------------------------------------
 // LLPolyMesh::getMesh()
 //-----------------------------------------------------------------------------
-LLPolyMesh *LLPolyMesh::getMesh(const LLString &name, LLPolyMesh* reference_mesh)
+LLPolyMesh *LLPolyMesh::getMesh(const std::string &name, LLPolyMesh* reference_mesh)
 {
         //-------------------------------------------------------------------------
         // search for an existing mesh by this name
@@ -771,8 +779,8 @@ LLPolyMesh *LLPolyMesh::getMesh(const LLString &name, LLPolyMesh* reference_mesh
         //-------------------------------------------------------------------------
         // if not found, create a new one, add it to the list
         //-------------------------------------------------------------------------
-        char full_path[LL_MAX_PATH];            /*Flawfinder: ignore*/
-        snprintf(full_path, LL_MAX_PATH, "%s", (gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,name.c_str())).c_str());                       /* Flawfinder: ignore */
+        std::string full_path;
+        full_path = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,name);
 
         LLPolyMeshSharedData *mesh_data = new LLPolyMeshSharedData();
         if (reference_mesh)
@@ -929,7 +937,7 @@ void LLPolyMesh::initializeForMorph()
 //-----------------------------------------------------------------------------
 // getMorphData()
 //-----------------------------------------------------------------------------
-LLPolyMorphData*        LLPolyMesh::getMorphData(const char *morph_name)
+LLPolyMorphData*        LLPolyMesh::getMorphData(const std::string& morph_name)
 {
         if (!mSharedData)
                 return NULL;
@@ -937,7 +945,7 @@ LLPolyMorphData*	LLPolyMesh::getMorphData(const char *morph_name)
                  iter != mSharedData->mMorphData.end(); ++iter)
         {
                 LLPolyMorphData *morph_data = *iter;
-                if (!strcmp(morph_data->getName(), morph_name))
+                if (morph_data->getName() == morph_name)
                 {
                         return morph_data;
                 }
@@ -1003,7 +1011,7 @@ BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
         {
                 if (bone->hasName("bone"))
                 {
-                        LLString name;
+                        std::string name;
                         LLVector3 scale;
                         LLVector3 pos;
                         BOOL haspos = FALSE;