diff options
| author | Dave Parks <davep@lindenlab.com> | 2009-11-24 07:38:04 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2009-11-24 07:38:04 -0600 |
| commit | 62233f22469cdc66042fc7bbbbd367dbb7212fde (patch) | |
| tree | b89982d6b2076694953492646310f5f210e6698e /indra/newview/pipeline.h | |
| parent | 5f44d4398a6d8abd05bba1d6c76831d674095ac1 (diff) | |
Fix for copying of tetrahedrons in place of mesh LODs.
Fix for bad tetrahedron bounding box.
Bad fix for simultaneous loading of multiple LODs.
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 23e98aa0d6..a31379a209 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -676,8 +676,9 @@ public: protected: std::vector<LLFace*> mSelectedFaces; + typedef std::map<LLUUID, std::set<LLUUID> > mesh_load_map; - mesh_load_map mLoadingMeshes; + mesh_load_map mLoadingMeshes[4]; LLMutex* mMeshMutex; @@ -688,7 +689,8 @@ protected: LLVolume* mTargetVolume; LLUUID mMeshID; F32 mDetail; - LLMeshThread(LLUUID mesh_id, LLVolume* target); + S32 mDetailIndex; + LLMeshThread(LLUUID mesh_id, LLVolume* target, S32 detail = -1); ~LLMeshThread(); void run(); }; |