summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-07-15 17:56:30 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-07-15 17:56:30 +0300
commit8d77d51e636f5384b0b024350a0a219e041b5446 (patch)
tree5411da7404f93816452addc81f9a9715edd2ad1b /indra/newview/llworld.cpp
parentf486bdbb48dda1364d71b8d80cc3c837efb96284 (diff)
SL-10908 Safeguards and potential crash fix
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp4
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();