Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext

2 files changed, 7 insertions, 16 deletions

diff --git a/linden/indra/llmath/llsdutil_math.cpp b/linden/indra/llmath/llsdutil_math.cpp
index 073cb2e..8ec8661 100644
--- a/linden/indra/llmath/llsdutil_math.cpp
+++ b/linden/indra/llmath/llsdutil_math.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -14,13 +14,13 @@
  * ("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://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * online at http://secondlife.com/developers/opensource/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://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * http://secondlife.com/developers/opensource/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -30,11 +30,12 @@
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
+ * 
  */
 
 #include "linden_common.h"
 
-#include "llsdutil.h"
+#include "llsdutil_math.h"
 
 #include "v3math.h"
 #include "v4math.h"
@@ -165,9 +166,6 @@ LLSD ll_sd_from_color4(const LLColor4& c)
 LLColor4 ll_color4_from_sd(const LLSD& sd)
 {
         LLColor4 c;
-        c.mV[0] = (F32)sd[0].asReal();
-        c.mV[1] = (F32)sd[1].asReal();
-        c.mV[2] = (F32)sd[2].asReal();
-        c.mV[3] = (F32)sd[3].asReal();
+        c.setValue(sd);
         return c;
 }
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 618048c..9dc3746 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -4437,14 +4437,7 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build)
         const std::vector<LLVector3>& profile = volume->getProfile().mProfile;
         S32 max_s = volume->getProfile().getTotal();
         S32 max_t = volume->getPath().mPath.size();
-
-        // S32 i;
-        S32 num_vertices = 0, num_indices = 0;
-        S32     grid_size = (profile.size()-1)/4;
-        S32     quad_count = (grid_size * grid_size);
-
-        num_vertices = (grid_size+1)*(grid_size+1);
-        num_indices = quad_count * 4;
+        S32 grid_size = (profile.size() - 1) / 4;
 
         LLVector3& min = mExtents[0];
         LLVector3& max = mExtents[1];