Pull merge from lindenlab/viewer-release

6 files changed, 46 insertions, 0 deletions

diff --git a/doc/LGPL-licence.txt b/doc/LGPL-licence.txt
index 4362b49151..4362b49151 100644..100755
--- a/doc/LGPL-licence.txt
+++ b/doc/LGPL-licence.txt
diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt
index e63c48e542..e63c48e542 100644..100755
--- a/doc/LICENSE-logos.txt
+++ b/doc/LICENSE-logos.txt
diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt
index 407402265e..407402265e 100644..100755
--- a/doc/LICENSE-source.txt
+++ b/doc/LICENSE-source.txt
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f53d9f5cfd..931211f622 100644..100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -175,7 +175,11 @@ Ansariel Hiller
 	STORM-1685
 	STORM-1713
 	STORM-1899
+	MAINT-2368
+	STORM-1931
 Aralara Rajal
+Arare Chantilly
+	CHUIBUG-191
 Ardy Lay
 	STORM-859
 	VWR-19499
@@ -299,7 +303,10 @@ ChickyBabes Zuzu
 Christopher  Organiser
 Ciaran Laval
 Cinder Roxley
+    BUG-2326
     STORM-1703
+	STORM-1948
+    STORM-1952
 Clara Young
 Coaldust Numbers
     VWR-1095
@@ -311,6 +318,7 @@ Cron Stardust
 	VWR-10579
 	VWR-25120
 	STORM-1075
+	STORM-1919
 Cypren Christenson
 	STORM-417
 Dante Tucker
@@ -403,6 +411,8 @@ Ganymedes Costagravas
 Geenz Spad
 	STORM-1823
 	STORM-1900
+	STORM-1905
+	NORSPEC-229
 Gene Frostbite
 GeneJ Composer
 Geneko Nemeth
@@ -477,6 +487,7 @@ Hiro Sommambulist
 Hitomi Tiponi
 	STORM-1741
 	STORM-1862
+	BUG-1067
 Holger Gilruth
 Horatio Freund
 Hoze Menges
@@ -497,6 +508,8 @@ Ima Mechanique
 	STORM-959
 	STORM-1175
 	STORM-1708
+	STORM-1855
+	VWR-20553
 Imnotgoing Sideways
 Inma Rau
 Innula Zenovka
@@ -640,12 +653,17 @@ Jonathan Yap
 	STORM-1793
 	STORM-1810
 	STORM-1877
+	STORM-1892
+	STORM-1894
 	STORM-1860
 	STORM-1852
 	STORM-1870
 	STORM-1872
 	STORM-1858
 	STORM-1862
+	STORM-1918
+	STORM-1953
+	OPEN-161
 Kadah Coba
 	STORM-1060
     STORM-1843
@@ -661,6 +679,8 @@ Kagehi Kohn
 Kaimen Takahe
 Katharine Berry
 	STORM-1900
+	STORM-1940
+	STORM-1941
 Keklily Longfall
 Ken Lavender
 Ken March
@@ -683,6 +703,7 @@ Kitty Barnett
 	STORM-800
 	STORM-1001
 	STORM-1175
+	STORM-1905
     VWR-24217
 	STORM-1804
 Kolor Fall
@@ -692,6 +713,7 @@ Kunnis Basiat
 	VWR-82
 	VWR-102
 Lance Corrimal
+	STORM-1910
 	VWR-25269
 Latif Khalifa
 	VWR-5370
@@ -744,10 +766,14 @@ Marc Claridge
 Marc2 Sands
 Marianne McCann
 Marine Kelley
+    CHUIBUG-134
     STORM-281
+    STORM-1910
 MartinRJ Fayray
     STORM-1844
     STORM-1845
+    STORM-1911
+    STORM-1934
 Matthew Anthony
 Matthew Dowd
 	VWR-1344
@@ -895,6 +921,14 @@ NickyD
 	MAINT-873
 Nicky Dasmijn
 	VWR-29228
+	MAINT-873
+	SUN-72
+	BUG-2432
+	STORM-1935
+	STORM-1936
+	BUG-3605
+	CHUIBUG-197
+	STORM-1937
 Nicky Perian
 	OPEN-1
 	STORM-1087
@@ -1017,6 +1051,7 @@ Ryozu Kojima
 	VWR-287
 Sachi Vixen
 Sahkolihaa Contepomi
+	MATBUG-102
 Saii Hallard
 SaintLEOlions Zimer
 Salahzar Stenvaag
@@ -1036,6 +1071,7 @@ Satanello Miami
 Satomi Ahn
 	STORM-501
 	STORM-229
+	VWR-20553
 	VWR-24502
 Scrim Pinion
 Scrippy Scofield
@@ -1064,10 +1100,12 @@ Sheet Spotter
 Shnurui Troughton
 Shyotl Kuhr
 	MAINT-1138
+	MAINT-2334
 Siana Gearz
 	STORM-960
 	STORM-1088
 	MAINT-1138
+	MAINT-2334
 sicarius Thorne
 Sicarius Toxx
 SignpostMarv Martin
@@ -1085,6 +1123,8 @@ SLB Wirefly
 Slee Mayo
     SEC-1075
 snowy Sidran
+Sovereign Engineer
+    MAINT-2334
 SpacedOut Frye
 	VWR-34
 	VWR-45
@@ -1163,6 +1203,7 @@ Techwolf Lupindo
 	SNOW-746
 	VWR-12385
 	VWR-20893
+	OPEN-161
 Templar Merlin
 tenebrous pau
 	VWR-247
@@ -1200,6 +1241,8 @@ Tofu Buzzard
 	STORM-1684
 	STORM-1819
 Tony Kembia
+Tonya Souther
+	STORM-1905
 Torben Trautman
 TouchaHoney Perhaps
 TraductoresAnonimos Alter
@@ -1230,6 +1273,7 @@ Vadim Bigbear
 	VWR-2681
 Vaalith Jinn
     STORM-64
+    MATBUG-8
 Vector Hastings
 	VWR-8726
 Veritas Raymaker
@@ -1250,6 +1294,7 @@ Whimsy Winx
 Whirly Fizzle
 	STORM-1895
 	MAINT-873
+	STORM-1930
 Whoops Babii
 	VWR-631
 	VWR-1640
@@ -1337,3 +1382,4 @@ Zoex Flanagan
 
 
 
+
diff --git a/doc/releasenotes-where.txt b/doc/releasenotes-where.txt
index 4af5866905..4af5866905 100644..100755
--- a/doc/releasenotes-where.txt
+++ b/doc/releasenotes-where.txt
diff --git a/doc/translations.txt b/doc/translations.txt
index 9b7f2d6292..9b7f2d6292 100644..100755
--- a/doc/translations.txt
+++ b/doc/translations.txt