svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

1 files changed, 4 insertions, 6 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 899d0a8293..0be84e2ab9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -89,6 +89,7 @@ set(viewer_SOURCE_FILES
     llcapabilitylistener.cpp
     llcaphttpsender.cpp
     llchannelmanager.cpp
+    llchatbar.cpp
     llchatitemscontainerctrl.cpp
     llchatmsgbox.cpp
     llchiclet.cpp
@@ -151,13 +152,11 @@ set(viewer_SOURCE_FILES
     llfloatercamera.cpp
     llfloaterchat.cpp
     llfloaterchatterbox.cpp
-    llfloaterclassified.cpp
     llfloatercolorpicker.cpp
     llfloatercustomize.cpp
     llfloaterdaycycle.cpp
     llfloaterdirectory.cpp
     llfloaterenvsettings.cpp
-    llfloaterevent.cpp
     llfloaterfirsttimetip.cpp
     llfloaterfriends.cpp
     llfloaterfonttest.cpp
@@ -186,7 +185,6 @@ set(viewer_SOURCE_FILES
     llfloatermute.cpp
     llfloaternamedesc.cpp
     llfloaternotificationsconsole.cpp
-    llfloaterobjectiminfo.cpp
     llfloateropenobject.cpp
     llfloaterparcel.cpp
     llfloaterperms.cpp
@@ -283,6 +281,7 @@ set(viewer_SOURCE_FILES
     lloverlaybar.cpp
     llpanelavatar.cpp
     llpanelavatarrow.cpp
+    llpanelavatartag.cpp
     llpanelclassified.cpp
     llsidetraypanelcontainer.cpp
     llpanelcontents.cpp
@@ -531,6 +530,7 @@ set(viewer_HEADER_FILES
     llcapabilityprovider.h
     llcaphttpsender.h
     llchannelmanager.h
+    llchatbar.h
     llchatitemscontainerctrl.h
     llchatmsgbox.h
     llchiclet.h
@@ -594,13 +594,11 @@ set(viewer_HEADER_FILES
     llfloatercamera.h
     llfloaterchat.h
     llfloaterchatterbox.h
-    llfloaterclassified.h
     llfloatercolorpicker.h
     llfloatercustomize.h
     llfloaterdaycycle.h
     llfloaterdirectory.h
     llfloaterenvsettings.h
-    llfloaterevent.h
     llfloaterfirsttimetip.h
     llfloaterfonttest.h
     llfloaterfriends.h
@@ -629,7 +627,6 @@ set(viewer_HEADER_FILES
     llfloatermute.h
     llfloaternamedesc.h
     llfloaternotificationsconsole.h
-    llfloaterobjectiminfo.h
     llfloateropenobject.h
     llfloaterparcel.h
     llfloaterpostcard.h
@@ -725,6 +722,7 @@ set(viewer_HEADER_FILES
     lloverlaybar.h
     llpanelavatar.h
     llpanelavatarrow.h
+    llpanelavatartag.h
     llpanelclassified.h
     llsidetraypanelcontainer.h
     llpanelcontents.h