1 files changed, 344 insertions, 344 deletions
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp
index 04f29ecf27..a58138c434 100644
--- a/indra/llappearance/llwearabledata.cpp
+++ b/indra/llappearance/llwearabledata.cpp
@@ -1,344 +1,344 @@
-/**
- * @file llwearabledata.cpp
- * @brief LLWearableData class implementation
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "llwearabledata.h"
-
-#include "llavatarappearance.h"
-#include "llavatarappearancedefines.h"
-#include "lldriverparam.h"
-
-LLWearableData::LLWearableData() :
-    mAvatarAppearance(NULL)
-{
-}
-
-// virtual
-LLWearableData::~LLWearableData()
-{
-}
-
-using namespace LLAvatarAppearanceDefines;
-
-LLWearable* LLWearableData::getWearable(const LLWearableType::EType type, U32 index)
-{
-    wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
-    if (wearable_iter == mWearableDatas.end())
-    {
-        return NULL;
-    }
-    wearableentry_vec_t& wearable_vec = wearable_iter->second;
-    if (index>=wearable_vec.size())
-    {
-        return NULL;
-    }
-    else
-    {
-        return wearable_vec[index];
-    }
-}
-
-void LLWearableData::setWearable(const LLWearableType::EType type, U32 index, LLWearable *wearable)
-{
-    LLWearable *old_wearable = getWearable(type,index);
-    if (!old_wearable)
-    {
-        pushWearable(type,wearable);
-        return;
-    }
-
-    wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
-    if (wearable_iter == mWearableDatas.end())
-    {
-        LL_WARNS() << "invalid type, type " << type << " index " << index << LL_ENDL;
-        return;
-    }
-    wearableentry_vec_t& wearable_vec = wearable_iter->second;
-    if (index>=wearable_vec.size())
-    {
-        LL_WARNS() << "invalid index, type " << type << " index " << index << LL_ENDL;
-    }
-    else
-    {
-        wearable_vec[index] = wearable;
-        old_wearable->setUpdated();
-        const bool removed = false;
-        wearableUpdated(wearable, removed);
-    }
-}
-
-void LLWearableData::pushWearable(const LLWearableType::EType type,
-                                   LLWearable *wearable,
-                                   bool trigger_updated /* = true */)
-{
-    if (wearable == NULL)
-    {
-        // no null wearables please!
-        LL_WARNS() << "Null wearable sent for type " << type << LL_ENDL;
-    }
-    if (canAddWearable(type))
-    {
-        mWearableDatas[type].push_back(wearable);
-        if (trigger_updated)
-        {
-            const bool removed = false;
-            wearableUpdated(wearable, removed);
-        }
-    }
-}
-
-// virtual
-void LLWearableData::wearableUpdated(LLWearable *wearable, bool removed)
-{
-    wearable->setUpdated();
-    if (!removed)
-    {
-        pullCrossWearableValues(wearable->getType());
-    }
-}
-
-void LLWearableData::eraseWearable(LLWearable *wearable)
-{
-    if (wearable == NULL)
-    {
-        // nothing to do here. move along.
-        return;
-    }
-
-    const LLWearableType::EType type = wearable->getType();
-
-    U32 index;
-    if (getWearableIndex(wearable,index))
-    {
-        eraseWearable(type, index);
-    }
-}
-
-void LLWearableData::eraseWearable(const LLWearableType::EType type, U32 index)
-{
-    LLWearable *wearable = getWearable(type, index);
-    if (wearable)
-    {
-        mWearableDatas[type].erase(mWearableDatas[type].begin() + index);
-        const bool removed = true;
-        wearableUpdated(wearable, removed);
-    }
-}
-
-void LLWearableData::clearWearableType(const LLWearableType::EType type)
-{
-    wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
-    if (wearable_iter == mWearableDatas.end())
-    {
-        return;
-    }
-    wearableentry_vec_t& wearable_vec = wearable_iter->second;
-    wearable_vec.clear();
-}
-
-bool LLWearableData::swapWearables(const LLWearableType::EType type, U32 index_a, U32 index_b)
-{
-    wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
-    if (wearable_iter == mWearableDatas.end())
-    {
-        return false;
-    }
-
-    wearableentry_vec_t& wearable_vec = wearable_iter->second;
-    // removed 0 > index_a and index_b comparisions - can never be true
-    if (index_a >= wearable_vec.size()) return false;
-    if (index_b >= wearable_vec.size()) return false;
-
-    LLWearable* wearable = wearable_vec[index_a];
-    wearable_vec[index_a] = wearable_vec[index_b];
-    wearable_vec[index_b] = wearable;
-    return true;
-}
-
-void LLWearableData::pullCrossWearableValues(const LLWearableType::EType type)
-{
-    llassert(mAvatarAppearance);
-    // scan through all of the avatar's visual parameters
-    for (LLViewerVisualParam* param = (LLViewerVisualParam*) mAvatarAppearance->getFirstVisualParam();
-         param;
-         param = (LLViewerVisualParam*) mAvatarAppearance->getNextVisualParam())
-    {
-        if( param )
-        {
-            LLDriverParam *driver_param = dynamic_cast<LLDriverParam*>(param);
-            if(driver_param)
-            {
-                // parameter is a driver parameter, have it update its cross-driven params
-                driver_param->updateCrossDrivenParams(type);
-            }
-        }
-    }
-}
-
-
-bool LLWearableData::getWearableIndex(const LLWearable *wearable, U32& index_found) const
-{
-    if (wearable == NULL)
-    {
-        return false;
-    }
-
-    const LLWearableType::EType type = wearable->getType();
-    wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type);
-    if (wearable_iter == mWearableDatas.end())
-    {
-        LL_WARNS() << "tried to get wearable index with an invalid type!" << LL_ENDL;
-        return false;
-    }
-    const wearableentry_vec_t& wearable_vec = wearable_iter->second;
-    for(U32 index = 0; index < wearable_vec.size(); index++)
-    {
-        if (wearable_vec[index] == wearable)
-        {
-            index_found = index;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-U32 LLWearableData::getClothingLayerCount() const
-{
-    U32 count = 0;
-    LLWearableType *wr_inst = LLWearableType::getInstance();
-    for (S32 i = 0; i < LLWearableType::WT_COUNT; i++)
-    {
-        LLWearableType::EType type = (LLWearableType::EType)i;
-        if (wr_inst->getAssetType(type)==LLAssetType::AT_CLOTHING)
-        {
-            count += getWearableCount(type);
-        }
-    }
-    return count;
-}
-
-bool LLWearableData::canAddWearable(const LLWearableType::EType type) const
-{
-    LLAssetType::EType a_type = LLWearableType::getInstance()->getAssetType(type);
-    if (a_type==LLAssetType::AT_CLOTHING)
-    {
-        return (getClothingLayerCount() < MAX_CLOTHING_LAYERS);
-    }
-    else if (a_type==LLAssetType::AT_BODYPART)
-    {
-        return (getWearableCount(type) < 1);
-    }
-    else
-    {
-        return false;
-    }
-}
-
-bool LLWearableData::isOnTop(LLWearable* wearable) const
-{
-    if (!wearable) return false;
-    const LLWearableType::EType type = wearable->getType();
-    return ( getTopWearable(type) == wearable );
-}
-
-const LLWearable* LLWearableData::getWearable(const LLWearableType::EType type, U32 index) const
-{
-    wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type);
-    if (wearable_iter == mWearableDatas.end())
-    {
-        return NULL;
-    }
-    const wearableentry_vec_t& wearable_vec = wearable_iter->second;
-    if (index>=wearable_vec.size())
-    {
-        return NULL;
-    }
-    else
-    {
-        return wearable_vec[index];
-    }
-}
-
-LLWearable* LLWearableData::getTopWearable(const LLWearableType::EType type)
-{
-    U32 count = getWearableCount(type);
-    if ( count == 0)
-    {
-        return NULL;
-    }
-
-    return getWearable(type, count-1);
-}
-
-const LLWearable* LLWearableData::getTopWearable(const LLWearableType::EType type) const
-{
-    U32 count = getWearableCount(type);
-    if ( count == 0)
-    {
-        return NULL;
-    }
-
-    return getWearable(type, count-1);
-}
-
-LLWearable* LLWearableData::getBottomWearable(const LLWearableType::EType type)
-{
-    if (getWearableCount(type) == 0)
-    {
-        return NULL;
-    }
-
-    return getWearable(type, 0);
-}
-
-const LLWearable* LLWearableData::getBottomWearable(const LLWearableType::EType type) const
-{
-    if (getWearableCount(type) == 0)
-    {
-        return NULL;
-    }
-
-    return getWearable(type, 0);
-}
-
-U32 LLWearableData::getWearableCount(const LLWearableType::EType type) const
-{
-    wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type);
-    if (wearable_iter == mWearableDatas.end())
-    {
-        return 0;
-    }
-    const wearableentry_vec_t& wearable_vec = wearable_iter->second;
-    return wearable_vec.size();
-}
-
-U32 LLWearableData::getWearableCount(const U32 tex_index) const
-{
-    const LLWearableType::EType wearable_type = LLAvatarAppearance::getDictionary()->getTEWearableType((LLAvatarAppearanceDefines::ETextureIndex)tex_index);
-    return getWearableCount(wearable_type);
-}
+/**
+ * @file llwearabledata.cpp
+ * @brief LLWearableData class implementation
+ *
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llwearabledata.h"
+
+#include "llavatarappearance.h"
+#include "llavatarappearancedefines.h"
+#include "lldriverparam.h"
+
+LLWearableData::LLWearableData() :
+    mAvatarAppearance(NULL)
+{
+}
+
+// virtual
+LLWearableData::~LLWearableData()
+{
+}
+
+using namespace LLAvatarAppearanceDefines;
+
+LLWearable* LLWearableData::getWearable(const LLWearableType::EType type, U32 index)
+{
+    wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
+    if (wearable_iter == mWearableDatas.end())
+    {
+        return NULL;
+    }
+    wearableentry_vec_t& wearable_vec = wearable_iter->second;
+    if (index>=wearable_vec.size())
+    {
+        return NULL;
+    }
+    else
+    {
+        return wearable_vec[index];
+    }
+}
+
+void LLWearableData::setWearable(const LLWearableType::EType type, U32 index, LLWearable *wearable)
+{
+    LLWearable *old_wearable = getWearable(type,index);
+    if (!old_wearable)
+    {
+        pushWearable(type,wearable);
+        return;
+    }
+
+    wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
+    if (wearable_iter == mWearableDatas.end())
+    {
+        LL_WARNS() << "invalid type, type " << type << " index " << index << LL_ENDL;
+        return;
+    }
+    wearableentry_vec_t& wearable_vec = wearable_iter->second;
+    if (index>=wearable_vec.size())
+    {
+        LL_WARNS() << "invalid index, type " << type << " index " << index << LL_ENDL;
+    }
+    else
+    {
+        wearable_vec[index] = wearable;
+        old_wearable->setUpdated();
+        const bool removed = false;
+        wearableUpdated(wearable, removed);
+    }
+}
+
+void LLWearableData::pushWearable(const LLWearableType::EType type,
+                                   LLWearable *wearable,
+                                   bool trigger_updated /* = true */)
+{
+    if (wearable == NULL)
+    {
+        // no null wearables please!
+        LL_WARNS() << "Null wearable sent for type " << type << LL_ENDL;
+    }
+    if (canAddWearable(type))
+    {
+        mWearableDatas[type].push_back(wearable);
+        if (trigger_updated)
+        {
+            const bool removed = false;
+            wearableUpdated(wearable, removed);
+        }
+    }
+}
+
+// virtual
+void LLWearableData::wearableUpdated(LLWearable *wearable, bool removed)
+{
+    wearable->setUpdated();
+    if (!removed)
+    {
+        pullCrossWearableValues(wearable->getType());
+    }
+}
+
+void LLWearableData::eraseWearable(LLWearable *wearable)
+{
+    if (wearable == NULL)
+    {
+        // nothing to do here. move along.
+        return;
+    }
+
+    const LLWearableType::EType type = wearable->getType();
+
+    U32 index;
+    if (getWearableIndex(wearable,index))
+    {
+        eraseWearable(type, index);
+    }
+}
+
+void LLWearableData::eraseWearable(const LLWearableType::EType type, U32 index)
+{
+    LLWearable *wearable = getWearable(type, index);
+    if (wearable)
+    {
+        mWearableDatas[type].erase(mWearableDatas[type].begin() + index);
+        const bool removed = true;
+        wearableUpdated(wearable, removed);
+    }
+}
+
+void LLWearableData::clearWearableType(const LLWearableType::EType type)
+{
+    wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
+    if (wearable_iter == mWearableDatas.end())
+    {
+        return;
+    }
+    wearableentry_vec_t& wearable_vec = wearable_iter->second;
+    wearable_vec.clear();
+}
+
+bool LLWearableData::swapWearables(const LLWearableType::EType type, U32 index_a, U32 index_b)
+{
+    wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
+    if (wearable_iter == mWearableDatas.end())
+    {
+        return false;
+    }
+
+    wearableentry_vec_t& wearable_vec = wearable_iter->second;
+    // removed 0 > index_a and index_b comparisions - can never be true
+    if (index_a >= wearable_vec.size()) return false;
+    if (index_b >= wearable_vec.size()) return false;
+
+    LLWearable* wearable = wearable_vec[index_a];
+    wearable_vec[index_a] = wearable_vec[index_b];
+    wearable_vec[index_b] = wearable;
+    return true;
+}
+
+void LLWearableData::pullCrossWearableValues(const LLWearableType::EType type)
+{
+    llassert(mAvatarAppearance);
+    // scan through all of the avatar's visual parameters
+    for (LLViewerVisualParam* param = (LLViewerVisualParam*) mAvatarAppearance->getFirstVisualParam();
+         param;
+         param = (LLViewerVisualParam*) mAvatarAppearance->getNextVisualParam())
+    {
+        if( param )
+        {
+            LLDriverParam *driver_param = dynamic_cast<LLDriverParam*>(param);
+            if(driver_param)
+            {
+                // parameter is a driver parameter, have it update its cross-driven params
+                driver_param->updateCrossDrivenParams(type);
+            }
+        }
+    }
+}
+
+
+bool LLWearableData::getWearableIndex(const LLWearable *wearable, U32& index_found) const
+{
+    if (wearable == NULL)
+    {
+        return false;
+    }
+
+    const LLWearableType::EType type = wearable->getType();
+    wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type);
+    if (wearable_iter == mWearableDatas.end())
+    {
+        LL_WARNS() << "tried to get wearable index with an invalid type!" << LL_ENDL;
+        return false;
+    }
+    const wearableentry_vec_t& wearable_vec = wearable_iter->second;
+    for(U32 index = 0; index < wearable_vec.size(); index++)
+    {
+        if (wearable_vec[index] == wearable)
+        {
+            index_found = index;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+U32 LLWearableData::getClothingLayerCount() const
+{
+    U32 count = 0;
+    LLWearableType *wr_inst = LLWearableType::getInstance();
+    for (S32 i = 0; i < LLWearableType::WT_COUNT; i++)
+    {
+        LLWearableType::EType type = (LLWearableType::EType)i;
+        if (wr_inst->getAssetType(type)==LLAssetType::AT_CLOTHING)
+        {
+            count += getWearableCount(type);
+        }
+    }
+    return count;
+}
+
+bool LLWearableData::canAddWearable(const LLWearableType::EType type) const
+{
+    LLAssetType::EType a_type = LLWearableType::getInstance()->getAssetType(type);
+    if (a_type==LLAssetType::AT_CLOTHING)
+    {
+        return (getClothingLayerCount() < MAX_CLOTHING_LAYERS);
+    }
+    else if (a_type==LLAssetType::AT_BODYPART)
+    {
+        return (getWearableCount(type) < 1);
+    }
+    else
+    {
+        return false;
+    }
+}
+
+bool LLWearableData::isOnTop(LLWearable* wearable) const
+{
+    if (!wearable) return false;
+    const LLWearableType::EType type = wearable->getType();
+    return ( getTopWearable(type) == wearable );
+}
+
+const LLWearable* LLWearableData::getWearable(const LLWearableType::EType type, U32 index) const
+{
+    wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type);
+    if (wearable_iter == mWearableDatas.end())
+    {
+        return NULL;
+    }
+    const wearableentry_vec_t& wearable_vec = wearable_iter->second;
+    if (index>=wearable_vec.size())
+    {
+        return NULL;
+    }
+    else
+    {
+        return wearable_vec[index];
+    }
+}
+
+LLWearable* LLWearableData::getTopWearable(const LLWearableType::EType type)
+{
+    U32 count = getWearableCount(type);
+    if ( count == 0)
+    {
+        return NULL;
+    }
+
+    return getWearable(type, count-1);
+}
+
+const LLWearable* LLWearableData::getTopWearable(const LLWearableType::EType type) const
+{
+    U32 count = getWearableCount(type);
+    if ( count == 0)
+    {
+        return NULL;
+    }
+
+    return getWearable(type, count-1);
+}
+
+LLWearable* LLWearableData::getBottomWearable(const LLWearableType::EType type)
+{
+    if (getWearableCount(type) == 0)
+    {
+        return NULL;
+    }
+
+    return getWearable(type, 0);
+}
+
+const LLWearable* LLWearableData::getBottomWearable(const LLWearableType::EType type) const
+{
+    if (getWearableCount(type) == 0)
+    {
+        return NULL;
+    }
+
+    return getWearable(type, 0);
+}
+
+U32 LLWearableData::getWearableCount(const LLWearableType::EType type) const
+{
+    wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type);
+    if (wearable_iter == mWearableDatas.end())
+    {
+        return 0;
+    }
+    const wearableentry_vec_t& wearable_vec = wearable_iter->second;
+    return wearable_vec.size();
+}
+
+U32 LLWearableData::getWearableCount(const U32 tex_index) const
+{
+    const LLWearableType::EType wearable_type = LLAvatarAppearance::getDictionary()->getTEWearableType((LLAvatarAppearanceDefines::ETextureIndex)tex_index);
+    return getWearableCount(wearable_type);
+}