Merge remote branch 'mccabe/1.2.0-next' into next

Moved "Backup" pie menu item to fit "Go Here" in top-left slot.

Conflicts:
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml

1 files changed, 7 insertions, 1 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index bd38476..f224652 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -61,6 +61,7 @@ include_directories(
     )
 
 set(viewer_SOURCE_FILES
+        jcfloater_animation_list.cpp
     llagent.cpp
     llagentdata.cpp
     llagentlanguage.cpp
@@ -121,6 +122,7 @@ set(viewer_SOURCE_FILES
     llfloaterabout.cpp
     llfloateractivespeakers.cpp
     llfloateranimpreview.cpp
+    llfloaterassetbrowser.cpp
     llfloaterauction.cpp
     llfloateravatarinfo.cpp
     llfloateravatarpicker.cpp
@@ -460,6 +462,7 @@ set(viewer_HEADER_FILES
     CMakeLists.txt
     ViewerInstall.cmake
 
+        jcfloater_animation_list.h
     llagent.h
     llagentdata.h
     llagentlanguage.h
@@ -522,6 +525,7 @@ set(viewer_HEADER_FILES
     llfloaterabout.h
     llfloateractivespeakers.h
     llfloateranimpreview.h
+    llfloaterassetbrowser.h
     llfloaterauction.h
     llfloateravatarinfo.h
     llfloateravatarpicker.h
@@ -1036,7 +1040,9 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_about_land.xml
     skins/default/xui/en-us/floater_about.xml
     skins/default/xui/en-us/floater_active_speakers.xml
+    skins/default/xui/en-us/floater_animation_list.xml
     skins/default/xui/en-us/floater_animation_preview.xml
+    skins/default/xui/en-us/floater_asset_browser.xml
     skins/default/xui/en-us/floater_auction.xml
     skins/default/xui/en-us/floater_audio_volume.xml
     skins/default/xui/en-us/floater_avatar_picker.xml
@@ -1398,6 +1404,7 @@ if (WINDOWS)
 endif (WINDOWS)
 
 target_link_libraries(${VIEWER_BINARY_NAME}
+    ${NDOF_LIBRARY}
     ${LLAUDIO_LIBRARIES}
     ${LLCHARACTER_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
@@ -1427,7 +1434,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${SDL_LIBRARY}
     ${SMARTHEAP_LIBRARY}
     ${UI_LIBRARIES}
-    ${NDOF_LIBRARY}
     ${WINDOWS_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
     ${ELFIO_LIBRARIES}