diff options
Diffstat (limited to 'indra/newview/llworld.h')
| -rw-r--r-- | indra/newview/llworld.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index ce83cbd97c..48025c700b 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -42,10 +42,10 @@ #include "llmath.h" #include "v3math.h" -#include "llmemory.h" +#include "llsingleton.h" #include "llstring.h" #include "llviewerpartsim.h" -#include "llviewerimage.h" +#include "llviewertexture.h" #include "llvowater.h" class LLViewerRegion; @@ -141,7 +141,7 @@ public: F32 getLandFarClip() const; void setLandFarClip(const F32 far_clip); - LLViewerImage *getDefaultWaterTexture(); + LLViewerTexture *getDefaultWaterTexture(); void updateWaterObjects(); void shiftRegions(const LLVector3& offset); @@ -192,7 +192,7 @@ private: std::list<LLVOWater*> mHoleWaterObjects; LLPointer<LLVOWater> mEdgeWaterObjects[8]; - LLPointer<LLViewerImage> mDefaultWaterTexturep; + LLPointer<LLViewerTexture> mDefaultWaterTexturep; }; |