2 files changed, 3 insertions, 5 deletions
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp
index db4c4259f3..630c109d8f 100644
--- a/indra/llprimitive/llmodelloader.cpp
+++ b/indra/llprimitive/llmodelloader.cpp
@@ -123,7 +123,6 @@ LLModelLoader::LLModelLoader(
 , mLod(lod)
 , mTrySLM(false)
 , mFirstTransform(true)
-, mNumOfFetchingTextures(0)
 , mLoadCallback(load_cb)
 , mJointLookupFunc(joint_lookup_func)
 , mTextureLoadFunc(texture_load_func)
@@ -134,6 +133,7 @@ LLModelLoader::LLModelLoader(
 , mNoNormalize(false)
 , mNoOptimize(false)
 , mCacheOnlyHitIfRigged(false)
+, mTexturesNeedScaling(false)
 , mMaxJointsPerMesh(maxJointsPerMesh)
 , mGeneratedModelLimit(modelLimit)
 , mDebugMode(debugMode)
@@ -669,7 +669,7 @@ void LLModelLoader::loadTextures()
 
                 if(!material.mDiffuseMapFilename.empty())
                 {
-                    mNumOfFetchingTextures += mTextureLoadFunc(material, mOpaqueData);
+                    mTextureLoadFunc(material, mOpaqueData);
                 }
             }
         }
diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h
index 06a17f006e..335d809386 100644
--- a/indra/llprimitive/llmodelloader.h
+++ b/indra/llprimitive/llmodelloader.h
@@ -109,6 +109,7 @@ public:
 
     bool mTrySLM;
     bool mCacheOnlyHitIfRigged; // ignore cached SLM if it does not contain rig info (and we want rig info)
+    bool mTexturesNeedScaling;
 
     model_list      mModelList;
     // The scene is pretty much what ends up getting loaded for upload.  Basically assign things to this guy if you want something uploaded.
@@ -170,9 +171,6 @@ public:
 
     void stretch_extents(const LLModel* model, const LLMatrix4& mat);
 
-    S32 mNumOfFetchingTextures ; // updated in the main thread
-    bool areTexturesReady() { return !mNumOfFetchingTextures; } // called in the main thread.
-
     bool verifyCount( int expected, int result );
 
     //Determines the viability of an asset to be used as an avatar rig (w or w/o joint upload caps)