diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:43:17 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:43:17 +0300 |
| commit | dae67e9f960bf02e3fecb59c7a11a90410054235 (patch) | |
| tree | 11b2f01d56164d444184b8101618e876f18b9c62 /indra/newview/llworld.cpp | |
| parent | be7d81626e512019b46a8ed301b4a1825e129aa5 (diff) | |
| parent | 33821bd599d1d9171cc93c38a2bc6c4ab6772c9a (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index cee47a591e..89f5eb86b3 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -916,10 +916,10 @@ void LLWorld::updateWaterObjects() } } - for (std::list<LLVOWater*>::iterator iter = mHoleWaterObjects.begin(); + for (std::list<LLPointer<LLVOWater> >::iterator iter = mHoleWaterObjects.begin(); iter != mHoleWaterObjects.end(); ++ iter) { - LLVOWater* waterp = *iter; + LLVOWater* waterp = (*iter).get(); gObjectList.killObject(waterp); } mHoleWaterObjects.clear(); |