diff options
author | Oz Linden <oz@lindenlab.com> | 2015-09-29 15:24:03 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-09-29 15:24:03 -0400 |
commit | 9757c3a7fa1c67ecbf62df4493dc68040ba0e264 (patch) | |
tree | 1d3ec613c44b1c91b2ee91546be7be0de9c72f6e /indra/newview/llmeshrepository.h | |
parent | 453dee2d21477ad534fa9982b844c40adde9b93e (diff) | |
parent | 2d52b62e67cf46222396c724d00d2de874819197 (diff) |
merge changes for 3.8.4-release
Diffstat (limited to 'indra/newview/llmeshrepository.h')
-rwxr-xr-x | indra/newview/llmeshrepository.h | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 39280bea3a..688cd01a87 100755 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -90,54 +90,6 @@ public: } }; -class LLImportMaterial -{ -public: - LLPointer<LLViewerFetchedTexture> mDiffuseMap; - std::string mDiffuseMapFilename; - std::string mDiffuseMapLabel; - std::string mBinding; - LLColor4 mDiffuseColor; - bool mFullbright; - - bool operator<(const LLImportMaterial ¶ms) const; - - LLImportMaterial() - : mFullbright(false) - { - mDiffuseColor.set(1,1,1,1); - } - - LLImportMaterial(LLSD& data); - - LLSD asLLSD(); -}; - -class LLModelInstance -{ -public: - LLPointer<LLModel> mModel; - LLPointer<LLModel> mLOD[5]; - - std::string mLabel; - - LLUUID mMeshID; - S32 mLocalMeshID; - - LLMatrix4 mTransform; - std::map<std::string, LLImportMaterial> mMaterial; - - LLModelInstance(LLModel* model, const std::string& label, LLMatrix4& transform, std::map<std::string, LLImportMaterial>& materials) - : mModel(model), mLabel(label), mTransform(transform), mMaterial(materials) - { - mLocalMeshID = -1; - } - - LLModelInstance(LLSD& data); - - LLSD asLLSD(); -}; - class LLPhysicsDecomp : public LLThread { public: @@ -483,6 +435,8 @@ public: // Inherited from LLCore::HttpHandler virtual void onCompleted(LLCore::HttpHandle handle, LLCore::HttpResponse * response); + LLViewerFetchedTexture* FindViewerTexture(const LLImportMaterial& material); + private: LLHandle<LLWholeModelFeeObserver> mFeeObserverHandle; LLHandle<LLWholeModelUploadObserver> mUploadObserverHandle; |