Merge

1 files changed, 36 insertions, 64 deletions

diff --git a/indra/newview/lloutfitobserver.cpp b/indra/newview/lloutfitobserver.cpp
index 5bb69367aa..848b595613 100644
--- a/indra/newview/lloutfitobserver.cpp
+++ b/indra/newview/lloutfitobserver.cpp
@@ -2,25 +2,31 @@
  * @file lloutfitobserver.cpp
  * @brief Outfit observer facade.
  *
- * $LicenseInfo:firstyear=2010&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2010&license=viewergpl$
+ *
+ * Copyright (c) 2010, Linden Research, Inc.
+ *
  * 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
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("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
+ *
+ * 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
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
  */
 
@@ -34,7 +40,6 @@
 LLOutfitObserver::LLOutfitObserver() :
 	mCOFLastVersion(LLViewerInventoryCategory::VERSION_UNKNOWN)
 {
-	mItemNameHash.finalize();
 	gInventory.addObserver(this);
 }
 
@@ -51,9 +56,12 @@ void LLOutfitObserver::changed(U32 mask)
 	if (!gInventory.isInventoryUsable())
 		return;
 
-	checkCOF();
+	bool panel_updated = checkCOF();
 
-	checkBaseOutfit();
+	if (!panel_updated)
+	{
+		checkBaseOutfit();
+	}
 }
 
 // static
@@ -66,41 +74,19 @@ S32 LLOutfitObserver::getCategoryVersion(const LLUUID& cat_id)
 	return cat->getVersion();
 }
 
-// static
-const std::string& LLOutfitObserver::getCategoryName(const LLUUID& cat_id)
-{
-	LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
-	if (!cat)
-		return LLStringUtil::null;
-
-	return cat->getName();
-}
-
 bool LLOutfitObserver::checkCOF()
 {
 	LLUUID cof = LLAppearanceMgr::getInstance()->getCOF();
 	if (cof.isNull())
 		return false;
 
-	bool cof_changed = false;
-	LLMD5 item_name_hash = gInventory.hashDirectDescendentNames(cof);
-	if (item_name_hash != mItemNameHash)
-	{
-		cof_changed = true;
-		mItemNameHash = item_name_hash;
-	}
-
 	S32 cof_version = getCategoryVersion(cof);
-	if (cof_version != mCOFLastVersion)
-	{
-		cof_changed = true;
-		mCOFLastVersion = cof_version;
-	}
 
-	if (!cof_changed)
+	if (cof_version == mCOFLastVersion)
 		return false;
-	
-	// dirtiness state should be updated before sending signal
+
+	mCOFLastVersion = cof_version;
+
 	LLAppearanceMgr::getInstance()->updateIsDirty();
 	mCOFChanged();
 
@@ -118,11 +104,8 @@ void LLOutfitObserver::checkBaseOutfit()
 			return;
 
 		const S32 baseoutfit_ver = getCategoryVersion(baseoutfit_id);
-		const std::string& baseoutfit_name = getCategoryName(baseoutfit_id);
 
-		if (baseoutfit_ver == mBaseOutfitLastVersion
-				// renaming category doesn't change version, so it's need to check it
-				&& baseoutfit_name == mLastBaseOutfitName)
+		if (baseoutfit_ver == mBaseOutfitLastVersion)
 			return;
 	}
 	else
@@ -132,22 +115,11 @@ void LLOutfitObserver::checkBaseOutfit()
 
 		if (baseoutfit_id.isNull())
 			return;
-	}
 
-	mBaseOutfitLastVersion = getCategoryVersion(mBaseOutfitId);
-	mLastBaseOutfitName = getCategoryName(baseoutfit_id);
+		mBaseOutfitLastVersion = getCategoryVersion(mBaseOutfitId);
+	}
 
 	LLAppearanceMgr& app_mgr = LLAppearanceMgr::instance();
-	// dirtiness state should be updated before sending signal
 	app_mgr.updateIsDirty();
 	mBOFChanged();
-
-	if (mLastOutfitDirtiness != app_mgr.isOutfitDirty())
-	{
-		if(!app_mgr.isOutfitDirty())
-		{
-			mCOFSaved();
-		}
-		mLastOutfitDirtiness = app_mgr.isOutfitDirty();
-	}
 }