Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 211 insertions, 211 deletions

diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp
index df2dc0334e..2dff50a7c3 100644
--- a/indra/newview/llinventoryicon.cpp
+++ b/indra/newview/llinventoryicon.cpp
@@ -1,211 +1,211 @@
-/** 
- * @file llinventoryicon.cpp
- * @brief Implementation of the inventory icon.
- *
- * $LicenseInfo:firstyear=2001&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 "llviewerprecompiledheaders.h"
-
-#include "linden_common.h"
-#include "llinventoryicon.h"
-
-#include "lldictionary.h"
-#include "llinventorydefines.h"
-#include "llui.h"
-#include "lluiimage.h"
-#include "llwearabletype.h"
-#include "llinventorysettings.h"
-
-struct IconEntry : public LLDictionaryEntry
-{
-	IconEntry(const std::string &item_name)
-		:
-		LLDictionaryEntry(item_name)
-	{}
-};
-
-class LLIconDictionary : public LLSingleton<LLIconDictionary>,
-						 public LLDictionary<LLInventoryType::EIconName, IconEntry>
-{
-	LLSINGLETON(LLIconDictionary);
-};
-
-typedef LLPointer<LLUIImage> LLUIImagePtr;
-
-LLIconDictionary::LLIconDictionary()
-{
-	addEntry(LLInventoryType::ICONNAME_TEXTURE, 				new IconEntry("Inv_Texture"));
-	addEntry(LLInventoryType::ICONNAME_SOUND, 					new IconEntry("Inv_Sound"));
-	addEntry(LLInventoryType::ICONNAME_CALLINGCARD_ONLINE, 		new IconEntry("Inv_CallingCard"));
-	addEntry(LLInventoryType::ICONNAME_CALLINGCARD_OFFLINE, 	new IconEntry("Inv_CallingCard"));
-	addEntry(LLInventoryType::ICONNAME_LANDMARK, 				new IconEntry("Inv_Landmark"));
-	addEntry(LLInventoryType::ICONNAME_LANDMARK_VISITED, 		new IconEntry("Inv_Landmark"));
-	addEntry(LLInventoryType::ICONNAME_SCRIPT, 					new IconEntry("Inv_Script"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING, 				new IconEntry("Inv_Clothing"));
-	addEntry(LLInventoryType::ICONNAME_OBJECT, 					new IconEntry("Inv_Object"));
-	addEntry(LLInventoryType::ICONNAME_OBJECT_MULTI, 			new IconEntry("Inv_Object_Multi"));
-	addEntry(LLInventoryType::ICONNAME_NOTECARD, 				new IconEntry("Inv_Notecard"));
-	addEntry(LLInventoryType::ICONNAME_BODYPART, 				new IconEntry("Inv_Skin"));
-	addEntry(LLInventoryType::ICONNAME_SNAPSHOT, 				new IconEntry("Inv_Snapshot"));
-
-	addEntry(LLInventoryType::ICONNAME_BODYPART_SHAPE, 			new IconEntry("Inv_BodyShape"));
-	addEntry(LLInventoryType::ICONNAME_BODYPART_SKIN, 			new IconEntry("Inv_Skin"));
-	addEntry(LLInventoryType::ICONNAME_BODYPART_HAIR, 			new IconEntry("Inv_Hair"));
-	addEntry(LLInventoryType::ICONNAME_BODYPART_EYES, 			new IconEntry("Inv_Eye"));
-
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_SHIRT, 			new IconEntry("Inv_Shirt"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_PANTS, 			new IconEntry("Inv_Pants"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_SHOES, 			new IconEntry("Inv_Shoe"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_SOCKS, 			new IconEntry("Inv_Socks"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_JACKET, 		new IconEntry("Inv_Jacket"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_GLOVES, 		new IconEntry("Inv_Gloves"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_UNDERSHIRT, 	new IconEntry("Inv_Undershirt"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_UNDERPANTS, 	new IconEntry("Inv_Underpants"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_SKIRT, 			new IconEntry("Inv_Skirt"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_ALPHA, 			new IconEntry("Inv_Alpha"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_TATTOO, 		new IconEntry("Inv_Tattoo"));
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL,      new IconEntry("Inv_Universal"));
-	addEntry(LLInventoryType::ICONNAME_ANIMATION, 				new IconEntry("Inv_Animation"));
-	addEntry(LLInventoryType::ICONNAME_GESTURE, 				new IconEntry("Inv_Gesture"));
-
-	addEntry(LLInventoryType::ICONNAME_CLOTHING_PHYSICS, 		new IconEntry("Inv_Physics"));
-
-	addEntry(LLInventoryType::ICONNAME_LINKITEM, 				new IconEntry("Inv_LinkItem"));
-	addEntry(LLInventoryType::ICONNAME_LINKFOLDER, 				new IconEntry("Inv_LinkFolder"));
-	addEntry(LLInventoryType::ICONNAME_MESH,	 				new IconEntry("Inv_Mesh"));
-
-    addEntry(LLInventoryType::ICONNAME_SETTINGS_SKY,            new IconEntry("Inv_SettingsSky"));
-    addEntry(LLInventoryType::ICONNAME_SETTINGS_WATER,          new IconEntry("Inv_SettingsWater"));
-    addEntry(LLInventoryType::ICONNAME_SETTINGS_DAY,            new IconEntry("Inv_SettingsDay"));
-    addEntry(LLInventoryType::ICONNAME_SETTINGS,                new IconEntry("Inv_Settings"));
-
-    addEntry(LLInventoryType::ICONNAME_MATERIAL,                new IconEntry("Inv_Material"));
-
-	addEntry(LLInventoryType::ICONNAME_INVALID, 				new IconEntry("Inv_Invalid"));
-	addEntry(LLInventoryType::ICONNAME_UNKNOWN, 				new IconEntry("Inv_Unknown"));
-
-	addEntry(LLInventoryType::ICONNAME_NONE, 					new IconEntry("NONE"));
-}
-
-LLUIImagePtr LLInventoryIcon::getIcon(LLAssetType::EType asset_type,
-									  LLInventoryType::EType inventory_type,
-									  U32 misc_flag,
-									  bool item_is_multi)
-{
-	const std::string& icon_name = getIconName(asset_type, inventory_type, misc_flag, item_is_multi);
-	return LLUI::getUIImage(icon_name);
-}
-
-LLUIImagePtr LLInventoryIcon::getIcon(LLInventoryType::EIconName idx)
-{
-	return LLUI::getUIImage(getIconName(idx));
-}
-
-const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type,
-												LLInventoryType::EType inventory_type,
-												U32 misc_flag,
-												bool item_is_multi)
-{
-	LLInventoryType::EIconName idx = LLInventoryType::ICONNAME_OBJECT;
-	if (item_is_multi)
-	{
-		idx = LLInventoryType::ICONNAME_OBJECT_MULTI;
-		return getIconName(idx);
-	}
-	
-	switch(asset_type)
-	{
-		case LLAssetType::AT_TEXTURE:
-			idx = (inventory_type == LLInventoryType::IT_SNAPSHOT) ? LLInventoryType::ICONNAME_SNAPSHOT : LLInventoryType::ICONNAME_TEXTURE;
-			break;
-		case LLAssetType::AT_SOUND:
-			idx = LLInventoryType::ICONNAME_SOUND;
-			break;
-		case LLAssetType::AT_CALLINGCARD:
-			idx = (misc_flag != 0) ? LLInventoryType::ICONNAME_CALLINGCARD_ONLINE : LLInventoryType::ICONNAME_CALLINGCARD_OFFLINE;
-			break;
-		case LLAssetType::AT_LANDMARK:
-			idx = (misc_flag != 0) ? LLInventoryType::ICONNAME_LANDMARK_VISITED : LLInventoryType::ICONNAME_LANDMARK;
-			break;
-		case LLAssetType::AT_SCRIPT:
-		case LLAssetType::AT_LSL_TEXT:
-		case LLAssetType::AT_LSL_BYTECODE:
-			idx = LLInventoryType::ICONNAME_SCRIPT;
-			break;
-		case LLAssetType::AT_CLOTHING:
-		case LLAssetType::AT_BODYPART:
-			idx = assignWearableIcon(misc_flag);
-			break;
-		case LLAssetType::AT_NOTECARD:
-			idx = LLInventoryType::ICONNAME_NOTECARD;
-			break;
-		case LLAssetType::AT_ANIMATION:
-			idx = LLInventoryType::ICONNAME_ANIMATION;
-			break;
-		case LLAssetType::AT_GESTURE:
-			idx = LLInventoryType::ICONNAME_GESTURE;
-			break;
-		case LLAssetType::AT_LINK:
-			idx = LLInventoryType::ICONNAME_LINKITEM;
-			break;
-		case LLAssetType::AT_LINK_FOLDER:
-			idx = LLInventoryType::ICONNAME_LINKFOLDER;
-			break;
-		case LLAssetType::AT_OBJECT:
-			idx = LLInventoryType::ICONNAME_OBJECT;
-			break;
-		case LLAssetType::AT_MESH:
-			idx = LLInventoryType::ICONNAME_MESH;
-		case LLAssetType::AT_SETTINGS:
-			idx = assignSettingsIcon(misc_flag);
-			break;
-		case LLAssetType::AT_MATERIAL:
-			idx = LLInventoryType::ICONNAME_MATERIAL;
-			break;
-		case LLAssetType::AT_UNKNOWN:
-			idx = LLInventoryType::ICONNAME_UNKNOWN;
-		default:
-			break;
-	}
-	
-	return getIconName(idx);
-}
-
-
-const std::string& LLInventoryIcon::getIconName(LLInventoryType::EIconName idx)
-{
-	const IconEntry *entry = LLIconDictionary::instance().lookup(idx);
-	return entry->mName;
-}
-
-LLInventoryType::EIconName LLInventoryIcon::assignWearableIcon(U32 misc_flag)
-{
-	const LLWearableType::EType wearable_type = LLWearableType::inventoryFlagsToWearableType(misc_flag);
-	return LLWearableType::getInstance()->getIconName(wearable_type);
-}
-
-LLInventoryType::EIconName LLInventoryIcon::assignSettingsIcon(U32 misc_flag)
-{
-	LLSettingsType::type_e settings_type = LLSettingsType::fromInventoryFlags(misc_flag);
-	return LLSettingsType::getIconName(settings_type);
-}
+/**

+ * @file llinventoryicon.cpp

+ * @brief Implementation of the inventory icon.

+ *

+ * $LicenseInfo:firstyear=2001&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 "llviewerprecompiledheaders.h"

+

+#include "linden_common.h"

+#include "llinventoryicon.h"

+

+#include "lldictionary.h"

+#include "llinventorydefines.h"

+#include "llui.h"

+#include "lluiimage.h"

+#include "llwearabletype.h"

+#include "llinventorysettings.h"

+

+struct IconEntry : public LLDictionaryEntry

+{

+    IconEntry(const std::string &item_name)

+        :

+        LLDictionaryEntry(item_name)

+    {}

+};

+

+class LLIconDictionary : public LLSingleton<LLIconDictionary>,

+                         public LLDictionary<LLInventoryType::EIconName, IconEntry>

+{

+    LLSINGLETON(LLIconDictionary);

+};

+

+typedef LLPointer<LLUIImage> LLUIImagePtr;

+

+LLIconDictionary::LLIconDictionary()

+{

+    addEntry(LLInventoryType::ICONNAME_TEXTURE,                 new IconEntry("Inv_Texture"));

+    addEntry(LLInventoryType::ICONNAME_SOUND,                   new IconEntry("Inv_Sound"));

+    addEntry(LLInventoryType::ICONNAME_CALLINGCARD_ONLINE,      new IconEntry("Inv_CallingCard"));

+    addEntry(LLInventoryType::ICONNAME_CALLINGCARD_OFFLINE,     new IconEntry("Inv_CallingCard"));

+    addEntry(LLInventoryType::ICONNAME_LANDMARK,                new IconEntry("Inv_Landmark"));

+    addEntry(LLInventoryType::ICONNAME_LANDMARK_VISITED,        new IconEntry("Inv_Landmark"));

+    addEntry(LLInventoryType::ICONNAME_SCRIPT,                  new IconEntry("Inv_Script"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING,                new IconEntry("Inv_Clothing"));

+    addEntry(LLInventoryType::ICONNAME_OBJECT,                  new IconEntry("Inv_Object"));

+    addEntry(LLInventoryType::ICONNAME_OBJECT_MULTI,            new IconEntry("Inv_Object_Multi"));

+    addEntry(LLInventoryType::ICONNAME_NOTECARD,                new IconEntry("Inv_Notecard"));

+    addEntry(LLInventoryType::ICONNAME_BODYPART,                new IconEntry("Inv_Skin"));

+    addEntry(LLInventoryType::ICONNAME_SNAPSHOT,                new IconEntry("Inv_Snapshot"));

+

+    addEntry(LLInventoryType::ICONNAME_BODYPART_SHAPE,          new IconEntry("Inv_BodyShape"));

+    addEntry(LLInventoryType::ICONNAME_BODYPART_SKIN,           new IconEntry("Inv_Skin"));

+    addEntry(LLInventoryType::ICONNAME_BODYPART_HAIR,           new IconEntry("Inv_Hair"));

+    addEntry(LLInventoryType::ICONNAME_BODYPART_EYES,           new IconEntry("Inv_Eye"));

+

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_SHIRT,          new IconEntry("Inv_Shirt"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_PANTS,          new IconEntry("Inv_Pants"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_SHOES,          new IconEntry("Inv_Shoe"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_SOCKS,          new IconEntry("Inv_Socks"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_JACKET,         new IconEntry("Inv_Jacket"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_GLOVES,         new IconEntry("Inv_Gloves"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_UNDERSHIRT,     new IconEntry("Inv_Undershirt"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_UNDERPANTS,     new IconEntry("Inv_Underpants"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_SKIRT,          new IconEntry("Inv_Skirt"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_ALPHA,          new IconEntry("Inv_Alpha"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_TATTOO,         new IconEntry("Inv_Tattoo"));

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL,      new IconEntry("Inv_Universal"));

+    addEntry(LLInventoryType::ICONNAME_ANIMATION,               new IconEntry("Inv_Animation"));

+    addEntry(LLInventoryType::ICONNAME_GESTURE,                 new IconEntry("Inv_Gesture"));

+

+    addEntry(LLInventoryType::ICONNAME_CLOTHING_PHYSICS,        new IconEntry("Inv_Physics"));

+

+    addEntry(LLInventoryType::ICONNAME_LINKITEM,                new IconEntry("Inv_LinkItem"));

+    addEntry(LLInventoryType::ICONNAME_LINKFOLDER,              new IconEntry("Inv_LinkFolder"));

+    addEntry(LLInventoryType::ICONNAME_MESH,                    new IconEntry("Inv_Mesh"));

+

+    addEntry(LLInventoryType::ICONNAME_SETTINGS_SKY,            new IconEntry("Inv_SettingsSky"));

+    addEntry(LLInventoryType::ICONNAME_SETTINGS_WATER,          new IconEntry("Inv_SettingsWater"));

+    addEntry(LLInventoryType::ICONNAME_SETTINGS_DAY,            new IconEntry("Inv_SettingsDay"));

+    addEntry(LLInventoryType::ICONNAME_SETTINGS,                new IconEntry("Inv_Settings"));

+

+    addEntry(LLInventoryType::ICONNAME_MATERIAL,                new IconEntry("Inv_Material"));

+

+    addEntry(LLInventoryType::ICONNAME_INVALID,                 new IconEntry("Inv_Invalid"));

+    addEntry(LLInventoryType::ICONNAME_UNKNOWN,                 new IconEntry("Inv_Unknown"));

+

+    addEntry(LLInventoryType::ICONNAME_NONE,                    new IconEntry("NONE"));

+}

+

+LLUIImagePtr LLInventoryIcon::getIcon(LLAssetType::EType asset_type,

+                                      LLInventoryType::EType inventory_type,

+                                      U32 misc_flag,

+                                      bool item_is_multi)

+{

+    const std::string& icon_name = getIconName(asset_type, inventory_type, misc_flag, item_is_multi);

+    return LLUI::getUIImage(icon_name);

+}

+

+LLUIImagePtr LLInventoryIcon::getIcon(LLInventoryType::EIconName idx)

+{

+    return LLUI::getUIImage(getIconName(idx));

+}

+

+const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type,

+                                                LLInventoryType::EType inventory_type,

+                                                U32 misc_flag,

+                                                bool item_is_multi)

+{

+    LLInventoryType::EIconName idx = LLInventoryType::ICONNAME_OBJECT;

+    if (item_is_multi)

+    {

+        idx = LLInventoryType::ICONNAME_OBJECT_MULTI;

+        return getIconName(idx);

+    }

+

+    switch(asset_type)

+    {

+        case LLAssetType::AT_TEXTURE:

+            idx = (inventory_type == LLInventoryType::IT_SNAPSHOT) ? LLInventoryType::ICONNAME_SNAPSHOT : LLInventoryType::ICONNAME_TEXTURE;

+            break;

+        case LLAssetType::AT_SOUND:

+            idx = LLInventoryType::ICONNAME_SOUND;

+            break;

+        case LLAssetType::AT_CALLINGCARD:

+            idx = (misc_flag != 0) ? LLInventoryType::ICONNAME_CALLINGCARD_ONLINE : LLInventoryType::ICONNAME_CALLINGCARD_OFFLINE;

+            break;

+        case LLAssetType::AT_LANDMARK:

+            idx = (misc_flag != 0) ? LLInventoryType::ICONNAME_LANDMARK_VISITED : LLInventoryType::ICONNAME_LANDMARK;

+            break;

+        case LLAssetType::AT_SCRIPT:

+        case LLAssetType::AT_LSL_TEXT:

+        case LLAssetType::AT_LSL_BYTECODE:

+            idx = LLInventoryType::ICONNAME_SCRIPT;

+            break;

+        case LLAssetType::AT_CLOTHING:

+        case LLAssetType::AT_BODYPART:

+            idx = assignWearableIcon(misc_flag);

+            break;

+        case LLAssetType::AT_NOTECARD:

+            idx = LLInventoryType::ICONNAME_NOTECARD;

+            break;

+        case LLAssetType::AT_ANIMATION:

+            idx = LLInventoryType::ICONNAME_ANIMATION;

+            break;

+        case LLAssetType::AT_GESTURE:

+            idx = LLInventoryType::ICONNAME_GESTURE;

+            break;

+        case LLAssetType::AT_LINK:

+            idx = LLInventoryType::ICONNAME_LINKITEM;

+            break;

+        case LLAssetType::AT_LINK_FOLDER:

+            idx = LLInventoryType::ICONNAME_LINKFOLDER;

+            break;

+        case LLAssetType::AT_OBJECT:

+            idx = LLInventoryType::ICONNAME_OBJECT;

+            break;

+        case LLAssetType::AT_MESH:

+            idx = LLInventoryType::ICONNAME_MESH;

+        case LLAssetType::AT_SETTINGS:

+            idx = assignSettingsIcon(misc_flag);

+            break;

+        case LLAssetType::AT_MATERIAL:

+            idx = LLInventoryType::ICONNAME_MATERIAL;

+            break;

+        case LLAssetType::AT_UNKNOWN:

+            idx = LLInventoryType::ICONNAME_UNKNOWN;

+        default:

+            break;

+    }

+

+    return getIconName(idx);

+}

+

+

+const std::string& LLInventoryIcon::getIconName(LLInventoryType::EIconName idx)

+{

+    const IconEntry *entry = LLIconDictionary::instance().lookup(idx);

+    return entry->mName;

+}

+

+LLInventoryType::EIconName LLInventoryIcon::assignWearableIcon(U32 misc_flag)

+{

+    const LLWearableType::EType wearable_type = LLWearableType::inventoryFlagsToWearableType(misc_flag);

+    return LLWearableType::getInstance()->getIconName(wearable_type);

+}

+

+LLInventoryType::EIconName LLInventoryIcon::assignSettingsIcon(U32 misc_flag)

+{

+    LLSettingsType::type_e settings_type = LLSettingsType::fromInventoryFlags(misc_flag);

+    return LLSettingsType::getIconName(settings_type);

+}