diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-23 18:30:09 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-23 18:30:09 +0300 |
| commit | 5082b42d0a41d4566bf23e17af0483c747166c10 (patch) | |
| tree | 436108424299c39ef0c9ad32c8c2fa778af0b947 /indra/newview/llworld.h | |
| parent | c7e9bbc20e2c08976cdb72a877d7d41a2546f418 (diff) | |
| parent | 33821bd599d1d9171cc93c38a2bc6c4ab6772c9a (diff) | |
Merged in lindenlab/viewer-release
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 c9ac241d5a..993fbfb2cc 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -199,7 +199,7 @@ private: // Data for "Fake" objects // - std::list<LLVOWater*> mHoleWaterObjects; + std::list<LLPointer<LLVOWater> > mHoleWaterObjects; LLPointer<LLVOWater> mEdgeWaterObjects[8]; LLPointer<LLViewerTexture> mDefaultWaterTexturep; |