diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
| commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
| tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/newview/llsurface.h | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/newview/llsurface.h')
| -rw-r--r-- | indra/newview/llsurface.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llsurface.h b/indra/newview/llsurface.h index 7698c272ab..ca22535542 100644 --- a/indra/newview/llsurface.h +++ b/indra/newview/llsurface.h @@ -22,7 +22,6 @@ #include "llvowater.h" #include "llpatchvertexarray.h" -#include "lldarray.h" #include "llviewerimage.h" class LLTimer; @@ -96,7 +95,7 @@ public: LLSurfacePatch *resolvePatchGlobal(const LLVector3d &position_global) const; // Update methods (called during idle, normally) - BOOL idleUpdate(); + BOOL idleUpdate(F32 max_update_time); void renderSurfaceBounds(); @@ -181,7 +180,7 @@ protected: // Array of grid normals, mGridsPerEdge * mGridsPerEdge LLVector3 *mNorm; - LLDynamicArray<LLSurfacePatch *> mDirtyPatchList; + std::set<LLSurfacePatch *> mDirtyPatchList; // The textures should never be directly initialized - use the setter methods! |