Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml

indra/newview/CMakeLists.txt

@@ -37,6 +37,7 @@ include(LLUI)
 include(LLVFS)
 include(LLWindow)
 include(LLXML)
+include(LLXUIXML)
 include(LScript)
 include(Linking)
 include(NDOF)
@@ -71,6 +72,7 @@ include_directories(
     ${LLVFS_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
+    ${LLXUIXML_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
     )
@@ -86,7 +88,6 @@ set(viewer_SOURCE_FILES
     lggdicdownload.cpp
     floaterao.cpp
     floatervoicelicense.cpp
-    cofmgr.cpp
     lldaycyclemanager.cpp
     llenvmanager.cpp
     llwlhandlers.cpp
@@ -122,7 +123,9 @@ set(viewer_SOURCE_FILES
     llagentpilot.cpp
     llagentui.cpp
     llagentwearables.cpp
+    llagentwearablesfetch.cpp
     llanimstatelabels.cpp
+    llappearancemgr.cpp
     llappviewer.cpp
     llassetconverter.cpp
     llassetuploadresponders.cpp
@@ -308,6 +311,7 @@ set(viewer_SOURCE_FILES
     llinventorypanel.cpp
     lljoystickbutton.cpp
     lllandmarklist.cpp
+    lllocaltextureobject.cpp
     lllocalinventory.cpp
     lllogchat.cpp
     llloginhandler.cpp
@@ -329,6 +333,7 @@ set(viewer_SOURCE_FILES
     llnamelistctrl.cpp
     llnetmap.cpp
     llnotify.cpp
+    lloutfitobserver.cpp
     lloverlaybar.cpp
     llpanelaudioprefs.cpp
     llpanelaudiovolume.cpp
@@ -357,7 +362,7 @@ set(viewer_SOURCE_FILES
     llpanelgrouproles.cpp
     llpanelgroupvoting.cpp
     llpanelinput.cpp
-    llpanelinventory.cpp
+    llpanelobjectinventory.cpp
     llpanelland.cpp
     llpanellandaudio.cpp
     llpanellandmedia.cpp
@@ -411,7 +416,9 @@ set(viewer_SOURCE_FILES
     llstylemap.cpp
     llsurface.cpp
     llsurfacepatch.cpp
+    lltexglobalcolor.cpp
     lltexlayer.cpp
+    lltexlayerparams.cpp
     lltexturecache.cpp
     lltexturectrl.cpp
     lltexturefetch.cpp
@@ -571,7 +578,6 @@ set(viewer_HEADER_FILES
     aoremotectrl.h
     floaterao.h
     floatervoicelicense.h
-    cofmgr.h
     lldaycyclemanager.h
     llenvmanager.h
     llwlhandlers.h
@@ -607,8 +613,10 @@ set(viewer_HEADER_FILES
     llagentpilot.h
     llagentui.h
     llagentwearables.h
+    llagentwearablesfetch.h
     llanimstatelabels.h
     llappearance.h
+    llappearancemgr.h
     llappviewer.h
     llassetconverter.h
     llassetuploadresponders.h
@@ -794,6 +802,7 @@ set(viewer_HEADER_FILES
     lljoystickbutton.h
     lllandmarklist.h
     lllightconstants.h
+    lllocaltextureobject.h
     lllocalinventory.h
     lllogchat.h
     llloginhandler.h
@@ -815,6 +824,7 @@ set(viewer_HEADER_FILES
     llnamelistctrl.h
     llnetmap.h
     llnotify.h
+    lloutfitobserver.h
     lloverlaybar.h
     llpanelaudioprefs.h
     llpanelaudiovolume.h
@@ -843,7 +853,7 @@ set(viewer_HEADER_FILES
     llpanelgrouproles.h
     llpanelgroupvoting.h
     llpanelinput.h
-    llpanelinventory.h
+    llpanelobjectinventory.h
     llpanelland.h
     llpanellandaudio.h
     llpanellandmedia.h
@@ -900,7 +910,9 @@ set(viewer_HEADER_FILES
     llsurface.h
     llsurfacepatch.h
     lltable.h
+    lltexglobalcolor.h
     lltexlayer.h
+    lltexlayerparams.h
     lltexturecache.h
     lltexturectrl.h
     lltexturefetch.h
@@ -1522,6 +1534,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${LLVFS_LIBRARIES}
     ${LLWINDOW_LIBRARIES}
     ${LLXML_LIBRARIES}
+    ${LLXUIXML_LIBRARIES}
     ${LSCRIPT_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLCOMMON_LIBRARIES}