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
commite9a9f71e563f236eabf5dca980913bcbb6f36a94 (patch)
tree183b98dda03a3612b63e140e6ef9f5cf99757ce5 /indra/newview/llworld.cpp
parent0771d66acec71a4165eed03e3b0efc24f7d760e5 (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();