QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 70 insertions, 0 deletions

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 71423bda9c..98c80288da 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -12,6 +12,8 @@ Able Whitman
 	VWR-1813
 Adam Marker
 	VWR-2755
+Agathos Frascati
+	CT-246
 Aimee Trescothick
 	VWR-1813
 	VWR-3321
@@ -86,6 +88,8 @@ Alissa Sabre
 	VWR-10728
 Angus Boyd
 	VWR-592
+Ann Congrejo
+	CT-193
 Argent Stonecutter
 	VWR-68
 Armin Weatherwax
@@ -97,6 +101,14 @@ Balp Allen
 	VWR-4157
 Benja Kepler
 	VWR-746
+Biancaluce Robbiani
+	CT-225
+	CT-226
+	CT-227
+	CT-228
+	CT-229
+	CT-230
+	CT-231
 Blakar Ogre
 	VWR-418
 	VWR-881
@@ -109,6 +121,14 @@ blino Nakamura
 Boroondas Gupte
 	VWR-233
 	WEB-262
+Bulli Schumann
+	CT-218
+	CT-219
+	CT-220
+	CT-221
+	CT-222
+	CT-223
+	CT-224
 bushing Spatula
 	VWR-119
 	VWR-424
@@ -165,6 +185,8 @@ Feep Larsson
 	VWR-447
 	VWR-1314
 	VWR-4444
+Flemming Congrejo
+	CT-193
 Fluf Fredriksson
 	VWR-3450
 Fremont Cunningham
@@ -204,6 +226,8 @@ Gudmund Shepherd
 	VWR-1873
 Hamncheese Omlet
 	VWR-333
+HappySmurf Papp
+	CT-193
 Henri Beauchamp
 	VWR-1320
 	VWR-1406
@@ -243,6 +267,8 @@ Joghert LeSabre
 	VWR-64
 Kage Pixel
 	VWR-11
+Ken March
+	CT-245
 Kerutsen Sellery
 	VWR-1350
 Khyota Wulluf
@@ -254,6 +280,14 @@ Kunnis Basiat
 	VWR-102
 Latif Khalifa
 	VWR-5370
+Lisa Lowe
+	CT-218
+	CT-219
+	CT-220
+	CT-221
+	CT-222
+	CT-223
+	CT-224
 Lockhart Cordoso
 	VWR-108
 maciek marksman
@@ -392,11 +426,27 @@ Peekay Semyorka
 	VWR-79
 Peter Lameth
 	VWR-7331
+Pf Shan
+	CT-225
+	CT-226
+	CT-227
+	CT-228
+	CT-229
+	CT-230
+	CT-231
 princess niven
 	VWR-5733
         CT-85
 Renault Clio
 	VWR-1976
+Ringo Tuxing
+	CT-225
+	CT-226
+	CT-227
+	CT-228
+	CT-229
+	CT-230
+	CT-231
 Robin Cornelius
 	VWR-2488
 	VWR-9557
@@ -404,6 +454,14 @@ Robin Cornelius
 Ryozu Kojima
 	VWR-53
 	VWR-287
+Salahzar Stenvaag
+	CT-225
+	CT-226
+	CT-227
+	CT-228
+	CT-229
+	CT-230
+	CT-231
 Sammy Frederix
 	VWR-6186
 Scrippy Scofield
@@ -416,6 +474,14 @@ Seg Baphomet
 	VWR-2662
 	VWR-3206
 	VWR-2488
+Sergen Davies
+	CT-225
+	CT-226
+	CT-227
+	CT-228
+	CT-229
+	CT-230
+	CT-231
 SignpostMarv Martin
 	VWR-153
 	VWR-154
@@ -472,6 +538,8 @@ Thickbrick Sleaford
 Thraxis Epsilon
 	SVC-371
 	VWR-383
+tiamat bingyi
+	CT-246
 Tue Torok
 	CT-68
 	CT-69
@@ -481,6 +549,8 @@ Tue Torok
 	CT-74
 Vadim Bigbear
 	VWR-2681
+Vixen Heron
+	VWR-2710
 Whoops Babii
 	VWR-631
 	VWR-1640