merge of latest viewer/viewer-20

1 files changed, 29 insertions, 6 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 1d4b0261ad..a81b91df83 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -129,6 +129,7 @@ set(viewer_SOURCE_FILES
     lleventinfo.cpp
     lleventnotifier.cpp
     lleventpoll.cpp
+    llexpandabletextbox.cpp
     llface.cpp
     llfasttimerview.cpp
     llfavoritesbar.cpp
@@ -169,9 +170,9 @@ set(viewer_SOURCE_FILES
     llfloatergroups.cpp
     llfloaterhandler.cpp
     llfloaterhardwaresettings.cpp
-    llfloaterhtmlcurrency.cpp
+    llfloaterhelpbrowser.cpp
     llfloatermediabrowser.cpp
-    llfloaterhtmlsimple.cpp
+    llfloatermediasettings.cpp
     llfloaterhud.cpp
     llfloaterimagepreview.cpp
     llfloaterinspect.cpp
@@ -208,6 +209,7 @@ set(viewer_SOURCE_FILES
     llfloaterurlentry.cpp
     llfloatervoicedevicesettings.cpp
     llfloaterwater.cpp
+    llfloaterwhitelistentry.cpp
     llfloaterwindlight.cpp
     llfloaterworldmap.cpp
     llfoldertype.cpp
@@ -234,6 +236,7 @@ set(viewer_SOURCE_FILES
     llhudrender.cpp
     llhudtext.cpp
     llhudview.cpp
+    llimfloater.cpp
     llimhandler.cpp
     llimpanel.cpp
     llimview.cpp
@@ -260,6 +263,9 @@ set(viewer_SOURCE_FILES
     llmanipscale.cpp
     llmaniptranslate.cpp
     llmapresponders.cpp
+    llmediactrl.cpp
+    llmediadataresponder.cpp
+    llmediadatafetcher.cpp
     llmediaremotectrl.cpp
     llmemoryview.cpp
     llmenucommands.cpp
@@ -278,8 +284,9 @@ set(viewer_SOURCE_FILES
     llnetmap.cpp
     llnotificationalerthandler.cpp
     llnotificationgrouphandler.cpp
-    llnotificationinfohandler.cpp
     llnotificationmanager.cpp
+    llnotificationscripthandler.cpp
+    llnotificationtiphandler.cpp
     llnotify.cpp
     lloutputmonitorctrl.cpp
     lloverlaybar.cpp
@@ -320,8 +327,12 @@ set(viewer_SOURCE_FILES
     llpanelmediahud.cpp
     llpanelmeprofile.cpp
     llpanelmovetip.cpp
+    llpanelmediasettingsgeneral.cpp
+    llpanelmediasettingssecurity.cpp
+    llpanelmediasettingspermissions.cpp
     llpanelobject.cpp
     llpanelpeople.cpp
+    llpanelpeoplemenus.cpp
     llpanelpermissions.cpp
     llpanelpick.cpp
     llpanelpicks.cpp
@@ -425,6 +436,8 @@ set(viewer_SOURCE_FILES
     llviewerfloaterreg.cpp
     llviewergenericmessage.cpp
     llviewergesture.cpp    
+    llviewerhelp.cpp
+    llviewerhelputil.cpp
     llviewerinventory.cpp
     llviewerjointattachment.cpp
     llviewerjoint.cpp
@@ -490,7 +503,6 @@ set(viewer_SOURCE_FILES
     llwearabledictionary.cpp
     llwearablelist.cpp
     llweb.cpp
-    llmediactrl.cpp
     llwind.cpp
     llwlanimator.cpp
     llwldaycycle.cpp
@@ -594,6 +606,7 @@ set(viewer_HEADER_FILES
     lleventinfo.h
     lleventnotifier.h
     lleventpoll.h
+    llexpandabletextbox.h
     llface.h
     llfasttimerview.h
     llfavoritesbar.h
@@ -634,9 +647,9 @@ set(viewer_HEADER_FILES
     llfloatergroups.h
     llfloaterhandler.h
     llfloaterhardwaresettings.h
-    llfloaterhtmlcurrency.h
+    llfloaterhelpbrowser.h
     llfloatermediabrowser.h
-    llfloaterhtmlsimple.h
+    llfloatermediasettings.h
     llfloaterhud.h
     llfloaterimagepreview.h
     llfloaterinspect.h
@@ -673,6 +686,7 @@ set(viewer_HEADER_FILES
     llfloaterurlentry.h
     llfloatervoicedevicesettings.h
     llfloaterwater.h
+    llfloaterwhitelistentry.h
     llfloaterwindlight.h
     llfloaterworldmap.h
     llfoldertype.h
@@ -699,6 +713,7 @@ set(viewer_HEADER_FILES
     llhudrender.h
     llhudtext.h
     llhudview.h
+    llimfloater.h
     llimpanel.h
     llimview.h
     llimcontrolpanel.h
@@ -725,6 +740,8 @@ set(viewer_HEADER_FILES
     llmanipscale.h
     llmaniptranslate.h
     llmapresponders.h
+    llmediadataresponder.h
+    llmediadatafetcher.h
     llmediaremotectrl.h
     llmemoryview.h
     llmenucommands.h
@@ -783,8 +800,12 @@ set(viewer_HEADER_FILES
     llpanelmediahud.h
     llpanelmeprofile.h
     llpanelmovetip.h
+    llpanelmediasettingsgeneral.h
+    llpanelmediasettingssecurity.h
+    llpanelmediasettingspermissions.h
     llpanelobject.h
     llpanelpeople.h
+    llpanelpeoplemenus.h
     llpanelpermissions.h
     llpanelpick.h
     llpanelpicks.h
@@ -893,6 +914,7 @@ set(viewer_HEADER_FILES
     llviewerfloaterreg.h
     llviewergenericmessage.h
     llviewergesture.h    
+    llviewerhelp.h
     llviewerinventory.h
     llviewerjoint.h
     llviewerjointattachment.h
@@ -1583,6 +1605,7 @@ endif (INSTALL)
 include(LLAddBuildTest)
 SET(viewer_TEST_SOURCE_FILES
   llagentaccess.cpp
+  llviewerhelputil.cpp
   lllogininstance.cpp
   )
 set_source_files_properties(