From 7f50e28b0f3905f95299f7d5d63e0fd82e103bed Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 23 Jan 2007 19:12:31 +0000
Subject: merge -r 56842:57026 maintenance.

---
 indra/newview/llflexibleobject.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llflexibleobject.cpp')

diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index 4f821a7978..5e105ac7e2 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -185,9 +185,13 @@ void LLVolumeImplFlexible::setAttributesOfAllSections()
 		end_rot = F_PI * params.getTwist();
 	}
 
+	if (!mVO->mDrawable)
+	{
+		return;
+	}
+	
 	S32 num_sections = 1 << mSimulateRes;
 
-
 	LLVector3 scale = mVO->mDrawable->getScale();
 									
 	mSection[0].mPosition = getAnchorPosition();
-- 
cgit v1.2.3