Second Life viewer sources 1.19.0.0

1 files changed, 10 insertions, 7 deletions

diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index c253105..a86fc07 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -1036,12 +1036,15 @@ F32 LLDrawable::getVisibilityRadius() const
         }
         else if (isLight())
         {
-                return llmax(getRadius(), getVOVolume()->getLightRadius());
-        }
-        else
-        {
-                return getRadius();
+                const LLVOVolume *vov = getVOVolume();
+                if (vov)
+                {
+                        return llmax(getRadius(), vov->getLightRadius());
+                } else {
+                        // llwarns ?
+                }
         }
+        return getRadius();
 }
 
 void LLDrawable::updateUVMinMax()