diff options
Diffstat (limited to 'linden/indra/newview/llmaniptranslate.cpp')
-rw-r--r-- | linden/indra/newview/llmaniptranslate.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp index 8313894..2642f95 100644 --- a/linden/indra/newview/llmaniptranslate.cpp +++ b/linden/indra/newview/llmaniptranslate.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, |
@@ -2132,15 +2132,12 @@ void LLManipTranslate::renderTranslationHandles() | |||
2132 | LLVector3 arrow_axis; | 2132 | LLVector3 arrow_axis; |
2133 | getManipAxis(first_object, which_arrow[face], arrow_axis); | 2133 | getManipAxis(first_object, which_arrow[face], arrow_axis); |
2134 | 2134 | ||
2135 | if (fabs(angle_between(camera_axis, arrow_axis) - F_PI_BY_TWO) < F_PI_BY_TWO - HANDLE_HIDE_ANGLE) | 2135 | renderArrow(which_arrow[face], |
2136 | { | 2136 | mManipPart, |
2137 | renderArrow(which_arrow[face], | 2137 | (face >= 3) ? -mConeSize : mConeSize, |
2138 | mManipPart, | 2138 | (face >= 3) ? -mArrowLengthMeters : mArrowLengthMeters, |
2139 | (face >= 3) ? -mConeSize : mConeSize, | 2139 | mConeSize, |
2140 | (face >= 3) ? -mArrowLengthMeters : mArrowLengthMeters, | 2140 | FALSE); |
2141 | mConeSize, | ||
2142 | FALSE); | ||
2143 | } | ||
2144 | } | 2141 | } |
2145 | } | 2142 | } |
2146 | } | 2143 | } |