diff options
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 5b770994a8..8c9892b28f 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -65,7 +65,7 @@ public: class LLTextureUploadData { public: - LLPointer<LLViewerFetchedTexture> mTexture; + LLViewerFetchedTexture* mTexture; LLUUID mUUID; std::string mRSVP; std::string mLabel; @@ -409,7 +409,7 @@ public: std::queue<LLTextureUploadData> mTextureQ; std::queue<LLTextureUploadData> mConfirmedTextureQ; - std::map<LLPointer<LLViewerFetchedTexture>, LLTextureUploadData> mTextureMap; + std::map<LLViewerFetchedTexture*, LLTextureUploadData> mTextureMap; LLMeshUploadThread(instance_list& data, LLVector3& scale, bool upload_textures, bool upload_skin, bool upload_joints); @@ -452,6 +452,7 @@ public: void init(); void shutdown(); + S32 update() ; //mesh management functions S32 loadMesh(LLVOVolume* volume, const LLVolumeParams& mesh_params, S32 detail = 0); @@ -515,6 +516,7 @@ public: LLMeshRepoThread* mThread; std::vector<LLMeshUploadThread*> mUploads; + std::vector<LLMeshUploadThread*> mUploadWaitList; LLPhysicsDecomp* mDecompThread; |