diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llsurface.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llsurface.h b/linden/indra/newview/llsurface.h index 12c1afc..73fe6e6 100644 --- a/linden/indra/newview/llsurface.h +++ b/linden/indra/newview/llsurface.h | |||
@@ -41,7 +41,6 @@ | |||
41 | 41 | ||
42 | #include "llvowater.h" | 42 | #include "llvowater.h" |
43 | #include "llpatchvertexarray.h" | 43 | #include "llpatchvertexarray.h" |
44 | #include "lldarray.h" | ||
45 | #include "llviewerimage.h" | 44 | #include "llviewerimage.h" |
46 | 45 | ||
47 | class LLTimer; | 46 | class LLTimer; |
@@ -115,7 +114,7 @@ public: | |||
115 | LLSurfacePatch *resolvePatchGlobal(const LLVector3d &position_global) const; | 114 | LLSurfacePatch *resolvePatchGlobal(const LLVector3d &position_global) const; |
116 | 115 | ||
117 | // Update methods (called during idle, normally) | 116 | // Update methods (called during idle, normally) |
118 | BOOL idleUpdate(); | 117 | BOOL idleUpdate(F32 max_update_time); |
119 | 118 | ||
120 | void renderSurfaceBounds(); | 119 | void renderSurfaceBounds(); |
121 | 120 | ||
@@ -200,7 +199,7 @@ protected: | |||
200 | // Array of grid normals, mGridsPerEdge * mGridsPerEdge | 199 | // Array of grid normals, mGridsPerEdge * mGridsPerEdge |
201 | LLVector3 *mNorm; | 200 | LLVector3 *mNorm; |
202 | 201 | ||
203 | LLDynamicArray<LLSurfacePatch *> mDirtyPatchList; | 202 | std::set<LLSurfacePatch *> mDirtyPatchList; |
204 | 203 | ||
205 | 204 | ||
206 | // The textures should never be directly initialized - use the setter methods! | 205 | // The textures should never be directly initialized - use the setter methods! |