diff options
| author | Jonathan Wolk <none@none> | 2010-10-19 11:29:42 -0700 |
|---|---|---|
| committer | Jonathan Wolk <none@none> | 2010-10-19 11:29:42 -0700 |
| commit | 256c6e6a252feaa7ae50f81778aab1e0246a526a (patch) | |
| tree | ef1982449f3942fe6a5504b5e18536e21644e7e5 /indra/newview/llmeshrepository.h | |
| parent | a045261002963fce7a719c9bcffee396aef821ca (diff) | |
Moved retry logic for certain mesh header fetches to help with SH-323 'Some mesh objects fail to load data for valid meshes'. Renamed some variables to be more clear.
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index bbfe2e46f2..427bcb8a75 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -139,7 +139,7 @@ public: void merge(const LLMeshDecomposition* rhs); LLUUID mMeshID; - LLModel::physics_shape mHull; + LLModel::convex_hull_decomposition mHull; LLModel::hull mBaseHull; std::vector<LLPointer<LLVertexBuffer> > mMesh; @@ -165,7 +165,7 @@ public: //output state std::string mStatusMessage; std::vector<LLPointer<LLVertexBuffer> > mHullMesh; - LLModel::physics_shape mHull; + LLModel::convex_hull_decomposition mHull; virtual S32 statusCallback(const char* status, S32 p1, S32 p2) = 0; virtual void completed() = 0; |