diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-10-16 22:24:03 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-10-16 22:24:03 +0100 |
commit | c7747d2a1bba6ac62e9b540a283ae2c9f4bfd221 (patch) | |
tree | 8c6b6b564b80a0f2b0ad774f64f9fc9a1c50b7d5 /indra/newview/llworld.h | |
parent | cc3cf17e5e335b6e78d86755e015161ab92c50db (diff) | |
parent | 33821bd599d1d9171cc93c38a2bc6c4ab6772c9a (diff) |
merge
Diffstat (limited to 'indra/newview/llworld.h')
-rw-r--r-- | indra/newview/llworld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index 9722448746..98552bc4d1 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -202,7 +202,7 @@ private: // Data for "Fake" objects // - std::list<LLVOWater*> mHoleWaterObjects; + std::list<LLPointer<LLVOWater> > mHoleWaterObjects; LLPointer<LLVOWater> mEdgeWaterObjects[8]; LLPointer<LLViewerTexture> mDefaultWaterTexturep; |