summaryrefslogtreecommitdiff
path: root/indra/newview/llflexibleobject.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-04-17 11:17:46 -0700
committersimon <none@none>2013-04-17 11:17:46 -0700
commit6742d90d39fbb5c5bc3b675f37841fd6c8ec09c9 (patch)
tree841285193b28a3c971051f53573a2a2f1c83a330 /indra/newview/llflexibleobject.cpp
parentc537b63936e49d4e685d96695334fdd7a961b470 (diff)
Some minor cleanups while hunting crashes. Reviewed by Kelly
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
-rw-r--r--indra/newview/llflexibleobject.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index bf479dc92e..98c0c0bf51 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -294,6 +294,9 @@ void LLVolumeImplFlexible::onSetVolume(const LLVolumeParams &volume_params, cons
void LLVolumeImplFlexible::updateRenderRes()
{
+ if (!mAttributes)
+ return;
+
LLDrawable* drawablep = mVO->mDrawable;
S32 new_res = mAttributes->getSimulateLOD();
@@ -435,7 +438,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
}
}
- if(!mInitialized)
+ if(!mInitialized || !mAttributes)
{
//the object is not visible
return ;