diff options
Diffstat (limited to 'linden/indra/newview/lldrawable.cpp')
-rw-r--r-- | linden/indra/newview/lldrawable.cpp | 17 |
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 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -1036,12 +1036,15 @@ F32 LLDrawable::getVisibilityRadius() const | |||
1036 | } | 1036 | } |
1037 | else if (isLight()) | 1037 | else if (isLight()) |
1038 | { | 1038 | { |
1039 | return llmax(getRadius(), getVOVolume()->getLightRadius()); | 1039 | const LLVOVolume *vov = getVOVolume(); |
1040 | } | 1040 | if (vov) |
1041 | else | 1041 | { |
1042 | { | 1042 | return llmax(getRadius(), vov->getLightRadius()); |
1043 | return getRadius(); | 1043 | } else { |
1044 | // llwarns ? | ||
1045 | } | ||
1044 | } | 1046 | } |
1047 | return getRadius(); | ||
1045 | } | 1048 | } |
1046 | 1049 | ||
1047 | void LLDrawable::updateUVMinMax() | 1050 | void LLDrawable::updateUVMinMax() |