Merge commit '9e24b30' into marchcat/maint-c/restore

# Conflicts:
#	indra/llmath/v2math.cpp
#	indra/llmath/v2math.h
#	indra/llmath/v3math.h
#	indra/llmath/v4math.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/llui/llfolderviewmodel.h
#	indra/llui/llmodaldialog.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/llavatarrenderinfoaccountant.cpp
#	indra/newview/llconversationmodel.h
#	indra/newview/llfloaterinventorysettings.cpp
#	indra/newview/llfloaternamedesc.cpp
#	indra/newview/llfloaternamedesc.h
#	indra/newview/llfloaterobjectweights.cpp
#	indra/newview/llfloaterobjectweights.h
#	indra/newview/llfolderviewmodelinventory.h
#	indra/newview/llinspecttexture.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorygallery.h
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmaterialeditor.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpanelgroupcreate.cpp
#	indra/newview/llpanelgroupgeneral.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llreflectionmap.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llteleporthistorystorage.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltexturefetch.h
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewercamera.cpp
#	indra/newview/llviewercamera.h
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/tests/llviewerassetstats_test.cpp

1 files changed, 31 insertions, 69 deletions

diff --git a/indra/llmath/v2math.h b/indra/llmath/v2math.h
index a61c946304..6e3a2933bf 100644
--- a/indra/llmath/v2math.h
+++ b/indra/llmath/v2math.h
@@ -107,13 +107,14 @@ class LLVector2
 
         friend LLVector2 operator-(const LLVector2 &a);                 // Return vector -a
 
-        friend std::ostream&     operator<<(std::ostream& s, const LLVector2 &a);       // Stream a
+        friend std::ostream& operator<<(std::ostream& s, const LLVector2 &a);       // Stream a
 };
 
 
 // Non-member functions
 
 F32 angle_between(const LLVector2 &a, const LLVector2 &b);  // Returns angle (radians) between a and b
+F32 signed_angle_between(const LLVector2& a, const LLVector2& b); // Returns signed angle (radians) between a and b
 bool are_parallel(const LLVector2 &a, const LLVector2 &b, F32 epsilon=F_APPROXIMATELY_ZERO);    // Returns true if a and b are very close to parallel
 F32 dist_vec(const LLVector2 &a, const LLVector2 &b);       // Returns distance between a and b
 F32 dist_vec_squared(const LLVector2 &a, const LLVector2 &b);// Returns distance squared between a and b
@@ -124,26 +125,22 @@ LLVector2 lerp(const LLVector2 &a, const LLVector2 &b, F32 u); // Returns a vect
 
 inline LLVector2::LLVector2(void)
 {
-    mV[VX] = 0.f;
-    mV[VY] = 0.f;
+    clear();
 }
 
 inline LLVector2::LLVector2(F32 x, F32 y)
 {
-    mV[VX] = x;
-    mV[VY] = y;
+    set(x, y);
 }
 
 inline LLVector2::LLVector2(const F32 *vec)
 {
-    mV[VX] = vec[VX];
-    mV[VY] = vec[VY];
+    set(vec);
 }
 
 inline LLVector2::LLVector2(const LLVector3 &vec)
 {
-    mV[VX] = vec.mV[VX];
-    mV[VY] = vec.mV[VY];
+    set(vec.mV);
 }
 
 inline LLVector2::LLVector2(const LLSD &sd)
@@ -155,28 +152,24 @@ inline LLVector2::LLVector2(const LLSD &sd)
 
 inline void LLVector2::clear(void)
 {
-    mV[VX] = 0.f;
-    mV[VY] = 0.f;
+    mV[VX] = mV[VY] = 0.f;
 }
 
 inline void LLVector2::setZero(void)
 {
-    mV[VX] = 0.f;
-    mV[VY] = 0.f;
+    clear();
 }
 
 // deprecated
 inline void LLVector2::clearVec(void)
 {
-    mV[VX] = 0.f;
-    mV[VY] = 0.f;
+    clear();
 }
 
 // deprecated
 inline void LLVector2::zeroVec(void)
 {
-    mV[VX] = 0.f;
-    mV[VY] = 0.f;
+    clear();
 }
 
 inline void LLVector2::set(F32 x, F32 y)
@@ -187,36 +180,31 @@ inline void LLVector2::set(F32 x, F32 y)
 
 inline void LLVector2::set(const LLVector2 &vec)
 {
-    mV[VX] = vec.mV[VX];
-    mV[VY] = vec.mV[VY];
+    set(vec.mV);
 }
 
 inline void LLVector2::set(const F32 *vec)
 {
-    mV[VX] = vec[VX];
-    mV[VY] = vec[VY];
+    set(vec[VX], vec[VY]);
 }
 
 
 // deprecated
 inline void LLVector2::setVec(F32 x, F32 y)
 {
-    mV[VX] = x;
-    mV[VY] = y;
+    set(x, y);
 }
 
 // deprecated
 inline void LLVector2::setVec(const LLVector2 &vec)
 {
-    mV[VX] = vec.mV[VX];
-    mV[VY] = vec.mV[VY];
+    set(vec);
 }
 
 // deprecated
 inline void LLVector2::setVec(const F32 *vec)
 {
-    mV[VX] = vec[VX];
-    mV[VY] = vec[VY];
+    set(vec);
 }
 
 
@@ -224,7 +212,7 @@ inline void LLVector2::setVec(const F32 *vec)
 
 inline F32 LLVector2::length(void) const
 {
-    return (F32) sqrt(mV[0]*mV[0] + mV[1]*mV[1]);
+    return (F32) sqrt(lengthSquared());
 }
 
 inline F32 LLVector2::lengthSquared(void) const
@@ -234,61 +222,42 @@ inline F32 LLVector2::lengthSquared(void) const
 
 inline F32 LLVector2::normalize(void)
 {
-    F32 mag = (F32) sqrt(mV[0]*mV[0] + mV[1]*mV[1]);
-    F32 oomag;
+    F32 mag = length();
 
     if (mag > FP_MAG_THRESHOLD)
     {
-        oomag = 1.f/mag;
-        mV[0] *= oomag;
-        mV[1] *= oomag;
+        *this /= mag;
     }
     else
     {
-        mV[0] = 0.f;
-        mV[1] = 0.f;
+        clear();
         mag = 0;
     }
-    return (mag);
+    return mag;
 }
 
 // checker
 inline bool LLVector2::isFinite() const
 {
-    return (llfinite(mV[VX]) && llfinite(mV[VY]));
+    return llfinite(mV[VX]) && llfinite(mV[VY]);
 }
 
 // deprecated
-inline F32      LLVector2::magVec(void) const
+inline F32 LLVector2::magVec(void) const
 {
-    return (F32) sqrt(mV[0]*mV[0] + mV[1]*mV[1]);
+    return length();
 }
 
 // deprecated
-inline F32      LLVector2::magVecSquared(void) const
+inline F32 LLVector2::magVecSquared(void) const
 {
-    return mV[0]*mV[0] + mV[1]*mV[1];
+    return lengthSquared();
 }
 
 // deprecated
-inline F32      LLVector2::normVec(void)
+inline F32 LLVector2::normVec(void)
 {
-    F32 mag = (F32) sqrt(mV[0]*mV[0] + mV[1]*mV[1]);
-    F32 oomag;
-
-    if (mag > FP_MAG_THRESHOLD)
-    {
-        oomag = 1.f/mag;
-        mV[0] *= oomag;
-        mV[1] *= oomag;
-    }
-    else
-    {
-        mV[0] = 0.f;
-        mV[1] = 0.f;
-        mag = 0;
-    }
-    return (mag);
+    return normalize();
 }
 
 inline const LLVector2& LLVector2::scaleVec(const LLVector2& vec)
@@ -301,11 +270,7 @@ inline const LLVector2& LLVector2::scaleVec(const LLVector2& vec)
 
 inline bool LLVector2::isNull()
 {
-    if ( F_APPROXIMATELY_ZERO > mV[VX]*mV[VX] + mV[VY]*mV[VY] )
-    {
-        return true;
-    }
-    return false;
+    return F_APPROXIMATELY_ZERO > mV[VX]*mV[VX] + mV[VY]*mV[VY];
 }
 
 
@@ -337,9 +302,9 @@ inline LLVector2 operator-(const LLVector2 &a, const LLVector2 &b)
     return c -= b;
 }
 
-inline F32  operator*(const LLVector2 &a, const LLVector2 &b)
+inline F32 operator*(const LLVector2 &a, const LLVector2 &b)
 {
-    return (a.mV[0]*b.mV[0] + a.mV[1]*b.mV[1]);
+    return a.mV[0]*b.mV[0] + a.mV[1]*b.mV[1];
 }
 
 inline LLVector2 operator%(const LLVector2 &a, const LLVector2 &b)
@@ -405,10 +370,7 @@ inline const LLVector2& operator*=(LLVector2 &a, F32 k)
 
 inline const LLVector2& operator/=(LLVector2 &a, F32 k)
 {
-    F32 t = 1.f / k;
-    a.mV[0] *= t;
-    a.mV[1] *= t;
-    return a;
+    return a *= 1.f / k;
 }
 
 inline LLVector2 operator-(const LLVector2 &a)