132 files changed, 2769 insertions, 2772 deletions

diff --git a/.hgtags b/.hgtags
index 18de8dacd7..5206288882 100644
--- a/.hgtags
+++ b/.hgtags
@@ -72,3 +72,4 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-34_2.5.0-beta3
 b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-release
 b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release
 92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start
+63a6aedfce785a6c760377bf685b2dae616797d2 2.5.1-start
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 43e5591ab1..7231bf4da0 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1,857 +1,864 @@
-Linden Lab would like to acknowledge source code contributions from the
-following residents. The Second Life resident name is given below,
-along with the issue identifier corresponding to the patches we've
-received from them. To see more about these contributions, visit the
-browsable version: http://wiki.secondlife.com/wiki/Source_contributions
-
-Able Whitman
-	VWR-650
-	VWR-1460
-	VWR-1691
-	VWR-1735
-	VWR-1813
-Adam Marker
-	VWR-2755
-Agathos Frascati
-	CT-246
-	CT-317
-	CT-352
-Aimee Trescothick
-	SNOW-227
-	SNOW-570
-	SNOW-572
-	SNOW-575
-	VWR-3321
-	VWR-3336
-	VWR-3903
-	VWR-4083
-	VWR-4106
-	VWR-5308
-	VWR-6348
-	VWR-6358
-	VWR-6360
-	VWR-6432
-	VWR-6550
-	VWR-6583
-	VWR-6482
-	VWR-6918
-	VWR-7109
-	VWR-7383
-	VWR-7800
-	VWR-8008
-	VWR-8341
-	VWR-8430
-	VWR-8482
-	VWR-9255
-	VWR-10717
-	VWR-10990
-	VWR-11100
-	VWR-11111
-	VWR-11844
-	VWR-12631
-	VWR-12696
-	VWR-12748
-	VWR-13221
-	VWR-14087
-	VWR-14267
-	VWR-14278
-	VWR-14711
-	VWR-14712
-	VWR-15454
-Alejandro Rosenthal
-	VWR-1184
-Aleric Inglewood
-	SNOW-240
-	SNOW-522
-	SNOW-626
-	SNOW-756
-	SNOW-764
-	SNOW-800
-	VWR-10001
-	VWR-10579
-	VWR-10759
-	VWR-10837
-	VWR-12691
-	VWR-12984
-	VWR-13040
-	VWR-13996
-	VWR-14426
-	VWR-24247
-	VWR-24251
-	VWR-24252
-	VWR-24254
-	VWR-24261
-	VWR-24315
-	VWR-24317
-	VWR-24320
-    VWR-24321
- 	VWR-24354
-	VWR-24366
-	VWR-24519
-	SNOW-84
-	SNOW-477
-	SNOW-744
-	SNOW-766
-	STORM-163
-	STORM-955
-	STORM-960
-Ales Beaumont
-	VWR-9352
-	SNOW-240
-Alexandrea Fride
-    STORM-255
-	STORM-960
-Alissa Sabre
-	VWR-81
-	VWR-83
-	VWR-109
-	VWR-157
-	VWR-171
-	VWR-177
-	VWR-213
-	VWR-250
-	VWR-251
-	VWR-286
-	VWR-414
-	VWR-415
-	VWR-459
-	VWR-606
-	VWR-652
-	VWR-738
-	VWR-1109
-	VWR-1351
-	VWR-1353
-	VWR-1410
-	VWR-1843
-	VWR-2116
-	VWR-2826
-	VWR-3290
-	VWR-3410
-	VWR-3857
-	VWR-4010
-	VWR-5575
-	VWR-5717
-	VWR-5929
-	VWR-6384
-	VWR-6385
-	VWR-6386
-	VWR-6430
-	VWR-6858
-	VWR-6668
-	VWR-7086
-	VWR-7087
-	VWR-7153
-	VWR-7168
-	VWR-9190
-	VWR-10728
-	VWR-11172
-	VWR-12569
-	VWR-12617
-	VWR-12620
-	VWR-12789
-	SNOW-322
-Angus Boyd
-	VWR-592
-Ann Congrejo
-	CT-193
-Ardy Lay
-	VWR-19499
-Argent Stonecutter
-	VWR-68
-Armin Weatherwax
-	VWR-8436
-Asuka Neely
-	VWR-3434
-	VWR-8179
-Balp Allen
-	VWR-4157
-Be Holder
-	SNOW-322
-	SNOW-397
-Benja Kepler
-	VWR-746
-Biancaluce Robbiani
-	CT-225
-	CT-226
-	CT-227
-	CT-228
-	CT-229
-	CT-230
-	CT-231
-	CT-321
-	CT-352
-Blakar Ogre
-	VWR-418
-	VWR-881
-	VWR-983
-	VWR-1612
-	VWR-1613
-	VWR-2164
-blino Nakamura
-	VWR-17
-Boroondas Gupte
-	CTS-320
-	CTS-323
-	SNOW-278
-	SNOW-503
-	SNOW-510
-	SNOW-527
-	SNOW-610
-	SNOW-624
-	SNOW-737
-	STORM-318
-	VWR-233
-	VWR-20583
-	VWR-20891
-	VWR-23455
-	WEB-262
-Bulli Schumann
-	CT-218
-	CT-219
-	CT-220
-	CT-221
-	CT-222
-	CT-223
-	CT-224
-	CT-319
-	CT-350
-	CT-352
-bushing Spatula
-	VWR-119
-	VWR-424
-Carjay McGinnis
-	VWR-3737
-	VWR-4070
-	VWR-4212
-	VWR-6154
-	VWR-9400
-	VWR-9620
-Catherine Pfeffer
-	VWR-1282
-	VWR-8624
-	VWR-10854
-Celierra Darling
-	VWR-1274
-	VWR-6975
-Coaldust Numbers
-    VWR-1095
-Cron Stardust
-	VWR-10579
-Cypren Christenson
-	STORM-417
-Dale Glass
-	VWR-120
-	VWR-560
-	VWR-2502
-	VWR-1358
-	VWR-2041
-Drew Dri
-	VWR-19683
-Drewan Keats
-	VWR-28
-	VWR-248
-	VWR-412
-	VWR-638
-	VWR-660
-Dylan Haskell
-	VWR-72
-Dzonatas Sol
-	VWR-187
-	VWR-198
-	VWR-777
-	VWR-878
-	VWR-962
-	VWR-975
-	VWR-1061
-	VWR-1062
-	VWR-1704
-	VWR-1705
-	VWR-1729
-	VWR-1812
-Eddi Decosta
-	SNOW-586
-Eddy Stryker
-	VWR-15
-	VWR-23
-	VWR-1468
-	VWR-1475
-EponymousDylan Ra
-	VWR-1289
-	VWR-1465
-Eva Nowicka
-	CT-324
-	CT-352
-Farallon Greyskin
-	VWR-2036
-Feep Larsson
-	VWR-447
-	VWR-1314
-	VWR-4444
-Flemming Congrejo
-	CT-193
-	CT-318
-Fluf Fredriksson
-	VWR-3450
-Fremont Cunningham
-	VWR-1147
-Geneko Nemeth
-	CT-117
-	VWR-11069
-Gigs Taggart
-	SVC-493
-	VWR-6
-	VWR-38
-	VWR-71
-	VWR-101
-	VWR-166
-	VWR-234
-	VWR-315
-	VWR-326
-	VWR-442
-	VWR-493
-	VWR-1203
-	VWR-1217
-	VWR-1434
-	VWR-1987
-	VWR-2065
-	VWR-2491
-	VWR-2502
-	VWR-2331
-	VWR-5308
-	VWR-8781
-	VWR-8783
-Ginko Bayliss
-	VWR-4
-Grazer Kline
-	VWR-1092
-	VWR-2113
-Gudmund Shepherd
-	VWR-1594
-	VWR-1873
-Hamncheese Omlet
-	VWR-333
-HappySmurf Papp
-	CT-193
-Henri Beauchamp
-	VWR-1320
-	VWR-1406
-	VWR-4157
-Hikkoshi Sakai
-	VWR-429
-Hiro Sommambulist
-	VWR-66
-	VWR-67
-	VWR-97
-	VWR-100
-	VWR-105
-	VWR-118
-	VWR-132
-	VWR-136
-	VWR-143
-Hoze Menges
-	VWR-255
-Ian Kas
-	VWR-8780 (Russian localization)
-	[NO JIRA] (Ukranian localization)
-	CT-322
-	CT-325
-Irene Muni
-	CT-324
-	CT-352
-Iskar Ariantho
-	VWR-1223
-	VWR-11759
-Jacek Antonelli
-	SNOW-388
-	VWR-165
-	VWR-188
-	VWR-427
-	VWR-597
-	VWR-2054
-	VWR-2448
-	VWR-2896
-	VWR-2947
-	VWR-2948
-	VWR-3605
-	VWR-8617
-JB Kraft
-	VWR-5283
-	VWR-7802
-Joghert LeSabre
-	VWR-64
-Jonathan Yap
-	STORM-435
-	STORM-523
-	STORM-596
-	STORM-615
-	STORM-616
-	STORM-643
-	STORM-679
-	STORM-723
-	STORM-726
-	STORM-737
-	STORM-785
-	STORM-812
-	STORM-829
-	STORM-844
-	STORM-953
-	STORM-960
-	STORM-869
-	STORM-974
-	STORM-975
-	STORM-979
-	STORM-980
-	VWR-17801
-	VWR-24347
-Kage Pixel
-	VWR-11
-Ken March
-	CT-245
-Kerutsen Sellery
-	VWR-1350
-Khyota Wulluf
-	VWR-2085
-	VWR-8885
-	VWR-9256
-	VWR-9966
-Kitty Barnett
-	VWR-19699
-	STORM-288
-	STORM-799
-	STORM-800
-    VWR-24217
-Kunnis Basiat
-	VWR-82
-	VWR-102
-Latif Khalifa
-	VWR-5370
-Lisa Lowe
-	CT-218
-	CT-219
-	CT-220
-	CT-221
-	CT-222
-	CT-223
-	CT-224
-	CT-319
-Lockhart Cordoso
-	VWR-108
-maciek marksman
-	CT-86
-Magnus Balczo
-	CT-138
-Malwina Dollinger
-	CT-138
-march Korda
-	SVC-1020
-Marine Kelley
-    STORM-281
-Matthew Dowd
-	VWR-1344
-	VWR-1651
-	VWR-1736
-	VWR-1737
-	VWR-1761
-	VWR-2681
-McCabe Maxsted
-	SNOW-387
-	VWR-1318
-	VWR-4065
-	VWR-4826
-	VWR-6518
-	VWR-7827
-	VWR-7877
-	VWR-7893
-	VWR-8080
-	VWR-8454
-	VWR-8689
-	VWR-9007
-Michelle2 Zenovka
-    STORM-477
-	VWR-2652
-	VWR-2662
-	VWR-2834
-	VWR-3749
-	VWR-4022
-	VWR-4331
-	VWR-4506
-	VWR-4981
-	VWR-5082
-	VWR-5659
-	VWR-7831
-	VWR-8885
-	VWR-8889
-	VWR-8310
-	VWR-9499
-Mm Alder
-	SNOW-376
-	VWR-197
-	VWR-3777
-	VWR-4232
-	VWR-4794
-	VWR-13578
-Mr Greggan
-	VWR-445
-Nicholaz Beresford
-	VWR-132
-	VWR-176
-	VWR-193
-	VWR-349
-	VWR-353
-	VWR-364
-	VWR-374
-	VWR-546
-	VWR-691
-	VWR-727
-	VWR-793
-	VWR-794
-	VWR-802
-	VWR-803
-	VWR-804
-	VWR-805
-	VWR-807
-	VWR-808
-	VWR-809
-	VWR-810
-	VWR-823
-	VWR-849
-	VWR-856
-	VWR-865
-	VWR-869
-	VWR-870
-	VWR-871
-	VWR-873
-	VWR-908
-	VWR-966
-	VWR-1105
-	VWR-1221
-	VWR-1230
-	VWR-1270
-	VWR-1294
-	VWR-1296
-	VWR-1354
-	VWR-1410
-	VWR-1418
-	VWR-1436
-	VWR-1453
-	VWR-1455
-	VWR-1470
-	VWR-1471
-	VWR-1566
-	VWR-1578
-	VWR-1626
-	VWR-1646
-	VWR-1655
-	VWR-1698
-	VWR-1706
-	VWR-1721
-	VWR-1723
-	VWR-1732
-	VWR-1754
-	VWR-1769
-	VWR-1808
-	VWR-1826
-	VWR-1861
-	VWR-1872
-	VWR-1968
-	VWR-2046
-	VWR-2142
-	VWR-2152
-	VWR-2614
-	VWR-2411
-	VWR-2412
-	VWR-2682
-	VWR-2684
-Nounouch Hapmouche
-	VWR-238
-Patric Mills
-	VWR-2645
-Paul Churchill
-	VWR-20
-	VWR-493
-	VWR-749
-	VWR-1567
-	VWR-1647
-	VWR-1880
-	VWR-2072
-Paula Innis
-	VWR-30
-	VWR-293
-	VWR-1049
-	VWR-1562
-Peekay Semyorka
-	VWR-7
-	VWR-19
-	VWR-49
-	VWR-79
-Peter Lameth
-	VWR-7331
-Pf Shan
-	CT-225
-	CT-226
-	CT-227
-	CT-228
-	CT-229
-	CT-230
-	CT-231
-	CT-321
-	SNOW-422
-princess niven
-	VWR-5733
-	CT-85
-	CT-320
-	CT-352
-Renault Clio
-	VWR-1976
-resu Ampan
-	SNOW-93
-Ringo Tuxing
-	CT-225
-	CT-226
-	CT-227
-	CT-228
-	CT-229
-	CT-230
-	CT-231
-	CT-321
-Robin Cornelius
-	SNOW-108
-	SNOW-204
-	SNOW-287
-	SNOW-484
-	SNOW-504
-	SNOW-506
-	SNOW-507
-	SNOW-511
-	SNOW-512
-	SNOW-514
-	SNOW-520
-	SNOW-585
-	SNOW-599
-	SNOW-747
-	STORM-422
-	STORM-960
-	VWR-2488
-	VWR-9557
-	VWR-10579
-	VWR-11128
-	VWR-12533
-	VWR-12587
-	VWR-12758
-	VWR-12763
-	VWR-12995
-	VWR-20911
-Ryozu Kojima
-	VWR-53
-	VWR-287
-Salahzar Stenvaag
-	CT-225
-	CT-226
-	CT-227
-	CT-228
-	CT-229
-	CT-230
-	CT-231
-	CT-321
-Sammy Frederix
-	VWR-6186
-Satomi Ahn
-	STORM-501
-	STORM-229
-Scrippy Scofield
-	VWR-3748
-Seg Baphomet
-	VWR-1475
-	VWR-1525
-	VWR-1585
-	VWR-1586
-	VWR-2662
-	VWR-3206
-	VWR-2488
-Sergen Davies
-	CT-225
-	CT-226
-	CT-227
-	CT-228
-	CT-229
-	CT-230
-	CT-231
-	CT-321
-Shawn Kaufmat
-	SNOW-240
-Siana Gearz
-	STORM-960
-SignpostMarv Martin
-	VWR-153
-	VWR-154
-	VWR-155
-	VWR-218
-	VWR-373
-	VWR-8357
-Simon Nolan
-	VWR-409
-SpacedOut Frye
-	VWR-34
-	VWR-45
-	VWR-57
-	VWR-94
-	VWR-113
-	VWR-121
-	VWR-123
-	VWR-130
-	VWR-1823
-Sporked Friis
-	VWR-4903
-Stevex Janus
-	VWR-1182
-Still Defiant
-	VWR-207
-	VWR-227
-	VWR-446
-Strife Onizuka
-	SVC-9
-	VWR-14
-	VWR-74
-	VWR-85
-	VWR-148
-	WEB-164
-	VWR-183
-	VWR-2265
-	VWR-4111
-	SNOW-691
-Tayra Dagostino
-	SNOW-517
-	SNOW-543
-	VWR-13947
-TBBle Kurosawa
-	VWR-938
-	VWR-941
-	VWR-942
-	VWR-944
-	VWR-945
-	SNOW-543
-	VWR-1891
-	VWR-1892
-Teardrops Fall
-	VWR-5366
-Techwolf Lupindo
-	SNOW-92
-	SNOW-592
-	SNOW-649
-	SNOW-650
-	SNOW-651
-	SNOW-654
-	SNOW-687
-	SNOW-680
-	SNOW-681
-	SNOW-685
-	SNOW-690
-	SNOW-746
-	VWR-12385
-	VWR-20893
-tenebrous pau
-	VWR-247
-Tharax Ferraris
-	VWR-605
-Thickbrick Sleaford
-	SNOW-207
-	SNOW-390
-	SNOW-421
-	SNOW-462
-	SNOW-586
-	SNOW-592
-	SNOW-635
-	SNOW-743
-	VWR-7109
-	VWR-9287
-	VWR-13483
-	VWR-13947
-	VWR-24420
-Thraxis Epsilon
-	SVC-371
-	VWR-383
-tiamat bingyi
-	CT-246
-Tofu Buzzard
-	STORM-546
-TraductoresAnonimos Alter
-	CT-324
-Tue Torok
-	CT-68
-	CT-69
-	CT-70
-	CT-72
-	CT-73
-	CT-74
-Twisted Laws
-	SNOW-352
-	STORM-466
-	STORM-467
-	STORM-844
-	STORM-643
-Vadim Bigbear
-	VWR-2681
-Vector Hastings
-	VWR-8726
-Vixen Heron
-	VWR-2710
-	CT-88
-Whoops Babii
-	VWR-631
-	VWR-1640
-	VWR-3340
-	SNOW-667
-	VWR-4800
-	VWR-4802
-	VWR-4804
-	VWR-4805
-	VWR-4806
-	VWR-4808
-	VWR-4809
-	VWR-4811
-	VWR-4815
-	VWR-4816
-	VWR-4818
-	VWR-5659
-	VWR-8291
-	VWR-8292
-	VWR-8293
-	VWR-8294
-	VWR-8295
-	VWR-8296
-	VWR-8297
-	VWR-8298
-Wilton Lundquist
-	VWR-7682
-WolfPup Lowenhar
-	SNOW-622
-	SNOW-772
-	STORM-102
-	STORM-103
-	STORM-143
-	STORM-255
-	STORM-256
-	STORM-288
-	STORM-535
-	STORM-544
-	STORM-654
-	STORM-674
-	STORM-776
-	STORM-825
-	VWR-20741
-	VWR-20933
-Zai Lynch
-	VWR-19505
-Zarkonnen Decosta
-	VWR-253
-Zi Ree
-	VWR-423
-	VWR-671
-	VWR-682
-	VWR-684
-	VWR-9127
-	VWR-1140
-Zipherius Turas
-	VWR-76
-	VWR-77
-
+Linden Lab would like to acknowledge source code contributions from the

+following residents. The Second Life resident name is given below,

+along with the issue identifier corresponding to the patches we've

+received from them. To see more about these contributions, visit the

+browsable version: http://wiki.secondlife.com/wiki/Source_contributions

+

+Able Whitman

+	VWR-650

+	VWR-1460

+	VWR-1691

+	VWR-1735

+	VWR-1813

+Adam Marker

+	VWR-2755

+Agathos Frascati

+	CT-246

+	CT-317

+	CT-352

+Aimee Trescothick

+	SNOW-227

+	SNOW-570

+	SNOW-572

+	SNOW-575

+	VWR-3321

+	VWR-3336

+	VWR-3903

+	VWR-4083

+	VWR-4106

+	VWR-5308

+	VWR-6348

+	VWR-6358

+	VWR-6360

+	VWR-6432

+	VWR-6550

+	VWR-6583

+	VWR-6482

+	VWR-6918

+	VWR-7109

+	VWR-7383

+	VWR-7800

+	VWR-8008

+	VWR-8341

+	VWR-8430

+	VWR-8482

+	VWR-9255

+	VWR-10717

+	VWR-10990

+	VWR-11100

+	VWR-11111

+	VWR-11844

+	VWR-12631

+	VWR-12696

+	VWR-12748

+	VWR-13221

+	VWR-14087

+	VWR-14267

+	VWR-14278

+	VWR-14711

+	VWR-14712

+	VWR-15454

+Alejandro Rosenthal

+	VWR-1184

+Aleric Inglewood

+	SNOW-240

+	SNOW-522

+	SNOW-626

+	SNOW-756

+	SNOW-764

+	SNOW-800

+	VWR-10001

+	VWR-10579

+	VWR-10759

+	VWR-10837

+	VWR-12691

+	VWR-12984

+	VWR-13040

+	VWR-13996

+	VWR-14426

+	VWR-24247

+	VWR-24251

+	VWR-24252

+	VWR-24254

+	VWR-24261

+	VWR-24315

+	VWR-24317

+	VWR-24320

+    VWR-24321

+ 	VWR-24354

+	VWR-24366

+	VWR-24519

+	SNOW-84

+	SNOW-477

+	SNOW-744

+	SNOW-766

+	STORM-163

+	STORM-955

+	STORM-960

+Ales Beaumont

+	VWR-9352

+	SNOW-240

+Alexandrea Fride

+    STORM-255

+	STORM-960

+Alissa Sabre

+	VWR-81

+	VWR-83

+	VWR-109

+	VWR-157

+	VWR-171

+	VWR-177

+	VWR-213

+	VWR-250

+	VWR-251

+	VWR-286

+	VWR-414

+	VWR-415

+	VWR-459

+	VWR-606

+	VWR-652

+	VWR-738

+	VWR-1109

+	VWR-1351

+	VWR-1353

+	VWR-1410

+	VWR-1843

+	VWR-2116

+	VWR-2826

+	VWR-3290

+	VWR-3410

+	VWR-3857

+	VWR-4010

+	VWR-5575

+	VWR-5717

+	VWR-5929

+	VWR-6384

+	VWR-6385

+	VWR-6386

+	VWR-6430

+	VWR-6858

+	VWR-6668

+	VWR-7086

+	VWR-7087

+	VWR-7153

+	VWR-7168

+	VWR-9190

+	VWR-10728

+	VWR-11172

+	VWR-12569

+	VWR-12617

+	VWR-12620

+	VWR-12789

+	SNOW-322

+Angus Boyd

+	VWR-592

+Ann Congrejo

+	CT-193

+Ardy Lay

+	VWR-19499

+	VWR-24917

+Argent Stonecutter

+	VWR-68

+Armin Weatherwax

+	VWR-8436

+Asuka Neely

+	VWR-3434

+	VWR-8179

+Balp Allen

+	VWR-4157

+Be Holder

+	SNOW-322

+	SNOW-397

+Benja Kepler

+	VWR-746

+Biancaluce Robbiani

+	CT-225

+	CT-226

+	CT-227

+	CT-228

+	CT-229

+	CT-230

+	CT-231

+	CT-321

+	CT-352

+Blakar Ogre

+	VWR-418

+	VWR-881

+	VWR-983

+	VWR-1612

+	VWR-1613

+	VWR-2164

+blino Nakamura

+	VWR-17

+Boroondas Gupte

+	OPEN-29

+	CTS-323

+	SNOW-278

+	SNOW-503

+	SNOW-510

+	SNOW-527

+	SNOW-610

+	SNOW-624

+	SNOW-737

+	STORM-318

+	VWR-233

+	VWR-20583

+	VWR-20891

+	VWR-23455

+	WEB-262

+Bulli Schumann

+	CT-218

+	CT-219

+	CT-220

+	CT-221

+	CT-222

+	CT-223

+	CT-224

+	CT-319

+	CT-350

+	CT-352

+bushing Spatula

+	VWR-119

+	VWR-424

+Carjay McGinnis

+	VWR-3737

+	VWR-4070

+	VWR-4212

+	VWR-6154

+	VWR-9400

+	VWR-9620

+Catherine Pfeffer

+	VWR-1282

+	VWR-8624

+	VWR-10854

+Celierra Darling

+	VWR-1274

+	VWR-6975

+Coaldust Numbers

+    VWR-1095

+Cron Stardust

+	VWR-10579

+Cypren Christenson

+	STORM-417

+Dale Glass

+	VWR-120

+	VWR-560

+	VWR-2502

+	VWR-1358

+	VWR-2041

+Drew Dri

+	VWR-19683

+Drewan Keats

+	VWR-28

+	VWR-248

+	VWR-412

+	VWR-638

+	VWR-660

+Dylan Haskell

+	VWR-72

+Dzonatas Sol

+	VWR-187

+	VWR-198

+	VWR-777

+	VWR-878

+	VWR-962

+	VWR-975

+	VWR-1061

+	VWR-1062

+	VWR-1704

+	VWR-1705

+	VWR-1729

+	VWR-1812

+Eddi Decosta

+	SNOW-586

+Eddy Stryker

+	VWR-15

+	VWR-23

+	VWR-1468

+	VWR-1475

+EponymousDylan Ra

+	VWR-1289

+	VWR-1465

+Eva Nowicka

+	CT-324

+	CT-352

+Farallon Greyskin

+	VWR-2036

+Feep Larsson

+	VWR-447

+	VWR-1314

+	VWR-4444

+Flemming Congrejo

+	CT-193

+	CT-318

+Fluf Fredriksson

+	VWR-3450

+Fremont Cunningham

+	VWR-1147

+Geneko Nemeth

+	CT-117

+	VWR-11069

+Gigs Taggart

+	SVC-493

+	VWR-6

+	VWR-38

+	VWR-71

+	VWR-101

+	VWR-166

+	VWR-234

+	VWR-315

+	VWR-326

+	VWR-442

+	VWR-493

+	VWR-1203

+	VWR-1217

+	VWR-1434

+	VWR-1987

+	VWR-2065

+	VWR-2491

+	VWR-2502

+	VWR-2331

+	VWR-5308

+	VWR-8781

+	VWR-8783

+Ginko Bayliss

+	VWR-4

+Grazer Kline

+	VWR-1092

+	VWR-2113

+Gudmund Shepherd

+	VWR-1594

+	VWR-1873

+Hamncheese Omlet

+	VWR-333

+HappySmurf Papp

+	CT-193

+Henri Beauchamp

+	VWR-1320

+	VWR-1406

+	VWR-4157

+Hikkoshi Sakai

+	VWR-429

+Hiro Sommambulist

+	VWR-66

+	VWR-67

+	VWR-97

+	VWR-100

+	VWR-105

+	VWR-118

+	VWR-132

+	VWR-136

+	VWR-143

+Hoze Menges

+	VWR-255

+Ian Kas

+	VWR-8780 (Russian localization)

+	[NO JIRA] (Ukranian localization)

+	CT-322

+	CT-325

+Irene Muni

+	CT-324

+	CT-352

+Iskar Ariantho

+	VWR-1223

+	VWR-11759

+Jacek Antonelli

+	SNOW-388

+	VWR-165

+	VWR-188

+	VWR-427

+	VWR-597

+	VWR-2054

+	VWR-2448

+	VWR-2896

+	VWR-2947

+	VWR-2948

+	VWR-3605

+	VWR-8617

+JB Kraft

+	VWR-5283

+	VWR-7802

+Joghert LeSabre

+	VWR-64

+Jonathan Yap

+	STORM-435

+	STORM-523

+	STORM-596

+	STORM-615

+	STORM-616

+	STORM-643

+	STORM-679

+	STORM-723

+	STORM-726

+	STORM-737

+	STORM-785

+	STORM-812

+	STORM-829

+	STORM-844

+	STORM-953

+	STORM-954

+	STORM-960

+	STORM-869

+	STORM-974

+	STORM-975

+	STORM-977

+	STORM-979

+	STORM-980

+	STORM-1040

+	VWR-17801

+	VWR-24347

+	STORM-990

+Kage Pixel

+	VWR-11

+Ken March

+	CT-245

+Kerutsen Sellery

+	VWR-1350

+Khyota Wulluf

+	VWR-2085

+	VWR-8885

+	VWR-9256

+	VWR-9966

+Kitty Barnett

+	VWR-19699

+	STORM-288

+	STORM-799

+	STORM-800

+    VWR-24217

+Kunnis Basiat

+	VWR-82

+	VWR-102

+Latif Khalifa

+	VWR-5370

+Lisa Lowe

+	CT-218

+	CT-219

+	CT-220

+	CT-221

+	CT-222

+	CT-223

+	CT-224

+	CT-319

+Lockhart Cordoso

+	VWR-108

+maciek marksman

+	CT-86

+Magnus Balczo

+	CT-138

+Malwina Dollinger

+	CT-138

+march Korda

+	SVC-1020

+Marine Kelley

+    STORM-281

+Matthew Dowd

+	VWR-1344

+	VWR-1651

+	VWR-1736

+	VWR-1737

+	VWR-1761

+	VWR-2681

+McCabe Maxsted

+	SNOW-387

+	VWR-1318

+	VWR-4065

+	VWR-4826

+	VWR-6518

+	VWR-7827

+	VWR-7877

+	VWR-7893

+	VWR-8080

+	VWR-8454

+	VWR-8689

+	VWR-9007

+Michelle2 Zenovka

+    STORM-477

+	VWR-2652

+	VWR-2662

+	VWR-2834

+	VWR-3749

+	VWR-4022

+	VWR-4331

+	VWR-4506

+	VWR-4981

+	VWR-5082

+	VWR-5659

+	VWR-7831

+	VWR-8885

+	VWR-8889

+	VWR-8310

+	VWR-9499

+Mm Alder

+	SNOW-376

+	VWR-197

+	VWR-3777

+	VWR-4232

+	VWR-4794

+	VWR-13578

+Mr Greggan

+	VWR-445

+Nicholaz Beresford

+	VWR-132

+	VWR-176

+	VWR-193

+	VWR-349

+	VWR-353

+	VWR-364

+	VWR-374

+	VWR-546

+	VWR-691

+	VWR-727

+	VWR-793

+	VWR-794

+	VWR-802

+	VWR-803

+	VWR-804

+	VWR-805

+	VWR-807

+	VWR-808

+	VWR-809

+	VWR-810

+	VWR-823

+	VWR-849

+	VWR-856

+	VWR-865

+	VWR-869

+	VWR-870

+	VWR-871

+	VWR-873

+	VWR-908

+	VWR-966

+	VWR-1105

+	VWR-1221

+	VWR-1230

+	VWR-1270

+	VWR-1294

+	VWR-1296

+	VWR-1354

+	VWR-1410

+	VWR-1418

+	VWR-1436

+	VWR-1453

+	VWR-1455

+	VWR-1470

+	VWR-1471

+	VWR-1566

+	VWR-1578

+	VWR-1626

+	VWR-1646

+	VWR-1655

+	VWR-1698

+	VWR-1706

+	VWR-1721

+	VWR-1723

+	VWR-1732

+	VWR-1754

+	VWR-1769

+	VWR-1808

+	VWR-1826

+	VWR-1861

+	VWR-1872

+	VWR-1968

+	VWR-2046

+	VWR-2142

+	VWR-2152

+	VWR-2614

+	VWR-2411

+	VWR-2412

+	VWR-2682

+	VWR-2684

+Nounouch Hapmouche

+	VWR-238

+Patric Mills

+	VWR-2645

+Paul Churchill

+	VWR-20

+	VWR-493

+	VWR-749

+	VWR-1567

+	VWR-1647

+	VWR-1880

+	VWR-2072

+Paula Innis

+	VWR-30

+	VWR-293

+	VWR-1049

+	VWR-1562

+Peekay Semyorka

+	VWR-7

+	VWR-19

+	VWR-49

+	VWR-79

+Peter Lameth

+	VWR-7331

+Pf Shan

+	CT-225

+	CT-226

+	CT-227

+	CT-228

+	CT-229

+	CT-230

+	CT-231

+	CT-321

+	SNOW-422

+princess niven

+	VWR-5733

+	CT-85

+	CT-320

+	CT-352

+Renault Clio

+	VWR-1976

+resu Ampan

+	SNOW-93

+Ringo Tuxing

+	CT-225

+	CT-226

+	CT-227

+	CT-228

+	CT-229

+	CT-230

+	CT-231

+	CT-321

+Robin Cornelius

+	SNOW-108

+	SNOW-204

+	SNOW-287

+	SNOW-484

+	SNOW-504

+	SNOW-506

+	SNOW-507

+	SNOW-511

+	SNOW-512

+	SNOW-514

+	SNOW-520

+	SNOW-585

+	SNOW-599

+	SNOW-747

+	STORM-422

+	STORM-960

+	VWR-2488

+	VWR-9557

+	VWR-10579

+	VWR-11128

+	VWR-12533

+	VWR-12587

+	VWR-12758

+	VWR-12763

+	VWR-12995

+	VWR-20911

+Ryozu Kojima

+	VWR-53

+	VWR-287

+Salahzar Stenvaag

+	CT-225

+	CT-226

+	CT-227

+	CT-228

+	CT-229

+	CT-230

+	CT-231

+	CT-321

+Sammy Frederix

+	VWR-6186

+Satomi Ahn

+	STORM-501

+	STORM-229

+Scrippy Scofield

+	VWR-3748

+Seg Baphomet

+	VWR-1475

+	VWR-1525

+	VWR-1585

+	VWR-1586

+	VWR-2662

+	VWR-3206

+	VWR-2488

+Sergen Davies

+	CT-225

+	CT-226

+	CT-227

+	CT-228

+	CT-229

+	CT-230

+	CT-231

+	CT-321

+Shawn Kaufmat

+	SNOW-240

+Siana Gearz

+	STORM-960

+SignpostMarv Martin

+	VWR-153

+	VWR-154

+	VWR-155

+	VWR-218

+	VWR-373

+	VWR-8357

+Simon Nolan

+	VWR-409

+SpacedOut Frye

+	VWR-34

+	VWR-45

+	VWR-57

+	VWR-94

+	VWR-113

+	VWR-121

+	VWR-123

+	VWR-130

+	VWR-1823

+Sporked Friis

+	VWR-4903

+Stevex Janus

+	VWR-1182

+Still Defiant

+	VWR-207

+	VWR-227

+	VWR-446

+Strife Onizuka

+	SVC-9

+	VWR-14

+	VWR-74

+	VWR-85

+	VWR-148

+	WEB-164

+	VWR-183

+	VWR-2265

+	VWR-4111

+	SNOW-691

+Tayra Dagostino

+	SNOW-517

+	SNOW-543

+	VWR-13947

+TBBle Kurosawa

+	VWR-938

+	VWR-941

+	VWR-942

+	VWR-944

+	VWR-945

+	SNOW-543

+	VWR-1891

+	VWR-1892

+Teardrops Fall

+	VWR-5366

+Techwolf Lupindo

+	SNOW-92

+	SNOW-592

+	SNOW-649

+	SNOW-650

+	SNOW-651

+	SNOW-654

+	SNOW-687

+	SNOW-680

+	SNOW-681

+	SNOW-685

+	SNOW-690

+	SNOW-746

+	VWR-12385

+	VWR-20893

+tenebrous pau

+	VWR-247

+Tharax Ferraris

+	VWR-605

+Thickbrick Sleaford

+	SNOW-207

+	SNOW-390

+	SNOW-421

+	SNOW-462

+	SNOW-586

+	SNOW-592

+	SNOW-635

+	SNOW-743

+	VWR-7109

+	VWR-9287

+	VWR-13483

+	VWR-13947

+	VWR-24420

+Thraxis Epsilon

+	SVC-371

+	VWR-383

+tiamat bingyi

+	CT-246

+Tofu Buzzard

+	STORM-546

+TraductoresAnonimos Alter

+	CT-324

+Tue Torok

+	CT-68

+	CT-69

+	CT-70

+	CT-72

+	CT-73

+	CT-74

+Twisted Laws

+	SNOW-352

+	STORM-466

+	STORM-467

+	STORM-844

+	STORM-643

+	STORM-954

+Vadim Bigbear

+	VWR-2681

+Vector Hastings

+	VWR-8726

+Vixen Heron

+	VWR-2710

+	CT-88

+Whoops Babii

+	VWR-631

+	VWR-1640

+	VWR-3340

+	SNOW-667

+	VWR-4800

+	VWR-4802

+	VWR-4804

+	VWR-4805

+	VWR-4806

+	VWR-4808

+	VWR-4809

+	VWR-4811

+	VWR-4815

+	VWR-4816

+	VWR-4818

+	VWR-5659

+	VWR-8291

+	VWR-8292

+	VWR-8293

+	VWR-8294

+	VWR-8295

+	VWR-8296

+	VWR-8297

+	VWR-8298

+Wilton Lundquist

+	VWR-7682

+WolfPup Lowenhar

+	SNOW-622

+	SNOW-772

+	STORM-102

+	STORM-103

+	STORM-143

+	STORM-236

+	STORM-255

+	STORM-256

+	STORM-288

+	STORM-535

+	STORM-544

+	STORM-654

+	STORM-674

+	STORM-776

+	STORM-825

+	VWR-20741

+	VWR-20933

+Zai Lynch

+	VWR-19505

+Zarkonnen Decosta

+	VWR-253

+Zi Ree

+	VWR-423

+	VWR-671

+	VWR-682

+	VWR-684

+	VWR-9127

+	VWR-1140

+Zipherius Turas

+	VWR-76

+	VWR-77

+

diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 6d17a6f402..7ba43f4b13 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -72,9 +72,9 @@ if (VIEWER)
   add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
 
   # llplugin testbed code (is this the right way to include it?)
-  if (NOT LINUX)
+  if (LL_TESTS AND NOT LINUX)
     add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest)
-  endif (NOT LINUX)
+  endif (LL_TESTS AND NOT LINUX)
 
   if (LINUX)
     add_subdirectory(${VIEWER_PREFIX}linux_crash_logger)
diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp
index ad1845d387..ba3dd6d6b4 100644
--- a/indra/llcommon/llavatarname.cpp
+++ b/indra/llcommon/llavatarname.cpp
@@ -90,14 +90,16 @@ void LLAvatarName::fromLLSD(const LLSD& sd)
 std::string LLAvatarName::getCompleteName() const
 {
 	std::string name;
-	if (!mUsername.empty())
+	if (mUsername.empty() || mIsDisplayNameDefault)
+	// If the display name feature is off
+	// OR this particular display name is defaulted (i.e. based on user name),
+	// then display only the easier to read instance of the person's name.
 	{
-		name = mDisplayName + " (" + mUsername + ")";
+		name = mDisplayName;
 	}
 	else
 	{
-		// ...display names are off, legacy name is in mDisplayName
-		name = mDisplayName;
+		name = mDisplayName + " (" + mUsername + ")";
 	}
 	return name;
 }
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 7703132d90..15e3ffe1da 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -28,8 +28,8 @@
 #define LL_LLVERSIONVIEWER_H
 
 const S32 LL_VERSION_MAJOR = 2;
-const S32 LL_VERSION_MINOR = 7;
-const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_MINOR = 5;
+const S32 LL_VERSION_PATCH = 2;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Developer";
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 488bd45d8f..0a4cd51ea0 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -72,6 +72,7 @@ static const std::string PARCEL_CATEGORY_STRING[LLParcel::C_COUNT] =
     "shopping",
     "stage",
     "other",
+	"rental"
 };
 static const std::string PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] =
 {
@@ -89,6 +90,7 @@ static const std::string PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] =
     "Shopping",
     "Stage",
     "Other",
+	"Rental",
     "Any",	 // valid string for parcel searches
 };
 
@@ -188,8 +190,6 @@ void LLParcel::init(const LLUUID &owner_id,
 	mMediaID.setNull();
 	mMediaAutoScale = 0;
 	mMediaLoop = TRUE;
-	mObscureMedia = 1;
-	mObscureMusic = 1;
 	mMediaWidth = 0;
 	mMediaHeight = 0;
 	setMediaCurrentURL(LLStringUtil::null);
@@ -685,8 +685,8 @@ void LLParcel::packMessage(LLSD& msg)
 	msg["auto_scale"] = getMediaAutoScale();
 	msg["media_loop"] = getMediaLoop();
 	msg["media_current_url"] = getMediaCurrentURL();
-	msg["obscure_media"] = getObscureMedia();
-	msg["obscure_music"] = getObscureMusic();
+	msg["obscure_media"] = false; // OBSOLETE - no longer used
+	msg["obscure_music"] = false; // OBSOLETE - no longer used
 	msg["media_id"] = getMediaID();
 	msg["media_allow_navigate"] = getMediaAllowNavigate();
 	msg["media_prevent_camera_zoom"] = getMediaPreventCameraZoom();
@@ -750,16 +750,13 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
 		msg->getS32("MediaData", "MediaWidth", mMediaWidth);
 		msg->getS32("MediaData", "MediaHeight", mMediaHeight);
 		msg->getU8 ( "MediaData", "MediaLoop", mMediaLoop );
-		msg->getU8 ( "MediaData", "ObscureMedia", mObscureMedia );
-		msg->getU8 ( "MediaData", "ObscureMusic", mObscureMusic );
+		// the ObscureMedia and ObscureMusic flags previously set here are no longer used
 	}
 	else
 	{
 		setMediaType(std::string("video/vnd.secondlife.qt.legacy"));
 		setMediaDesc(std::string("No Description available without Server Upgrade"));
 		mMediaLoop = true;
-		mObscureMedia = true;
-		mObscureMusic = true;
 	}
 
 	if(msg->getNumberOfBlocks("MediaLinkSharing") > 0)
@@ -1225,8 +1222,6 @@ void LLParcel::clearParcel()
     setMediaDesc(LLStringUtil::null);
 	setMediaAutoScale(0);
 	setMediaLoop(TRUE);
-	mObscureMedia = 1;
-	mObscureMusic = 1;
 	mMediaWidth = 0;
 	mMediaHeight = 0;
 	setMediaCurrentURL(LLStringUtil::null);
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index ae301af9f5..71b65d99ce 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -165,6 +165,7 @@ public:
 		C_SHOPPING,
 		C_STAGE,
 		C_OTHER,
+		C_RENTAL,
 		C_COUNT,
 		C_ANY = -1		// only useful in queries
 	};
@@ -238,8 +239,6 @@ public:
 	void	setMediaID(const LLUUID& id) { mMediaID = id; }
 	void	setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; }
 	void    setMediaLoop (U8 loop) { mMediaLoop = loop; }
-	void	setObscureMedia( U8 flagIn ) { mObscureMedia = flagIn; }
-	void	setObscureMusic( U8 flagIn ) { mObscureMusic = flagIn; }
 	void setMediaWidth(S32 width);
 	void setMediaHeight(S32 height);
 	void setMediaCurrentURL(const std::string& url);
@@ -346,8 +345,6 @@ public:
 	U8				getMediaAutoScale() const	{ return mMediaAutoScale; }
 	U8              getMediaLoop() const        { return mMediaLoop; }
 	const std::string&  getMediaCurrentURL() const { return mMediaCurrentURL; }
-	U8				getObscureMedia() const		{ return mObscureMedia; }
-	U8				getObscureMusic() const		{ return mObscureMusic; }
 	U8              getMediaURLFilterEnable() const   { return mMediaURLFilterEnable; }
 	LLSD            getMediaURLFilterList() const     { return mMediaURLFilterList; }
 	U8              getMediaAllowNavigate() const { return mMediaAllowNavigate; }
@@ -636,8 +633,6 @@ protected:
 	U8					mMediaAutoScale;
 	U8                  mMediaLoop;
 	std::string         mMediaCurrentURL;
-	U8					mObscureMedia;
-	U8					mObscureMusic;
 	LLUUID				mMediaID;
 	U8                  mMediaURLFilterEnable;
 	LLSD                mMediaURLFilterList;
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 378147eadc..0d3f5b81bc 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -354,7 +354,18 @@ void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const
 //static
 void LLVertexBuffer::initClass(bool use_vbo, bool no_vbo_mapping)
 {
-	sEnableVBOs = use_vbo;
+	sEnableVBOs = use_vbo && gGLManager.mHasVertexBufferObject ;
+	if(sEnableVBOs)
+	{
+		//llassert_always(glBindBufferARB) ; //double check the extention for VBO is loaded.
+
+		llinfos << "VBO is enabled." << llendl ;
+	}
+	else
+	{
+		llinfos << "VBO is disabled." << llendl ;
+	}
+
 	sDisableVBOMapping = sEnableVBOs && no_vbo_mapping ;
 	LLGLNamePool::registerPool(&sDynamicVBOPool);
 	LLGLNamePool::registerPool(&sDynamicIBOPool);
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 701d1ff706..a4d1854bc8 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -320,7 +320,7 @@ void LLComboBox::setValue(const LLSD& value)
 		LLScrollListItem* item = mList->getFirstSelected();
 		if (item)
 		{
-			setLabel(getSelectedItemLabel());
+			updateLabel();
 		}
 		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
@@ -388,6 +388,23 @@ void LLComboBox::setLabel(const LLStringExplicit& name)
 	}
 }
 
+void LLComboBox::updateLabel()
+{
+	// Update the combo editor with the selected
+	// item label.
+	if (mTextEntry)
+	{
+		mTextEntry->setText(getSelectedItemLabel());
+		mTextEntry->setTentative(FALSE);
+	}
+
+	// If combo box doesn't allow text entry update
+	// the combo button label.
+	if (!mAllowTextEntry)
+	{
+		mButton->setLabel(getSelectedItemLabel());
+	}
+}
 
 BOOL LLComboBox::remove(const std::string& name)
 {
@@ -705,13 +722,13 @@ void LLComboBox::onItemSelected(const LLSD& data)
 	mLastSelectedIndex = getCurrentIndex();
 	if (mLastSelectedIndex != -1)
 	{
-		setLabel(getSelectedItemLabel());
+		updateLabel();
 
 		if (mAllowTextEntry)
-	{
-		gFocusMgr.setKeyboardFocus(mTextEntry);
-		mTextEntry->selectAll();
-	}
+		{
+			gFocusMgr.setKeyboardFocus(mTextEntry);
+			mTextEntry->selectAll();
+		}
 	}
 	// hiding the list reasserts the old value stored in the text editor/dropdown button
 	hideList();
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 59beba509c..64dbaea306 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -149,6 +149,9 @@ public:
 	// This is probably a UI abuse.
 	void			setLabel(const LLStringExplicit& name);
 
+	// Updates the combobox label to match the selected list item.
+	void			updateLabel();
+
 	BOOL			remove(const std::string& name);	// remove item "name", return TRUE if found and removed
 	
 	BOOL			setCurrentByIndex( S32 index );
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp
index f6f5a0beb3..5ed2c27160 100644
--- a/indra/llui/lldockcontrol.cpp
+++ b/indra/llui/lldockcontrol.cpp
@@ -160,8 +160,10 @@ bool LLDockControl::isDockVisible()
 			case TOP:
 			{
 				// check is dock inside parent rect
+				// assume that parent for all dockable flaoters
+				// is the root view
 				LLRect dockParentRect =
-						mDockWidget->getParent()->calcScreenRect();
+						mDockWidget->getRootView()->calcScreenRect();
 				if (dockRect.mRight <= dockParentRect.mLeft
 						|| dockRect.mLeft >= dockParentRect.mRight)
 				{
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 19ac4c58a8..9b6830a816 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -563,7 +563,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
 	}
 
 	// update resize bars with new limits
-	LLResizeBar* last_resize_bar = NULL;
+	LLLayoutPanel* last_resizeable_panel = NULL;
 	for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
 	{
 		LLPanel* panelp = (*panel_it);
@@ -585,17 +585,17 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
 		BOOL resize_bar_enabled = panelp->getVisible() && (*panel_it)->mUserResize;
 		(*panel_it)->mResizeBar->setVisible(resize_bar_enabled);
 
-		if (resize_bar_enabled)
+		if ((*panel_it)->mUserResize || (*panel_it)->mAutoResize)
 		{
-			last_resize_bar = (*panel_it)->mResizeBar;
+			last_resizeable_panel = (*panel_it);
 		}
 	}
 
 	// hide last resize bar as there is nothing past it
 	// resize bars need to be in between two resizable panels
-	if (last_resize_bar)
+	if (last_resizeable_panel)
 	{
-		last_resize_bar->setVisible(FALSE);
+		last_resizeable_panel->mResizeBar->setVisible(FALSE);
 	}
 
 	// not enough room to fit existing contents
diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h
index 451e81ae93..a34de1241d 100644
--- a/indra/llvfs/lldir_linux.h
+++ b/indra/llvfs/lldir_linux.h
@@ -1,6 +1,6 @@
 /** 
  * @file lldir_linux.h
- * @brief Definition of directory utilities class for linux 
+ * @brief Definition of directory utilities class for linux
  *
  * $LicenseInfo:firstyear=2000&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -24,6 +24,10 @@
  * $/LicenseInfo$
  */
 
+#if !LL_LINUX
+#error This header must not be included when compiling for any target other than Linux. Consider including lldir.h instead.
+#endif // !LL_LINUX
+
 #ifndef LL_LLDIR_LINUX_H
 #define LL_LLDIR_LINUX_H
 
@@ -40,7 +44,7 @@ public:
 
 	/*virtual*/ void initAppDirs(const std::string &app_name,
 		const std::string& app_read_only_data_dir);
-public:	
+
 	virtual std::string getCurPath();
 	virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask);
 	virtual BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname);
@@ -53,7 +57,7 @@ private:
 	DIR *mDirp;
 	int mCurrentDirIndex;
 	int mCurrentDirCount;
-	std::string mCurrentDir;	
+	std::string mCurrentDir;
 };
 
 #endif // LL_LLDIR_LINUX_H
diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h
index 4eac3c3ae6..b456d3afca 100644
--- a/indra/llvfs/lldir_mac.h
+++ b/indra/llvfs/lldir_mac.h
@@ -24,6 +24,10 @@
  * $/LicenseInfo$
  */
 
+#if !LL_DARWIN
+#error This header must not be included when compiling for any target other than Mac OS. Consider including lldir.h instead.
+#endif // !LL_DARWIN
+
 #ifndef LL_LLDIR_MAC_H
 #define LL_LLDIR_MAC_H
 
@@ -39,7 +43,7 @@ public:
 
 	/*virtual*/ void initAppDirs(const std::string &app_name,
 		const std::string& app_read_only_data_dir);
-public:	
+
 	virtual S32 deleteFilesInDir(const std::string &dirname, const std::string &mask);
 	virtual std::string getCurPath();
 	virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask);
diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h
index 4a1794f539..70fac6f818 100644
--- a/indra/llvfs/lldir_solaris.h
+++ b/indra/llvfs/lldir_solaris.h
@@ -24,6 +24,10 @@
  * $/LicenseInfo$
  */
 
+#if !LL_SOLARIS
+#error This header must not be included when compiling for any target other than Solaris. Consider including lldir.h instead.
+#endif // !LL_SOLARIS
+
 #ifndef LL_LLDIR_SOLARIS_H
 #define LL_LLDIR_SOLARIS_H
 
@@ -40,7 +44,7 @@ public:
 
 	/*virtual*/ void initAppDirs(const std::string &app_name,
 		const std::string& app_read_only_data_dir);
-public:	
+
 	virtual std::string getCurPath();
 	virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask);
 	virtual BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname);
@@ -50,7 +54,7 @@ private:
 	DIR *mDirp;
 	int mCurrentDirIndex;
 	int mCurrentDirCount;
-	std::string mCurrentDir;	
+	std::string mCurrentDir;
 };
 
 #endif // LL_LLDIR_SOLARIS_H
diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h
index 9a07150f0f..b170ebbcd7 100755
--- a/indra/llvfs/lldir_win32.h
+++ b/indra/llvfs/lldir_win32.h
@@ -24,6 +24,10 @@
  * $/LicenseInfo$
  */
 
+#if !LL_WINDOWS
+#error This header must not be included when compiling for any target other than Windows. Consider including lldir.h instead.
+#endif // !LL_WINDOWS
+
 #ifndef LL_LLDIR_WIN32_H
 #define LL_LLDIR_WIN32_H
 
@@ -48,7 +52,7 @@ public:
 
 private:
 	BOOL getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname);
-	
+
 	void* mDirSearch_h;
 	llutf16string mCurrentDir;
 };
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 35e4548483..d8ec4b605c 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -67,10 +67,11 @@ BOOL LLBottomtrayButton::handleHover(S32 x, S32 y, MASK mask)
 {
 	if (mCanDrag)
 	{
-	S32 screenX, screenY;
-	localPointToScreen(x, y, &screenX, &screenY);
-	// pass hover to bottomtray
-	LLBottomTray::getInstance()->onDraggableButtonHover(screenX, screenY);
+		// pass hover to bottomtray
+		S32 screenX, screenY;
+		localPointToScreen(x, y, &screenX, &screenY);
+		LLBottomTray::getInstance()->onDraggableButtonHover(screenX, screenY);
+
 		return TRUE;
 	}
 	else
@@ -200,6 +201,7 @@ LLBottomTray::LLBottomTray(const LLSD&)
 	mSpeakBtn(NULL),
 	mNearbyChatBar(NULL),
 	mChatBarContainer(NULL),
+	mNearbyCharResizeHandlePanel(NULL),
 	mToolbarStack(NULL),
 	mMovementButton(NULL),
 	mResizeState(RS_NORESIZE),
@@ -505,6 +507,23 @@ void LLBottomTray::showSnapshotButton(BOOL visible)
 	setTrayButtonVisibleIfPossible(RS_BUTTON_SNAPSHOT, visible);
 }
 
+void LLBottomTray::showSpeakButton(bool visible)
+{
+	// Show/hide the button
+	setTrayButtonVisible(RS_BUTTON_SPEAK, visible);
+
+	// and adjust other panels according to the occupied/freed space.
+	const S32 panel_width = mSpeakPanel->getRect().getWidth();
+	if (visible)
+	{
+		processWidthDecreased(-panel_width);
+	}
+	else
+	{
+		processWidthIncreased(panel_width);
+	}
+}
+
 void LLBottomTray::toggleMovementControls()
 {
 	if (mMovementButton)
@@ -533,6 +552,7 @@ BOOL LLBottomTray::postBuild()
 	LLHints::registerHintTarget("chat_bar", mNearbyChatBar->LLView::getHandle());
 
 	mChatBarContainer = getChild<LLLayoutPanel>("chat_bar_layout_panel");
+	mNearbyCharResizeHandlePanel = getChild<LLPanel>("chat_bar_resize_handle_panel");
 
 	mToolbarStack = getChild<LLLayoutStack>("toolbar_stack");
 	mMovementButton = getChild<LLButton>("movement_btn");
@@ -651,12 +671,20 @@ void LLBottomTray::onDraggableButtonHover(S32 x, S32 y)
 			gViewerWindow->getWindow()->setCursor(UI_CURSOR_NO);
 		}
 	}
+	else
+	{
+		// Reset cursor in case you move your mouse from the drag handle to a button.
+		getWindow()->setCursor(UI_CURSOR_ARROW);
+
+	}
 }
 
 bool LLBottomTray::isCursorOverDraggableArea(S32 x, S32 y)
 {
+	// Draggable area lasts from the nearby chat input resize handle
+	// to the chiclet area (exlusively).
 	bool result = getRect().pointInRect(x, y);
-	result = result && mNearbyChatBar->calcScreenRect().mRight < x;
+	result = result && mNearbyCharResizeHandlePanel->calcScreenRect().mRight < x;
 	result = result && mChicletPanel->calcScreenRect().mRight > x;
 	return result;
 }
@@ -667,10 +695,7 @@ void LLBottomTray::updateButtonsOrdersAfterDnD()
 	// (and according to future possible changes in the way button order is saved between sessions).
 	state_object_map_t::const_iterator it = mStateProcessedObjectMap.begin();
 	state_object_map_t::const_iterator it_end = mStateProcessedObjectMap.end();
-	// Speak button is currently the only draggable button not in mStateProcessedObjectMap,
-	// so if dragged_state is not found in that map, it should be RS_BUTTON_SPEAK. Change this code if any other
-	// exclusions from mStateProcessedObjectMap will become draggable.
-	EResizeState dragged_state = RS_BUTTON_SPEAK;
+	EResizeState dragged_state = RS_NORESIZE;
 	EResizeState landing_state = RS_NORESIZE;
 	bool landing_state_found = false;
 	// Find states for dragged item and landing tab
@@ -686,7 +711,17 @@ void LLBottomTray::updateButtonsOrdersAfterDnD()
 			landing_state_found = true;
 		}
 	}
-	
+
+	if (dragged_state == RS_NORESIZE)
+	{
+		llwarns << "Cannot determine what button is being dragged" << llendl;
+		llassert(dragged_state != RS_NORESIZE);
+		return;
+	}
+
+	lldebugs << "Will place " << resizeStateToString(dragged_state)
+		<< " before " << resizeStateToString(landing_state) << llendl;
+
 	// Update order of buttons according to drag'n'drop
 	mButtonsOrder.erase(std::find(mButtonsOrder.begin(), mButtonsOrder.end(), dragged_state));
 	if (!landing_state_found && mLandingTab == getChild<LLPanel>(PANEL_CHICLET_NAME))
@@ -695,9 +730,10 @@ void LLBottomTray::updateButtonsOrdersAfterDnD()
 	}
 	else
 	{
-		if (!landing_state_found) landing_state = RS_BUTTON_SPEAK;
+		if (!landing_state_found) landing_state = RS_BUTTON_SPEAK; // just a random fallback
 		mButtonsOrder.insert(std::find(mButtonsOrder.begin(), mButtonsOrder.end(), landing_state), dragged_state);
 	}
+
 	// Synchronize button process order with their order
 	resize_state_vec_t::const_iterator it1 = mButtonsOrder.begin();
 	const resize_state_vec_t::const_iterator it_end1 = mButtonsOrder.end();
@@ -774,11 +810,12 @@ void LLBottomTray::loadButtonsOrder()
 	// placing panels in layout stack according to button order which we loaded in previous for
 	for (resize_state_vec_t::const_reverse_iterator it = mButtonsOrder.rbegin(); it != it_end; ++it, ++i)
 	{
-		LLPanel* panel_to_move = *it == RS_BUTTON_SPEAK ? mSpeakPanel : mStateProcessedObjectMap[*it];
+		LLPanel* panel_to_move = getButtonPanel(*it);
 		mToolbarStack->movePanel(panel_to_move, NULL, true); // prepend 		
 	}
 	// Nearbychat is not stored in order settings file, but it must be the first of the panels, so moving it
-	// manually here
+	// (along with its drag handle) manually here.
+	mToolbarStack->movePanel(getChild<LLLayoutPanel>("chat_bar_resize_handle_panel"), NULL, true);
 	mToolbarStack->movePanel(mChatBarContainer, NULL, true);
 }
 
@@ -1178,9 +1215,8 @@ void LLBottomTray::processShowButtons(S32& available_width)
 bool LLBottomTray::processShowButton(EResizeState shown_object_type, S32& available_width)
 {
 	lldebugs << "Trying to show object type: " << shown_object_type << llendl;
-	llassert(mStateProcessedObjectMap[shown_object_type] != NULL);
 
-	LLPanel* panel = mStateProcessedObjectMap[shown_object_type];
+	LLPanel* panel = getButtonPanel(shown_object_type);
 	if (NULL == panel)
 	{
 		lldebugs << "There is no object to process for state: " << shown_object_type << llendl;
@@ -1226,9 +1262,7 @@ void LLBottomTray::processHideButtons(S32& required_width, S32& buttons_freed_wi
 void LLBottomTray::processHideButton(EResizeState processed_object_type, S32& required_width, S32& buttons_freed_width)
 {
 	lldebugs << "Trying to hide object type: " << processed_object_type << llendl;
-	llassert(mStateProcessedObjectMap[processed_object_type] != NULL);
-
-	LLPanel* panel = mStateProcessedObjectMap[processed_object_type];
+	LLPanel* panel = getButtonPanel(processed_object_type);
 	if (NULL == panel)
 	{
 		lldebugs << "There is no object to process for state: " << processed_object_type << llendl;
@@ -1273,7 +1307,6 @@ void LLBottomTray::processShrinkButtons(S32& required_width, S32& buttons_freed_
 	// then shrink Speak button
 	if (required_width < 0)
 	{
-
 		S32 panel_min_width = 0;
 		std::string panel_name = mSpeakPanel->getName();
 		bool success = mToolbarStack->getPanelMinSize(panel_name, &panel_min_width);
@@ -1309,8 +1342,7 @@ void LLBottomTray::processShrinkButtons(S32& required_width, S32& buttons_freed_
 
 void LLBottomTray::processShrinkButton(EResizeState processed_object_type, S32& required_width)
 {
-	llassert(mStateProcessedObjectMap[processed_object_type] != NULL);
-	LLPanel* panel = mStateProcessedObjectMap[processed_object_type];
+	LLPanel* panel = getButtonPanel(processed_object_type);
 	if (NULL == panel)
 	{
 		lldebugs << "There is no object to process for type: " << processed_object_type << llendl;
@@ -1411,8 +1443,7 @@ void LLBottomTray::processExtendButtons(S32& available_width)
 
 void LLBottomTray::processExtendButton(EResizeState processed_object_type, S32& available_width)
 {
-	llassert(mStateProcessedObjectMap[processed_object_type] != NULL);
-	LLPanel* panel = mStateProcessedObjectMap[processed_object_type];
+	LLPanel* panel = getButtonPanel(processed_object_type);
 	if (NULL == panel)
 	{
 		lldebugs << "There is no object to process for type: " << processed_object_type << llendl;
@@ -1480,6 +1511,7 @@ bool LLBottomTray::canButtonBeShown(EResizeState processed_object_type) const
 void LLBottomTray::initResizeStateContainers()
 {
 	// init map with objects should be processed for each type
+	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_SPEAK, getChild<LLPanel>("speak_panel")));
 	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_GESTURES, getChild<LLPanel>("gesture_panel")));
 	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_MOVEMENT, getChild<LLPanel>("movement_panel")));
 	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_CAMERA, getChild<LLPanel>("cam_panel")));
@@ -1512,22 +1544,22 @@ void LLBottomTray::initResizeStateContainers()
 	{
 		const EResizeState button_type = *it;
 		// is there an appropriate object?
-		llassert(mStateProcessedObjectMap.count(button_type) > 0);
-		if (0 == mStateProcessedObjectMap.count(button_type)) continue;
+		LLPanel* button_panel = getButtonPanel(button_type);
+		if (!button_panel) continue;
 
 		// set default width for it.
-		mObjectDefaultWidthMap[button_type] = mStateProcessedObjectMap[button_type]->getRect().getWidth();
+		mObjectDefaultWidthMap[button_type] = button_panel->getRect().getWidth();
 	}
 
 	// ... and add Speak button because it also can be shrunk.
 	mObjectDefaultWidthMap[RS_BUTTON_SPEAK]	   = mSpeakPanel->getRect().getWidth();
-
 }
 
 // this method must be called before restoring of the chat entry field on startup
 // because it resets chatbar's width according to resize logic.
 void LLBottomTray::initButtonsVisibility()
 {
+	setVisibleAndFitWidths(RS_BUTTON_SPEAK, gSavedSettings.getBOOL("EnableVoiceChat"));
 	setVisibleAndFitWidths(RS_BUTTON_GESTURES, gSavedSettings.getBOOL("ShowGestureButton"));
 	setVisibleAndFitWidths(RS_BUTTON_MOVEMENT, gSavedSettings.getBOOL("ShowMoveButton"));
 	setVisibleAndFitWidths(RS_BUTTON_CAMERA, gSavedSettings.getBOOL("ShowCameraButton"));
@@ -1540,6 +1572,7 @@ void LLBottomTray::initButtonsVisibility()
 
 void LLBottomTray::setButtonsControlsAndListeners()
 {
+	gSavedSettings.getControl("EnableVoiceChat")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_SPEAK, _2));
 	gSavedSettings.getControl("ShowGestureButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_GESTURES, _2));
 	gSavedSettings.getControl("ShowMoveButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_MOVEMENT, _2));
 	gSavedSettings.getControl("ShowCameraButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_CAMERA, _2));
@@ -1568,8 +1601,7 @@ bool LLBottomTray::toggleShowButton(LLBottomTray::EResizeState button_type, cons
 
 void LLBottomTray::setTrayButtonVisible(EResizeState shown_object_type, bool visible)
 {
-	llassert(mStateProcessedObjectMap[shown_object_type] != NULL);
-	LLPanel* panel = mStateProcessedObjectMap[shown_object_type];
+	LLPanel* panel = getButtonPanel(shown_object_type);
 	if (NULL == panel)
 	{
 		lldebugs << "There is no object to show for state: " << shown_object_type << llendl;
@@ -1592,7 +1624,15 @@ void LLBottomTray::setTrayButtonVisibleIfPossible(EResizeState shown_object_type
 
 bool LLBottomTray::setVisibleAndFitWidths(EResizeState object_type, bool visible)
 {
-	LLPanel* cur_panel = mStateProcessedObjectMap[object_type];
+	// The Speak button is treated specially: if voice is enabled,
+	// the button should be displayed no matter how much space we've got.
+	if (object_type == RS_BUTTON_SPEAK)
+	{
+		showSpeakButton(visible);
+		return true;
+	}
+
+	LLPanel* cur_panel = getButtonPanel(object_type);
 	if (NULL == cur_panel)
 	{
 		lldebugs << "There is no object to process for state: " << object_type << llendl;
@@ -1637,7 +1677,7 @@ bool LLBottomTray::setVisibleAndFitWidths(EResizeState object_type, bool visible
 
 			for (; it != it_end; ++it)
 			{
-				LLPanel * cur_panel = mStateProcessedObjectMap[*it];
+				LLPanel* cur_panel = getButtonPanel(*it);
 				sum_of_min_widths += get_panel_min_width(mToolbarStack, cur_panel);
 				sum_of_curr_widths += get_curr_width(cur_panel);
 			}
@@ -1695,6 +1735,19 @@ bool LLBottomTray::setVisibleAndFitWidths(EResizeState object_type, bool visible
 	return is_set;
 }
 
+LLPanel* LLBottomTray::getButtonPanel(EResizeState button_type)
+{
+	// Don't use the operator[] because it inserts a NULL value if the key is not found.
+	if (mStateProcessedObjectMap.count(button_type) == 0)
+	{
+		llwarns << "Cannot find a panel for " << resizeStateToString(button_type) << llendl;
+		llassert(mStateProcessedObjectMap.count(button_type) == 1);
+		return NULL;
+	}
+
+	return mStateProcessedObjectMap[button_type];
+}
+
 void LLBottomTray::showWellButton(EResizeState object_type, bool visible)
 {
 	llassert( ((RS_NOTIFICATION_WELL | RS_IM_WELL) & object_type) == object_type );
@@ -1752,4 +1805,29 @@ void LLBottomTray::processChatbarCustomization(S32 new_width)
 	}
 }
 
+// static
+std::string LLBottomTray::resizeStateToString(EResizeState state)
+{
+	switch (state)
+	{
+	case RS_NORESIZE:				return "RS_NORESIZE";
+	case RS_CHICLET_PANEL:			return "RS_CHICLET_PANEL";
+	case RS_CHATBAR_INPUT:			return "RS_CHATBAR_INPUT";
+	case RS_BUTTON_SNAPSHOT:		return "RS_BUTTON_SNAPSHOT";
+	case RS_BUTTON_CAMERA:			return "RS_BUTTON_CAMERA";
+	case RS_BUTTON_MOVEMENT:		return "RS_BUTTON_MOVEMENT";
+	case RS_BUTTON_GESTURES:		return "RS_BUTTON_GESTURES";
+	case RS_BUTTON_SPEAK:			return "RS_BUTTON_SPEAK";
+	case RS_IM_WELL:				return "RS_IM_WELL";
+	case RS_NOTIFICATION_WELL:		return "RS_NOTIFICATION_WELL";
+	case RS_BUTTON_BUILD:			return "RS_BUTTON_BUILD";
+	case RS_BUTTON_SEARCH:			return "RS_BUTTON_SEARCH";
+	case RS_BUTTON_WORLD_MAP:		return "RS_BUTTON_WORLD_MAP";
+	case RS_BUTTON_MINI_MAP:		return "RS_BUTTON_MINI_MAP";
+	case RS_BUTTONS_CAN_BE_HIDDEN:	return "RS_BUTTONS_CAN_BE_HIDDEN";
+	// No default to track additions.
+	}
+	return "UNKNOWN_BUTTON";
+}
+
 //EOF
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index dc98170049..04e5f5e9e0 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -116,6 +116,7 @@ public:
 	void showMoveButton(BOOL visible);
 	void showCameraButton(BOOL visible);
 	void showSnapshotButton(BOOL visible);
+	void showSpeakButton(bool visible);
 
 	void toggleMovementControls();
 	void toggleCameraControls();
@@ -391,6 +392,13 @@ private:
 	bool setVisibleAndFitWidths(EResizeState object_type, bool visible);
 
 	/**
+	 * Get panel containing the given button.
+	 *
+	 * @see mStateProcessedObjectMap
+	 */
+	LLPanel* getButtonPanel(EResizeState button_type);
+
+	/**
 	 * Shows/hides panel with specified well button (IM or Notification)
 	 *
 	 * @param[in] object_type - type of well button to be processed.
@@ -409,12 +417,21 @@ private:
 	 */
 	void processChatbarCustomization(S32 new_width);
 
+	/// Get button name for debugging.
+	static std::string resizeStateToString(EResizeState state);
 
+	/// Buttons automatically hidden due to lack of space.
 	MASK mResizeState;
 
+	/**
+	 * Mapping of button types to the layout panels the buttons are wrapped in.
+	 *
+	 * Used by getButtonPanel().
+	 */
 	typedef std::map<EResizeState, LLPanel*> state_object_map_t;
 	state_object_map_t mStateProcessedObjectMap;
 
+	/// Default (maximum) widths of the layout panels.
 	typedef std::map<EResizeState, S32> state_object_width_map_t;
 	state_object_width_map_t mObjectDefaultWidthMap;
 
@@ -424,6 +441,7 @@ private:
 	 * Contains order in which child buttons should be processed in show/hide, extend/shrink methods.
 	 */
 	resize_state_vec_t mButtonsProcessOrder;
+
 	/**
 	 * Contains order in which child buttons are shown.
 	 * It traces order of all bottomtray buttons that may change place via drag'n'drop and should
@@ -451,6 +469,7 @@ protected:
 	LLSpeakButton* 		mSpeakBtn;
 	LLNearbyChatBar*	mNearbyChatBar;
 	LLLayoutPanel*		mChatBarContainer;
+	LLPanel*		mNearbyCharResizeHandlePanel;
 	LLLayoutStack*		mToolbarStack;
 	LLMenuGL*			mBottomTrayContextMenu;
 	LLButton*			mCamButton;
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index 252c7b51ae..c95b046707 100644
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -351,8 +351,8 @@ void LLFloaterAuction::doResetParcel()
 		body["media_height"] = (S32) 0;
 		body["auto_scale"] = (S32) 0;
 		body["media_loop"] = (S32) 0;
-		body["obscure_media"] = (S32) 0;
-		body["obscure_music"] = (S32) 0;
+		body["obscure_media"] = (S32) 0; // OBSOLETE - no longer used
+		body["obscure_music"] = (S32) 0; // OBSOLETE - no longer used
 		body["media_id"] = LLUUID::null;
 		body["group_id"] = MAINTENANCE_GROUP_ID;	// Use maintenance group
 		body["pass_price"] = (S32) 10;		// Defaults to $10
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index bef830a93e..257970aaaf 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -221,6 +221,8 @@ BOOL	LLFloaterTools::postBuild()
 	mRadioGroupEdit		= getChild<LLRadioGroup>("edit_radio_group");
 	mBtnGridOptions		= getChild<LLButton>("Options...");
 	mTitleMedia			= getChild<LLMediaCtrl>("title_media");
+	mBtnLink			= getChild<LLButton>("link_btn");
+	mBtnUnlink			= getChild<LLButton>("unlink_btn");
 	
 	mCheckSelectIndividual	= getChild<LLCheckBoxCtrl>("checkbox edit linked parts");	
 	getChild<LLUICtrl>("checkbox edit linked parts")->setValue((BOOL)gSavedSettings.getBOOL("EditLinkedParts"));
@@ -316,6 +318,9 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
 	mBtnRotateReset(NULL),
 	mBtnRotateRight(NULL),
 
+	mBtnLink(NULL),
+	mBtnUnlink(NULL),
+
 	mBtnDelete(NULL),
 	mBtnDuplicate(NULL),
 	mBtnDuplicateInPlace(NULL),
@@ -342,7 +347,7 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
 	mNeedMediaTitle(TRUE)
 {
 	gFloaterTools = this;
-	
+
 	setAutoFocus(FALSE);
 	mFactoryMap["General"] = LLCallbackMap(createPanelPermissions, this);//LLPanelPermissions
 	mFactoryMap["Object"] = LLCallbackMap(createPanelObject, this);//LLPanelObject
@@ -367,6 +372,9 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
 	mCommitCallbackRegistrar.add("BuildTool.DeleteMedia",		boost::bind(&LLFloaterTools::onClickBtnDeleteMedia,this));
 	mCommitCallbackRegistrar.add("BuildTool.EditMedia",			boost::bind(&LLFloaterTools::onClickBtnEditMedia,this));
 
+	mCommitCallbackRegistrar.add("BuildTool.LinkObjects",		boost::bind(&LLSelectMgr::linkObjects, LLSelectMgr::getInstance()));
+	mCommitCallbackRegistrar.add("BuildTool.UnlinkObjects",		boost::bind(&LLSelectMgr::unlinkObjects, LLSelectMgr::getInstance()));
+
 }
 
 LLFloaterTools::~LLFloaterTools()
@@ -623,6 +631,12 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 	bool linked_parts = gSavedSettings.getBOOL("EditLinkedParts");
 	getChildView("RenderingCost")->setVisible( !linked_parts && (edit_visible || focus_visible || move_visible) && sShowObjectCost);
 
+	mBtnLink->setVisible(edit_visible);
+	mBtnUnlink->setVisible(edit_visible);
+
+	mBtnLink->setEnabled(LLSelectMgr::instance().enableLinkObjects());
+	mBtnUnlink->setEnabled(LLSelectMgr::instance().enableUnlinkObjects());
+
 	if (mCheckSelectIndividual)
 	{
 		mCheckSelectIndividual->setVisible(edit_visible);
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index 87c3d2ab47..fd81a75397 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -135,6 +135,8 @@ public:
 	LLRadioGroup*	mRadioGroupEdit;
 
 	LLCheckBoxCtrl	*mCheckSelectIndividual;
+	LLButton*		mBtnLink;
+	LLButton*		mBtnUnlink;
 
 	LLCheckBoxCtrl*	mCheckSnapToGrid;
 	LLButton*		mBtnGridOptions;
diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp
index e9f1e3bc22..70e789f490 100644
--- a/indra/newview/llfriendcard.cpp
+++ b/indra/newview/llfriendcard.cpp
@@ -28,6 +28,7 @@
 
 #include "llfriendcard.h"
 
+#include "llagent.h"
 #include "llavatarnamecache.h"
 #include "llinventory.h"
 #include "llinventoryfunctions.h"
@@ -290,58 +291,6 @@ void LLFriendCardsManager::syncFriendCardsFolders()
 			boost::bind(&LLFriendCardsManager::ensureFriendsFolderExists, this));
 }
 
-void LLFriendCardsManager::collectFriendsLists(folderid_buddies_map_t& folderBuddiesMap) const
-{
-	folderBuddiesMap.clear();
-
-	static bool syncronize_friends_folders = true;
-	if (syncronize_friends_folders)
-	{
-		// Checks whether "Friends" and "Friends/All" folders exist in "Calling Cards" folder,
-		// fetches their contents if needed and synchronizes it with buddies list.
-		// If the folders are not found they are created.
-		LLFriendCardsManager::instance().syncFriendCardsFolders();
-		syncronize_friends_folders = false;
-	}
-
-
-	LLInventoryModel::cat_array_t* listFolders;
-	LLInventoryModel::item_array_t* items;
-
-	// get folders in the Friend folder. Items should be NULL due to Cards should be in lists.
-	gInventory.getDirectDescendentsOf(findFriendFolderUUIDImpl(), listFolders, items);
-
-	if (NULL == listFolders)
-		return;
-
-	LLInventoryModel::cat_array_t::const_iterator itCats;	// to iterate Friend Lists (categories)
-	LLInventoryModel::item_array_t::const_iterator itBuddy;	// to iterate Buddies in each List
-	LLInventoryModel::cat_array_t* fakeCatsArg;
-	for (itCats = listFolders->begin(); itCats != listFolders->end(); ++itCats)
-	{
-		if (items)
-			items->clear();
-
-		// *HACK: Only Friends/All content will be shown for now
-		// *TODO: Remove this hack, implement sorting if it will be needded by spec.
-		if ((*itCats)->getUUID() != findFriendAllSubfolderUUIDImpl())
-			continue;
-
-		gInventory.getDirectDescendentsOf((*itCats)->getUUID(), fakeCatsArg, items);
-
-		if (NULL == items)
-			continue;
-
-		uuid_vec_t buddyUUIDs;
-		for (itBuddy = items->begin(); itBuddy != items->end(); ++itBuddy)
-		{
-			buddyUUIDs.push_back((*itBuddy)->getCreatorUUID());
-		}
-
-		folderBuddiesMap.insert(make_pair((*itCats)->getUUID(), buddyUUIDs));
-	}
-}
-
 
 /************************************************************************/
 /*		Private Methods                                                 */
@@ -499,23 +448,43 @@ void LLFriendCardsManager::syncFriendsFolder()
 	LLAvatarTracker::buddy_map_t all_buddies;
 	LLAvatarTracker::instance().copyBuddyList(all_buddies);
 
-	// 1. Remove Friend Cards for non-friends
+	// 1. Check if own calling card exists
 	LLInventoryModel::cat_array_t cats;
 	LLInventoryModel::item_array_t items;
 
-	gInventory.collectDescendents(findFriendAllSubfolderUUIDImpl(), cats, items, LLInventoryModel::EXCLUDE_TRASH);
+	LLUUID friends_all_folder_id = findFriendAllSubfolderUUIDImpl();
+	gInventory.collectDescendents(friends_all_folder_id, cats, items, LLInventoryModel::EXCLUDE_TRASH);
 
+	bool own_callingcard_found = false;
 	LLInventoryModel::item_array_t::const_iterator it;
 	for (it = items.begin(); it != items.end(); ++it)
 	{
-		lldebugs << "Check if buddy is in list: " << (*it)->getName() << " " << (*it)->getCreatorUUID() << llendl;
-		if (NULL == get_ptr_in_map(all_buddies, (*it)->getCreatorUUID()))
+		if ((*it)->getCreatorUUID() == gAgentID)
 		{
-			lldebugs << "NONEXISTS, so remove it" << llendl;
-			removeFriendCardFromInventory((*it)->getCreatorUUID());
+			own_callingcard_found = true;
+			break;
 		}
 	}
 
+	// Create own calling card if it was not found in Friends/All folder
+	if (!own_callingcard_found)
+	{
+		LLAvatarName av_name;
+		LLAvatarNameCache::get( gAgentID, &av_name );
+
+		create_inventory_item(gAgentID,
+							  gAgent.getSessionID(),
+							  friends_all_folder_id,
+							  LLTransactionID::tnull,
+							  av_name.getCompleteName(),
+							  gAgentID.asString(),
+							  LLAssetType::AT_CALLINGCARD,
+							  LLInventoryType::IT_CALLINGCARD,
+							  NOT_WEARABLE,
+							  PERM_MOVE | PERM_TRANSFER,
+							  NULL);
+	}
+
 	// 2. Add missing Friend Cards for friends
 	LLAvatarTracker::buddy_map_t::const_iterator buddy_it = all_buddies.begin();
 	llinfos << "try to build friends, count: " << all_buddies.size() << llendl;
diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h
index b7f0bada14..48a9f70079 100644
--- a/indra/newview/llfriendcard.h
+++ b/indra/newview/llfriendcard.h
@@ -79,19 +79,6 @@ public:
 	 */
 	void syncFriendCardsFolders();
 
-	/*!
-	 * \brief
-	 * Collects folders' IDs with the buddies' IDs in the Inventory Calling Card/Friends folder.
-	 * 
-	 * \param folderBuddiesMap
-	 * map into collected data will be put. It will be cleared before adding new data.
-	 * 
-	 * Each item in the out map is a pair where first is an LLViewerInventoryCategory UUID,
-	 * second is a vector with UUID of Avatars from this folder.
-	 * 
-	 */
-	void collectFriendsLists(folderid_buddies_map_t& folderBuddiesMap) const;
-
 private:
 	typedef boost::function<void()> callback_t;
 
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 342d15cf0f..db3b968730 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -483,9 +483,6 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(const LLInventoryIte
 
 	switch(item->getType())
 	{
-		case LLAssetType::AT_CALLINGCARD:
-			return false;
-			break;
 		case LLAssetType::AT_OBJECT:
 		case LLAssetType::AT_BODYPART:
 		case LLAssetType::AT_CLOTHING:
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index af8fdb17cf..a7059eb519 100644
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -373,17 +373,19 @@ BOOL LLMuteList::remove(const LLMute& mute, U32 flags)
 		// Must be after erase.
 		setLoaded();  // why is this here? -MG
 	}
-
-	// Clean up any legacy mutes
-	string_set_t::iterator legacy_it = mLegacyMutes.find(mute.mName);
-	if (legacy_it != mLegacyMutes.end())
+	else
 	{
-		// Database representation of legacy mute is UUID null.
-		LLMute mute(LLUUID::null, *legacy_it, LLMute::BY_NAME);
-		updateRemove(mute);
-		mLegacyMutes.erase(legacy_it);
-		// Must be after erase.
-		setLoaded(); // why is this here? -MG
+		// Clean up any legacy mutes
+		string_set_t::iterator legacy_it = mLegacyMutes.find(mute.mName);
+		if (legacy_it != mLegacyMutes.end())
+		{
+			// Database representation of legacy mute is UUID null.
+			LLMute mute(LLUUID::null, *legacy_it, LLMute::BY_NAME);
+			updateRemove(mute);
+			mLegacyMutes.erase(legacy_it);
+			// Must be after erase.
+			setLoaded(); // why is this here? -MG
+		}
 	}
 	
 	return found;
@@ -607,7 +609,8 @@ BOOL LLMuteList::isMuted(const LLUUID& id, const std::string& name, U32 flags) c
 	}
 
 	// empty names can't be legacy-muted
-	if (name.empty()) return FALSE;
+	bool avatar = mute_object && mute_object->isAvatar();
+	if (name.empty() || avatar) return FALSE;
 
 	// Look in legacy pile
 	string_set_t::const_iterator legacy_it = mLegacyMutes.find(name);
diff --git a/indra/newview/llpanellandaudio.cpp b/indra/newview/llpanellandaudio.cpp
index 5a943bc61d..f9730d9b71 100644
--- a/indra/newview/llpanellandaudio.cpp
+++ b/indra/newview/llpanellandaudio.cpp
@@ -91,9 +91,6 @@ BOOL LLPanelLandAudio::postBuild()
 	mMusicURLEdit = getChild<LLLineEditor>("music_url");
 	childSetCommitCallback("music_url", onCommitAny, this);
 
-	mMusicUrlCheck = getChild<LLCheckBoxCtrl>("hide_music_url");
-	childSetCommitCallback("hide_music_url", onCommitAny, this);
-
 	return TRUE;
 }
 
@@ -117,9 +114,6 @@ void LLPanelLandAudio::refresh()
 		mCheckSoundLocal->set( parcel->getSoundLocal() );
 		mCheckSoundLocal->setEnabled( can_change_media );
 
-		mMusicUrlCheck->set( parcel->getObscureMusic() );
-		mMusicUrlCheck->setEnabled( can_change_media );
-
 		bool allow_voice = parcel->getParcelFlagAllowVoice();
 
 		LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
@@ -148,13 +142,6 @@ void LLPanelLandAudio::refresh()
 		mCheckParcelEnableVoice->set(allow_voice);
 		mCheckParcelVoiceLocal->set(!parcel->getParcelFlagUseEstateVoiceChannel());
 
-		// don't display urls if you're not able to change it
-		// much requested change in forums so people can't 'steal' urls
-		// NOTE: bug#2009 means this is still vunerable - however, bug
-		// should be closed since this bug opens up major security issues elsewhere.
-		bool obscure_music = ! can_change_media && parcel->getObscureMusic();
-		
-		mMusicURLEdit->setDrawAsterixes(obscure_music);
 		mMusicURLEdit->setText(parcel->getMusicURL());
 		mMusicURLEdit->setEnabled( can_change_media );
 	}
@@ -173,7 +160,6 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
 	// Extract data from UI
 	BOOL sound_local		= self->mCheckSoundLocal->get();
 	std::string music_url	= self->mMusicURLEdit->getText();
-	U8 obscure_music		= self->mMusicUrlCheck->get();
 
 	BOOL voice_enabled = self->mCheckParcelEnableVoice->get();
 	BOOL voice_estate_chan = !self->mCheckParcelVoiceLocal->get();
@@ -186,7 +172,6 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
 	parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);
 	parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);
 	parcel->setMusicURL(music_url);
-	parcel->setObscureMusic(obscure_music);
 
 	// Send current parcel data upstream to server
 	LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp
index f17defda55..b3adfac8a2 100644
--- a/indra/newview/llpanellandmedia.cpp
+++ b/indra/newview/llpanellandmedia.cpp
@@ -68,8 +68,7 @@ LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
 	mMediaSizeCtrlLabel(NULL),
 	mMediaTextureCtrl(NULL),
 	mMediaAutoScaleCheck(NULL),
-	mMediaLoopCheck(NULL),
-	mMediaUrlCheck(NULL)
+	mMediaLoopCheck(NULL)
 {
 }
 
@@ -94,9 +93,6 @@ BOOL LLPanelLandMedia::postBuild()
 	mMediaLoopCheck = getChild<LLCheckBoxCtrl>("media_loop");
 	childSetCommitCallback("media_loop", onCommitAny, this );
 
-	mMediaUrlCheck = getChild<LLCheckBoxCtrl>("hide_media_url");
-	childSetCommitCallback("hide_media_url", onCommitAny, this );
-
 	mMediaURLEdit = getChild<LLLineEditor>("media_url");
 	childSetCommitCallback("media_url", onCommitAny, this );
 
@@ -153,25 +149,6 @@ void LLPanelLandMedia::refresh()
 		mMediaTypeCombo->setEnabled( can_change_media );
 		getChild<LLUICtrl>("mime_type")->setValue(mime_type);
 
-		mMediaUrlCheck->set( parcel->getObscureMedia() );
-		mMediaUrlCheck->setEnabled( can_change_media );
-
-		// don't display urls if you're not able to change it
-		// much requested change in forums so people can't 'steal' urls
-		// NOTE: bug#2009 means this is still vunerable - however, bug
-		// should be closed since this bug opens up major security issues elsewhere.
-		bool obscure_media = ! can_change_media && parcel->getObscureMedia();
-
-		// Special code to disable asterixes for html type
-		if(mime_type == "text/html")
-		{
-			obscure_media = false;
-			mMediaUrlCheck->set( 0 );
-			mMediaUrlCheck->setEnabled( false );
-		}
-
-		mMediaURLEdit->setDrawAsterixes( obscure_media );
-
 		mMediaAutoScaleCheck->set( parcel->getMediaAutoScale () );
 		mMediaAutoScaleCheck->setEnabled ( can_change_media );
 
@@ -301,7 +278,6 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 	std::string mime_type	= self->getChild<LLUICtrl>("mime_type")->getValue().asString();
 	U8 media_auto_scale		= self->mMediaAutoScaleCheck->get();
 	U8 media_loop           = self->mMediaLoopCheck->get();
-	U8 obscure_media		= self->mMediaUrlCheck->get();
 	S32 media_width			= (S32)self->mMediaWidthCtrl->get();
 	S32 media_height		= (S32)self->mMediaHeightCtrl->get();
 	LLUUID media_id			= self->mMediaTextureCtrl->getImageAssetID();
@@ -321,7 +297,6 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 	parcel->setMediaID(media_id);
 	parcel->setMediaAutoScale ( media_auto_scale );
 	parcel->setMediaLoop ( media_loop );
-	parcel->setObscureMedia( obscure_media );
 
 	// Send current parcel data upstream to server
 	LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 8d3b1fd7a0..3b5830f8e0 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -81,6 +81,9 @@ const S32 MAX_PASSWORD = 16;
 LLPanelLogin *LLPanelLogin::sInstance = NULL;
 BOOL LLPanelLogin::sCapslockDidNotification = FALSE;
 
+// Helper for converting a user name into the canonical "Firstname Lastname" form.
+// For new accounts without a last name "Resident" is added as a last name.
+static std::string canonicalize_username(const std::string& name);
 
 class LLLoginRefreshHandler : public LLCommandHandler
 {
@@ -298,7 +301,14 @@ void LLPanelLogin::addFavoritesToStartLocation()
 	for (LLSD::map_const_iterator iter = fav_llsd.beginMap();
 		iter != fav_llsd.endMap(); ++iter)
 	{
-		if(iter->first != getChild<LLComboBox>("username_combo")->getSimple()) continue;
+		std::string user_defined_name = getChild<LLComboBox>("username_combo")->getSimple();
+
+		// The account name in stored_favorites.xml has Resident last name even if user has
+		// a single word account name, so it can be compared case-insensitive with the
+		// user defined "firstname lastname".
+		S32 res = LLStringUtil::compareInsensitive(canonicalize_username(user_defined_name), iter->first);
+		if (res != 0) continue;
+
 		combo->addSeparator();
 		LLSD user_llsd = iter->second;
 		for (LLSD::array_const_iterator iter1 = user_llsd.beginArray();
@@ -1156,3 +1166,28 @@ void LLPanelLogin::updateLoginPanelLinks()
 	sInstance->getChildView("create_new_account_text")->setVisible( system_grid);
 	sInstance->getChildView("forgot_password_text")->setVisible( system_grid);
 }
+
+std::string canonicalize_username(const std::string& name)
+{
+	std::string cname = name;
+	LLStringUtil::trim(cname);
+
+	// determine if the username is a first/last form or not.
+	size_t separator_index = cname.find_first_of(" ._");
+	std::string first = cname.substr(0, separator_index);
+	std::string last;
+	if (separator_index != cname.npos)
+	{
+		last = cname.substr(separator_index+1, cname.npos);
+		LLStringUtil::trim(last);
+	}
+	else
+	{
+		// ...on Linden grids, single username users as considered to have
+		// last name "Resident"
+		last = "Resident";
+	}
+
+	// Username in traditional "firstname lastname" form.
+	return first + ' ' + last;
+}
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index fc6bc09b82..2bbd15ae11 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -564,16 +564,14 @@ void LLPanelNearByMedia::refreshParcelItems()
 	if (NULL != mParcelMediaItem)
 	{
 		std::string name, url, tooltip;
-		if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMedia())
+		getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, "");
+		if (name.empty() || name == url)
 		{
-			getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, "");
-			if (name.empty() || name == url)
-			{
-				tooltip = url;
-			}
-			else {
-				tooltip = name + " : " + url;
-			}
+			tooltip = url;
+		}
+		else
+		{
+			tooltip = name + " : " + url;
 		}
 		LLViewerMediaImpl *impl = LLViewerParcelMedia::getParcelMedia();
 		updateListItem(mParcelMediaItem,
@@ -611,10 +609,8 @@ void LLPanelNearByMedia::refreshParcelItems()
 		bool is_playing = LLViewerMedia::isParcelAudioPlaying();
 	
 		std::string url;
-		if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMusic())
-		{
-			url = LLViewerMedia::getParcelAudioURL();
-		}
+        url = LLViewerMedia::getParcelAudioURL();
+
 		updateListItem(mParcelAudioItem,
 					   mParcelAudioName,
 					   url,
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index b07a46a222..b52f33ec3b 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -384,6 +384,16 @@ private:
 		{
 			lldebugs << "Inventory changed: " << mask << llendl;
 
+			static bool synchronize_friends_folders = true;
+			if (synchronize_friends_folders)
+			{
+				// Checks whether "Friends" and "Friends/All" folders exist in "Calling Cards" folder,
+				// fetches their contents if needed and synchronizes it with buddies list.
+				// If the folders are not found they are created.
+				LLFriendCardsManager::instance().syncFriendCardsFolders();
+				synchronize_friends_folders = false;
+			}
+
 			// *NOTE: deleting of InventoryItem is performed via moving to Trash. 
 			// That means LLInventoryObserver::STRUCTURE is present in MASK instead of LLInventoryObserver::REMOVE
 			if ((CALLINGCARD_ADDED & mask) == CALLINGCARD_ADDED)
@@ -750,18 +760,23 @@ void LLPanelPeople::updateFriendList()
 	all_friendsp.clear();
 	online_friendsp.clear();
 
-	LLFriendCardsManager::folderid_buddies_map_t listMap;
+	uuid_vec_t buddies_uuids;
+	LLAvatarTracker::buddy_map_t::const_iterator buddies_iter;
+
+	// Fill the avatar list with friends UUIDs
+	for (buddies_iter = all_buddies.begin(); buddies_iter != all_buddies.end(); ++buddies_iter)
+	{
+		buddies_uuids.push_back(buddies_iter->first);
+	}
 
-	// *NOTE: For now collectFriendsLists returns data only for Friends/All folder. EXT-694.
-	LLFriendCardsManager::instance().collectFriendsLists(listMap);
-	if (listMap.size() > 0)
+	if (buddies_uuids.size() > 0)
 	{
-		lldebugs << "Friends Cards were found, count: " << listMap.begin()->second.size() << llendl;
-		all_friendsp = listMap.begin()->second;
+		lldebugs << "Friends added to the list: " << buddies_uuids.size() << llendl;
+		all_friendsp = buddies_uuids;
 	}
 	else
 	{
-		lldebugs << "Friends Cards were not found" << llendl;
+		lldebugs << "No friends found" << llendl;
 	}
 
 	LLAvatarTracker::buddy_map_t::const_iterator buddy_it = all_buddies.begin();
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index e57e38d141..21a457c125 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -66,6 +66,7 @@
 #include "llmenugl.h"
 #include "llmeshrepository.h"
 #include "llmutelist.h"
+#include "llnotificationsutil.h"
 #include "llsidepaneltaskinfo.h"
 #include "llslurl.h"
 #include "llstatusbar.h"
@@ -562,6 +563,103 @@ BOOL LLSelectMgr::removeObjectFromSelections(const LLUUID &id)
 	return object_found;
 }
 
+bool LLSelectMgr::linkObjects()
+{
+	if (!LLSelectMgr::getInstance()->selectGetAllRootsValid())
+	{
+		LLNotificationsUtil::add("UnableToLinkWhileDownloading");
+		return true;
+	}
+
+	S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
+	if (object_count > MAX_CHILDREN_PER_TASK + 1)
+	{
+		LLSD args;
+		args["COUNT"] = llformat("%d", object_count);
+		int max = MAX_CHILDREN_PER_TASK+1;
+		args["MAX"] = llformat("%d", max);
+		LLNotificationsUtil::add("UnableToLinkObjects", args);
+		return true;
+	}
+
+	if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2)
+	{
+		LLNotificationsUtil::add("CannotLinkIncompleteSet");
+		return true;
+	}
+
+	if (!LLSelectMgr::getInstance()->selectGetRootsModify())
+	{
+		LLNotificationsUtil::add("CannotLinkModify");
+		return true;
+	}
+
+	LLUUID owner_id;
+	std::string owner_name;
+	if (!LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name))
+	{
+		// we don't actually care if you're the owner, but novices are
+		// the most likely to be stumped by this one, so offer the
+		// easiest and most likely solution.
+		LLNotificationsUtil::add("CannotLinkDifferentOwners");
+		return true;
+	}
+
+	LLSelectMgr::getInstance()->sendLink();
+
+	return true;
+}
+
+bool LLSelectMgr::unlinkObjects()
+{
+	LLSelectMgr::getInstance()->sendDelink();
+	return true;
+}
+
+// in order to link, all objects must have the same owner, and the
+// agent must have the ability to modify all of the objects. However,
+// we're not answering that question with this method. The question
+// we're answering is: does the user have a reasonable expectation
+// that a link operation should work? If so, return true, false
+// otherwise. this allows the handle_link method to more finely check
+// the selection and give an error message when the uer has a
+// reasonable expectation for the link to work, but it will fail.
+bool LLSelectMgr::enableLinkObjects()
+{
+	bool new_value = false;
+	// check if there are at least 2 objects selected, and that the
+	// user can modify at least one of the selected objects.
+
+	// in component mode, can't link
+	if (!gSavedSettings.getBOOL("EditLinkedParts"))
+	{
+		if(LLSelectMgr::getInstance()->selectGetAllRootsValid() && LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() >= 2)
+		{
+			struct f : public LLSelectedObjectFunctor
+			{
+				virtual bool apply(LLViewerObject* object)
+				{
+					return object->permModify();
+				}
+			} func;
+			const bool firstonly = true;
+			new_value = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
+		}
+	}
+	return new_value;
+}
+
+bool LLSelectMgr::enableUnlinkObjects()
+{
+	LLViewerObject* first_editable_object = LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject();
+
+	bool new_value = LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
+		first_editable_object &&
+		!first_editable_object->isAttachment();
+
+	return new_value;
+}
+
 void LLSelectMgr::deselectObjectAndFamily(LLViewerObject* object, BOOL send_to_sim, BOOL include_entire_object)
 {
 	// bail if nothing selected or if object wasn't selected in the first place
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 1b354f983a..031898d7c5 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -449,6 +449,17 @@ public:
 	BOOL removeObjectFromSelections(const LLUUID &id);
 
 	////////////////////////////////////////////////////////////////
+	// Selection editing
+	////////////////////////////////////////////////////////////////
+	bool linkObjects();
+
+	bool unlinkObjects();
+
+	bool enableLinkObjects();
+
+	bool enableUnlinkObjects();
+
+	////////////////////////////////////////////////////////////////
 	// Selection accessors
 	////////////////////////////////////////////////////////////////
 	LLObjectSelectionHandle	getSelection() { return mSelectedObjects; }
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 99c7d4b8c9..3323828d4f 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2852,7 +2852,7 @@ class LLObjectMute : public view_listener_t
 		}
 		
 		LLMute mute(id, name, type);
-		if (LLMuteList::getInstance()->isMuted(mute.mID, mute.mName))
+		if (LLMuteList::getInstance()->isMuted(mute.mID))
 		{
 			LLMuteList::getInstance()->remove(mute);
 		}
@@ -4798,110 +4798,6 @@ class LLToolsSelectNextPart : public view_listener_t
 	}
 };
 
-// in order to link, all objects must have the same owner, and the
-// agent must have the ability to modify all of the objects. However,
-// we're not answering that question with this method. The question
-// we're answering is: does the user have a reasonable expectation
-// that a link operation should work? If so, return true, false
-// otherwise. this allows the handle_link method to more finely check
-// the selection and give an error message when the uer has a
-// reasonable expectation for the link to work, but it will fail.
-class LLToolsEnableLink : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		bool new_value = false;
-		// check if there are at least 2 objects selected, and that the
-		// user can modify at least one of the selected objects.
-
-		// in component mode, can't link
-		if (!gSavedSettings.getBOOL("EditLinkedParts"))
-		{
-			if(LLSelectMgr::getInstance()->selectGetAllRootsValid() && LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() >= 2)
-			{
-				struct f : public LLSelectedObjectFunctor
-				{
-					virtual bool apply(LLViewerObject* object)
-					{
-						return object->permModify();
-					}
-				} func;
-				const bool firstonly = true;
-				new_value = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
-			}
-		}
-		return new_value;
-	}
-};
-
-class LLToolsLink : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
-		{
-			LLNotificationsUtil::add("UnableToLinkWhileDownloading");
-			return true;
-		}
-
-		S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
-		if (object_count > MAX_CHILDREN_PER_TASK + 1)
-		{
-			LLSD args;
-			args["COUNT"] = llformat("%d", object_count);
-			int max = MAX_CHILDREN_PER_TASK+1;
-			args["MAX"] = llformat("%d", max);
-			LLNotificationsUtil::add("UnableToLinkObjects", args);
-			return true;
-		}
-
-		if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2)
-		{
-			LLNotificationsUtil::add("CannotLinkIncompleteSet");
-			return true;
-		}
-		if(!LLSelectMgr::getInstance()->selectGetRootsModify())
-		{
-			LLNotificationsUtil::add("CannotLinkModify");
-			return true;
-		}
-		LLUUID owner_id;
-		std::string owner_name;
-		if(!LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name))
-		{
-			// we don't actually care if you're the owner, but novices are
-			// the most likely to be stumped by this one, so offer the
-			// easiest and most likely solution.
-			LLNotificationsUtil::add("CannotLinkDifferentOwners");
-			return true;
-		}
-		LLSelectMgr::getInstance()->sendLink();
-		return true;
-	}
-};
-
-class LLToolsEnableUnlink : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		LLViewerObject* first_editable_object = LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject();
-		bool new_value = LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
-			first_editable_object &&
-			!first_editable_object->isAttachment();
-		return new_value;
-	}
-};
-
-class LLToolsUnlink : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		LLSelectMgr::getInstance()->sendDelink();
-		return true;
-	}
-};
-
-
 class LLToolsStopAllAnimations : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -7919,8 +7815,8 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLToolsSnapObjectXY(), "Tools.SnapObjectXY");
 	view_listener_t::addMenu(new LLToolsUseSelectionForGrid(), "Tools.UseSelectionForGrid");
 	view_listener_t::addMenu(new LLToolsSelectNextPart(), "Tools.SelectNextPart");
-	view_listener_t::addMenu(new LLToolsLink(), "Tools.Link");
-	view_listener_t::addMenu(new LLToolsUnlink(), "Tools.Unlink");
+	commit.add("Tools.Link", boost::bind(&LLSelectMgr::linkObjects, LLSelectMgr::getInstance()));
+	commit.add("Tools.Unlink", boost::bind(&LLSelectMgr::unlinkObjects, LLSelectMgr::getInstance()));
 	view_listener_t::addMenu(new LLToolsStopAllAnimations(), "Tools.StopAllAnimations");
 	view_listener_t::addMenu(new LLToolsReleaseKeys(), "Tools.ReleaseKeys");
 	view_listener_t::addMenu(new LLToolsEnableReleaseKeys(), "Tools.EnableReleaseKeys");	
@@ -7933,8 +7829,8 @@ void initialize_menus()
 
 	view_listener_t::addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
 	view_listener_t::addMenu(new LLToolsEnableSelectNextPart(), "Tools.EnableSelectNextPart");
-	view_listener_t::addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
-	view_listener_t::addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink");
+	enable.add("Tools.EnableLink", boost::bind(&LLSelectMgr::enableLinkObjects, LLSelectMgr::getInstance()));
+	enable.add("Tools.EnableUnlink", boost::bind(&LLSelectMgr::enableUnlinkObjects, LLSelectMgr::getInstance()));
 	view_listener_t::addMenu(new LLToolsEnableBuyOrTake(), "Tools.EnableBuyOrTake");
 	enable.add("Tools.EnableTakeCopy", boost::bind(&enable_object_take_copy));
 	enable.add("Tools.VisibleBuyObject", boost::bind(&tools_visible_buy_object));
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f3cbb8cce3..d0de742283 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3761,8 +3761,19 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 	}
 	else
 	{
-		// This is likely just the initial logging in phase.
+		// This is initial log-in or a region crossing
 		gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
+
+		if(LLStartUp::getStartupState() < STATE_STARTED)
+		{	// This is initial log-in, not a region crossing:
+			// Set the camera looking ahead of the AV so send_agent_update() below 
+			// will report the correct location to the server.
+			LLVector3 look_at_point = look_at;
+			look_at_point = agent_pos + look_at_point.rotVec(gAgent.getQuat());
+
+			static LLVector3 up_direction(0.0f, 0.0f, 1.0f);
+			LLViewerCamera::getInstance()->lookAt(agent_pos, look_at_point, up_direction);
+		}
 	}
 
 	if ( LLTracker::isTracking(NULL) )
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 4f71f8ea87..1aa9987fd9 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1184,13 +1184,14 @@ void LLViewerObjectList::clearDebugText()
 void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
 {
 	LLMemType mt(LLMemType::MTYPE_OBJECT);
-	if (mDeadObjects.count(objectp->mID))
+	if (mDeadObjects.find(objectp->mID) != mDeadObjects.end())
 	{
-		llinfos << "Object " << objectp->mID << " already on dead list, ignoring cleanup!" << llendl;	
-		return;
+		llinfos << "Object " << objectp->mID << " already on dead list!" << llendl;	
+	}
+	else
+	{
+		mDeadObjects.insert(objectp->mID);
 	}
-
-	mDeadObjects.insert(std::pair<LLUUID, LLPointer<LLViewerObject> >(objectp->mID, objectp));
 
 	// Cleanup any references we have to this object
 	// Remove from object map so noone can look it up.
@@ -1506,6 +1507,45 @@ bool LLViewerObjectList::hasMapObjectInRegion(LLViewerRegion* regionp)
 	return false ;
 }
 
+//make sure the region is cleaned up.
+void LLViewerObjectList::clearAllMapObjectsInRegion(LLViewerRegion* regionp) 
+{
+	std::set<LLViewerObject*> dead_object_list ;
+	std::set<LLViewerObject*> region_object_list ;
+	for (vobj_list_t::iterator iter = mMapObjects.begin(); iter != mMapObjects.end(); ++iter)
+	{
+		LLViewerObject* objectp = *iter;
+
+		if(objectp->isDead())
+		{
+			dead_object_list.insert(objectp) ;			
+		}
+		else if(objectp->getRegion() == regionp)
+		{
+			region_object_list.insert(objectp) ;
+		}
+	}
+
+	if(dead_object_list.size() > 0)
+	{
+		llwarns << "There are " << dead_object_list.size() << " dead objects on the map!" << llendl ;
+
+		for(std::set<LLViewerObject*>::iterator iter = dead_object_list.begin(); iter != dead_object_list.end(); ++iter)
+		{
+			cleanupReferences(*iter) ;
+		}
+	}
+	if(region_object_list.size() > 0)
+	{
+		llwarns << "There are " << region_object_list.size() << " objects not removed from the deleted region!" << llendl ;
+
+		for(std::set<LLViewerObject*>::iterator iter = region_object_list.begin(); iter != region_object_list.end(); ++iter)
+		{
+			(*iter)->markDead() ;
+		}
+	}
+}
+
 void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
 {
 	LLColor4 above_water_color = LLUIColorTable::instance().getColor( "NetMapOtherOwnAboveWater" );
@@ -1525,7 +1565,11 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
 	{
 		LLViewerObject* objectp = *iter;
 
-		llassert_always(!objectp->isDead());
+		//llassert_always(!objectp->isDead());
+		if(objectp->isDead())//some dead objects somehow not cleaned.
+		{
+			continue ;
+		}
 
 		if (!objectp->getRegion() || objectp->isOrphaned() || objectp->isAttachment())
 		{
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 4830f5912b..65374bca70 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -104,6 +104,7 @@ public:
 	void shiftObjects(const LLVector3 &offset);
 
 	bool hasMapObjectInRegion(LLViewerRegion* regionp) ;
+	void clearAllMapObjectsInRegion(LLViewerRegion* regionp) ;
 	void renderObjectsForMap(LLNetMap &netmap);
 	void renderObjectBounds(const LLVector3 &center);
 
@@ -197,8 +198,7 @@ protected:
 
 	vobj_list_t mMapObjects;
 
-	typedef std::map<LLUUID, LLPointer<LLViewerObject> > vo_map;
-	vo_map mDeadObjects;	// Need to keep multiple entries per UUID
+	std::set<LLUUID> mDeadObjects;	
 
 	std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
 
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 7aa90bd76d..6561f1bcf6 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -318,6 +318,14 @@ public:
 		std::string rwind_vector_text;
 		std::string audio_text;
 
+		static const std::string beacon_particle = LLTrans::getString("BeaconParticle");
+		static const std::string beacon_physical = LLTrans::getString("BeaconPhysical");
+		static const std::string beacon_scripted = LLTrans::getString("BeaconScripted");
+		static const std::string beacon_scripted_touch = LLTrans::getString("BeaconScriptedTouch");
+		static const std::string beacon_sound = LLTrans::getString("BeaconSound");
+		static const std::string beacon_media = LLTrans::getString("BeaconMedia");
+		static const std::string particle_hiding = LLTrans::getString("ParticleHiding");
+
 		// Draw the statistics in a light gray
 		// and in a thin font
 		mTextColor = LLColor4( 0.86f, 0.86f, 0.86f, 1.f );
@@ -594,33 +602,33 @@ public:
 		{
 			if (LLPipeline::getRenderParticleBeacons(NULL))
 			{
-				addText(xpos, ypos, "Viewing particle beacons (blue)");
+				addText(xpos, ypos, beacon_particle);
 				ypos += y_inc;
 			}
 			if (LLPipeline::toggleRenderTypeControlNegated((void*)LLPipeline::RENDER_TYPE_PARTICLES))
 			{
-				addText(xpos, ypos, "Hiding particles");
+				addText(xpos, ypos, particle_hiding);
 				ypos += y_inc;
 			}
 			if (LLPipeline::getRenderPhysicalBeacons(NULL))
 			{
-				addText(xpos, ypos, "Viewing physical object beacons (green)");
+				addText(xpos, ypos, beacon_physical);
 				ypos += y_inc;
 			}
 			if (LLPipeline::getRenderScriptedBeacons(NULL))
 			{
-				addText(xpos, ypos, "Viewing scripted object beacons (red)");
+				addText(xpos, ypos, beacon_scripted);
 				ypos += y_inc;
 			}
 			else
 				if (LLPipeline::getRenderScriptedTouchBeacons(NULL))
 				{
-					addText(xpos, ypos, "Viewing scripted object with touch function beacons (red)");
+					addText(xpos, ypos, beacon_scripted_touch);
 					ypos += y_inc;
 				}
 			if (LLPipeline::getRenderSoundBeacons(NULL))
 			{
-				addText(xpos, ypos, "Viewing sound beacons (yellow)");
+				addText(xpos, ypos, beacon_sound);
 				ypos += y_inc;
 			}
 		}
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 85871f21d6..96bc8cbdd9 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1,877 +1,879 @@
-/** 
- * @file llworld.cpp
- * @brief Initial test structure to organize viewer regions
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llworld.h"
-#include "llrender.h"
-
-#include "indra_constants.h"
-#include "llstl.h"
-
-#include "llagent.h"
-#include "llviewercontrol.h"
-#include "lldrawpool.h"
-#include "llglheaders.h"
-#include "llhttpnode.h"
-#include "llregionhandle.h"
-#include "llsurface.h"
-#include "lltrans.h"
-#include "llviewercamera.h"
-#include "llviewertexture.h"
-#include "llviewertexturelist.h"
-#include "llviewernetwork.h"
-#include "llviewerobjectlist.h"
-#include "llviewerparceloverlay.h"
-#include "llviewerregion.h"
-#include "llviewerstats.h"
-#include "llvlcomposition.h"
-#include "llvoavatar.h"
-#include "llvowater.h"
-#include "message.h"
-#include "pipeline.h"
-#include "llappviewer.h"		// for do_disconnect()
-
-#include <deque>
-#include <queue>
-#include <map>
-#include <cstring>
-
-//
-// Globals
-//
-U32			gAgentPauseSerialNum = 0;
-
-//
-// Constants
-//
-const S32 MAX_NUMBER_OF_CLOUDS	= 750;
-const S32 WORLD_PATCH_SIZE = 16;
-
-extern LLColor4U MAX_WATER_COLOR;
-
-const U32 LLWorld::mWidth = 256;
-
-// meters/point, therefore mWidth * mScale = meters per edge
-const F32 LLWorld::mScale = 1.f;
-
-const F32 LLWorld::mWidthInMeters = mWidth * mScale;
-
-//
-// Functions
-//
-
-// allocate the stack
-LLWorld::LLWorld() :
-	mLandFarClip(DEFAULT_FAR_PLANE),
-	mLastPacketsIn(0),
-	mLastPacketsOut(0),
-	mLastPacketsLost(0),
-	mSpaceTimeUSec(0),
-	mClassicCloudsEnabled(TRUE)
-{
-	for (S32 i = 0; i < 8; i++)
-	{
-		mEdgeWaterObjects[i] = NULL;
-	}
-
-	if (gNoRender)
-	{
-		return;
-	}
-
-	LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,4);
-	U8 *default_texture = raw->getData();
-	*(default_texture++) = MAX_WATER_COLOR.mV[0];
-	*(default_texture++) = MAX_WATER_COLOR.mV[1];
-	*(default_texture++) = MAX_WATER_COLOR.mV[2];
-	*(default_texture++) = MAX_WATER_COLOR.mV[3];
-	
-	mDefaultWaterTexturep = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE);
-	gGL.getTexUnit(0)->bind(mDefaultWaterTexturep);
-	mDefaultWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
-
-}
-
-
-void LLWorld::destroyClass()
-{
-	mHoleWaterObjects.clear();
-	gObjectList.destroy();
-	for(region_list_t::iterator region_it = mRegionList.begin(); region_it != mRegionList.end(); )
-	{
-		LLViewerRegion* region_to_delete = *region_it++;
-		removeRegion(region_to_delete->getHost());
-	}
-	if(LLVOCache::hasInstance())
-	{
-		LLVOCache::getInstance()->destroyClass() ;
-	}
-	LLViewerPartSim::getInstance()->destroyClass();
-}
-
-
-LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
-{
-	LLMemType mt(LLMemType::MTYPE_REGIONS);
-	llinfos << "Add region with handle: " << region_handle << " on host " << host << llendl;
-	LLViewerRegion *regionp = getRegionFromHandle(region_handle);
-	if (regionp)
-	{
-		llinfos << "Region exists, removing it " << llendl;
-		LLHost old_host = regionp->getHost();
-		// region already exists!
-		if (host == old_host && regionp->isAlive())
-		{
-			// This is a duplicate for the same host and it's alive, don't bother.
-			return regionp;
-		}
-
-		if (host != old_host)
-		{
-			llwarns << "LLWorld::addRegion exists, but old host " << old_host
-					<< " does not match new host " << host << llendl;
-		}
-		if (!regionp->isAlive())
-		{
-			llwarns << "LLWorld::addRegion exists, but isn't alive" << llendl;
-		}
-
-		// Kill the old host, and then we can continue on and add the new host.  We have to kill even if the host
-		// matches, because all the agent state for the new camera is completely different.
-		removeRegion(old_host);
-	}
-
-	U32 iindex = 0;
-	U32 jindex = 0;
-	from_region_handle(region_handle, &iindex, &jindex);
-	S32 x = (S32)(iindex/mWidth);
-	S32 y = (S32)(jindex/mWidth);
-	llinfos << "Adding new region (" << x << ":" << y << ")" << llendl;
-	llinfos << "Host: " << host << llendl;
-
-	LLVector3d origin_global;
-
-	origin_global = from_region_handle(region_handle);
-
-	regionp = new LLViewerRegion(region_handle,
-								    host,
-									mWidth,
-									WORLD_PATCH_SIZE,
-									getRegionWidthInMeters() );
-	if (!regionp)
-	{
-		llerrs << "Unable to create new region!" << llendl;
-	}
-
-	regionp->mCloudLayer.create(regionp);
-	regionp->mCloudLayer.setWidth((F32)mWidth);
-	regionp->mCloudLayer.setWindPointer(&regionp->mWind);
-
-	mRegionList.push_back(regionp);
-	mActiveRegionList.push_back(regionp);
-	mCulledRegionList.push_back(regionp);
-
-
-	// Find all the adjacent regions, and attach them.
-	// Generate handles for all of the adjacent regions, and attach them in the correct way.
-	// connect the edges
-	F32 adj_x = 0.f;
-	F32 adj_y = 0.f;
-	F32 region_x = 0.f;
-	F32 region_y = 0.f;
-	U64 adj_handle = 0;
-
-	F32 width = getRegionWidthInMeters();
-
-	LLViewerRegion *neighborp;
-	from_region_handle(region_handle, &region_x, &region_y);
-
-	// Iterate through all directions, and connect neighbors if there.
-	S32 dir;
-	for (dir = 0; dir < 8; dir++)
-	{
-		adj_x = region_x + width * gDirAxes[dir][0];
-		adj_y = region_y + width * gDirAxes[dir][1];
-		to_region_handle(adj_x, adj_y, &adj_handle);
-
-		neighborp = getRegionFromHandle(adj_handle);
-		if (neighborp)
-		{
-			//llinfos << "Connecting " << region_x << ":" << region_y << " -> " << adj_x << ":" << adj_y << llendl;
-			regionp->connectNeighbor(neighborp, dir);
-		}
-	}
-
-	updateWaterObjects();
-
-	return regionp;
-}
-
-
-void LLWorld::removeRegion(const LLHost &host)
-{
-	F32 x, y;
-
-	LLViewerRegion *regionp = getRegion(host);
-	if (!regionp)
-	{
-		llwarns << "Trying to remove region that doesn't exist!" << llendl;
-		return;
-	}
-	
-	if (regionp == gAgent.getRegion())
-	{
-		for (region_list_t::iterator iter = mRegionList.begin();
-			 iter != mRegionList.end(); ++iter)
-		{
-			LLViewerRegion* reg = *iter;
-			llwarns << "RegionDump: " << reg->getName()
-				<< " " << reg->getHost()
-				<< " " << reg->getOriginGlobal()
-				<< llendl;
-		}
-
-		llwarns << "Agent position global " << gAgent.getPositionGlobal() 
-			<< " agent " << gAgent.getPositionAgent()
-			<< llendl;
-
-		llwarns << "Regions visited " << gAgent.getRegionsVisited() << llendl;
-
-		llwarns << "gFrameTimeSeconds " << gFrameTimeSeconds << llendl;
-
-		llwarns << "Disabling region " << regionp->getName() << " that agent is in!" << llendl;
-		LLAppViewer::instance()->forceDisconnect(LLTrans::getString("YouHaveBeenDisconnected"));
-
-		regionp->saveObjectCache() ; //force to save objects here in case that the object cache is about to be destroyed.
-		return;
-	}
-
-	from_region_handle(regionp->getHandle(), &x, &y);
-	llinfos << "Removing region " << x << ":" << y << llendl;
-
-	mRegionList.remove(regionp);
-	mActiveRegionList.remove(regionp);
-	mCulledRegionList.remove(regionp);
-	mVisibleRegionList.remove(regionp);
-	
-	delete regionp;
-
-	updateWaterObjects();
-
-	llassert_always(!gObjectList.hasMapObjectInRegion(regionp)) ;
-}
-
-
-LLViewerRegion* LLWorld::getRegion(const LLHost &host)
-{
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		if (regionp->getHost() == host)
-		{
-			return regionp;
-		}
-	}
-	return NULL;
-}
-
-LLViewerRegion* LLWorld::getRegionFromPosAgent(const LLVector3 &pos)
-{
-	return getRegionFromPosGlobal(gAgent.getPosGlobalFromAgent(pos));
-}
-
-LLViewerRegion* LLWorld::getRegionFromPosGlobal(const LLVector3d &pos)
-{
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		if (regionp->pointInRegionGlobal(pos))
-		{
-			return regionp;
-		}
-	}
-	return NULL;
-}
-
-
-LLVector3d	LLWorld::clipToVisibleRegions(const LLVector3d &start_pos, const LLVector3d &end_pos)
-{
-	if (positionRegionValidGlobal(end_pos))
-	{
-		return end_pos;
-	}
-
-	LLViewerRegion* regionp = getRegionFromPosGlobal(start_pos);
-	if (!regionp) 
-	{
-		return start_pos;
-	}
-
-	LLVector3d delta_pos = end_pos - start_pos;
-	LLVector3d delta_pos_abs;
-	delta_pos_abs.setVec(delta_pos);
-	delta_pos_abs.abs();
-
-	LLVector3 region_coord = regionp->getPosRegionFromGlobal(end_pos);
-	F64 clip_factor = 1.0;
-	F32 region_width = regionp->getWidth();
-	if (region_coord.mV[VX] < 0.f)
-	{
-		if (region_coord.mV[VY] < region_coord.mV[VX])
-		{
-			// clip along y -
-			clip_factor = -(region_coord.mV[VY] / delta_pos_abs.mdV[VY]);
-		}
-		else
-		{
-			// clip along x -
-			clip_factor = -(region_coord.mV[VX] / delta_pos_abs.mdV[VX]);
-		}
-	}
-	else if (region_coord.mV[VX] > region_width)
-	{
-		if (region_coord.mV[VY] > region_coord.mV[VX])
-		{
-			// clip along y +
-			clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY];
-		}
-		else
-		{
-			//clip along x +
-			clip_factor = (region_coord.mV[VX] - region_width) / delta_pos_abs.mdV[VX];
-		}
-	}
-	else if (region_coord.mV[VY] < 0.f)
-	{
-		// clip along y -
-		clip_factor = -(region_coord.mV[VY] / delta_pos_abs.mdV[VY]);
-	}
-	else if (region_coord.mV[VY] > region_width)
-	{ 
-		// clip along y +
-		clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY];
-	}
-
-	// clamp to within region dimensions
-	LLVector3d final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor);
-	final_region_pos.mdV[VX] = llclamp(final_region_pos.mdV[VX], 0.0,
-									   (F64)(region_width - F_ALMOST_ZERO));
-	final_region_pos.mdV[VY] = llclamp(final_region_pos.mdV[VY], 0.0,
-									   (F64)(region_width - F_ALMOST_ZERO));
-	final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,
-									   (F64)(LLWorld::getInstance()->getRegionMaxHeight() - F_ALMOST_ZERO));
-	return regionp->getPosGlobalFromRegion(LLVector3(final_region_pos));
-}
-
-LLViewerRegion* LLWorld::getRegionFromHandle(const U64 &handle)
-{
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		if (regionp->getHandle() == handle)
-		{
-			return regionp;
-		}
-	}
-	return NULL;
-}
-
-
-void LLWorld::updateAgentOffset(const LLVector3d &offset_global)
-{
-#if 0
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		regionp->setAgentOffset(offset_global);
-	}
-#endif
-}
-
-
-BOOL LLWorld::positionRegionValidGlobal(const LLVector3d &pos_global)
-{
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		if (regionp->pointInRegionGlobal(pos_global))
-		{
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-
-// Allow objects to go up to their radius underground.
-F32 LLWorld::getMinAllowedZ(LLViewerObject* object, const LLVector3d &global_pos)
-{
-	F32 land_height = resolveLandHeightGlobal(global_pos);
-	F32 radius = 0.5f * object->getScale().length();
-	return land_height - radius;
-}
-
-
-
-LLViewerRegion* LLWorld::resolveRegionGlobal(LLVector3 &pos_region, const LLVector3d &pos_global)
-{
-	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);
-
-	if (regionp)
-	{
-		pos_region = regionp->getPosRegionFromGlobal(pos_global);
-		return regionp;
-	}
-
-	return NULL;
-}
-
-
-LLViewerRegion* LLWorld::resolveRegionAgent(LLVector3 &pos_region, const LLVector3 &pos_agent)
-{
-	LLVector3d pos_global = gAgent.getPosGlobalFromAgent(pos_agent);
-	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);
-
-	if (regionp)
-	{
-		pos_region = regionp->getPosRegionFromGlobal(pos_global);
-		return regionp;
-	}
-
-	return NULL;
-}
-
-
-F32 LLWorld::resolveLandHeightAgent(const LLVector3 &pos_agent)
-{
-	LLVector3d pos_global = gAgent.getPosGlobalFromAgent(pos_agent);
-	return resolveLandHeightGlobal(pos_global);
-}
-
-
-F32 LLWorld::resolveLandHeightGlobal(const LLVector3d &pos_global)
-{
-	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);
-	if (regionp)
-	{
-		return regionp->getLand().resolveHeightGlobal(pos_global);
-	}
-	return 0.0f;
-}
-
-
-// Takes a line defined by "point_a" and "point_b" and determines the closest (to point_a) 
-// point where the the line intersects an object or the land surface.  Stores the results
-// in "intersection" and "intersection_normal" and returns a scalar value that represents
-// the normalized distance along the line from "point_a" to "intersection".
-//
-// Currently assumes point_a and point_b only differ in z-direction, 
-// but it may eventually become more general.
-F32 LLWorld::resolveStepHeightGlobal(const LLVOAvatar* avatarp, const LLVector3d &point_a, const LLVector3d &point_b, 
-							   LLVector3d &intersection, LLVector3 &intersection_normal,
-							   LLViewerObject **viewerObjectPtr)
-{
-	// initialize return value to null
-	if (viewerObjectPtr)
-	{
-		*viewerObjectPtr = NULL;
-	}
-
-	LLViewerRegion *regionp = getRegionFromPosGlobal(point_a);
-	if (!regionp)
-	{
-		// We're outside the world 
-		intersection = 0.5f * (point_a + point_b);
-		intersection_normal.setVec(0.0f, 0.0f, 1.0f);
-		return 0.5f;
-	}
-	
-	// calculate the length of the segment
-	F32 segment_length = (F32)((point_a - point_b).length());
-	if (0.0f == segment_length)
-	{
-		intersection = point_a;
-		intersection_normal.setVec(0.0f, 0.0f, 1.0f);
-		return segment_length;
-	}
-
-	// get land height	
-	// Note: we assume that the line is parallel to z-axis here
-	LLVector3d land_intersection = point_a;
-	F32 normalized_land_distance;
-
-	land_intersection.mdV[VZ] = regionp->getLand().resolveHeightGlobal(point_a);
-	normalized_land_distance = (F32)(point_a.mdV[VZ] - land_intersection.mdV[VZ]) / segment_length;
-	intersection = land_intersection;
-	intersection_normal = resolveLandNormalGlobal(land_intersection);
-
-	if (avatarp && !avatarp->mFootPlane.isExactlyClear())
-	{
-		LLVector3 foot_plane_normal(avatarp->mFootPlane.mV);
-		LLVector3 start_pt = avatarp->getRegion()->getPosRegionFromGlobal(point_a);
-		// added 0.05 meters to compensate for error in foot plane reported by Havok
-		F32 norm_dist_from_plane = ((start_pt * foot_plane_normal) - avatarp->mFootPlane.mV[VW]) + 0.05f;
-		norm_dist_from_plane = llclamp(norm_dist_from_plane / segment_length, 0.f, 1.f);
-		if (norm_dist_from_plane < normalized_land_distance)
-		{
-			// collided with object before land
-			normalized_land_distance = norm_dist_from_plane;
-			intersection = point_a;
-			intersection.mdV[VZ] -= norm_dist_from_plane * segment_length;
-			intersection_normal = foot_plane_normal;
-		}
-		else
-		{
-			intersection = land_intersection;
-			intersection_normal = resolveLandNormalGlobal(land_intersection);
-		}
-	}
-
-	return normalized_land_distance;
-}
-
-
-LLSurfacePatch * LLWorld::resolveLandPatchGlobal(const LLVector3d &pos_global)
-{
-	//  returns a pointer to the patch at this location
-	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);
-	if (!regionp)
-	{
-		return NULL;
-	}
-
-	return regionp->getLand().resolvePatchGlobal(pos_global);
-}
-
-
-LLVector3 LLWorld::resolveLandNormalGlobal(const LLVector3d &pos_global)
-{
-	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);
-	if (!regionp)
-	{
-		return LLVector3::z_axis;
-	}
-
-	return regionp->getLand().resolveNormalGlobal(pos_global);
-}
-
-
-void LLWorld::updateVisibilities()
-{
-	F32 cur_far_clip = LLViewerCamera::getInstance()->getFar();
-
-	LLViewerCamera::getInstance()->setFar(mLandFarClip);
-
-	F32 diagonal_squared = F_SQRT2 * F_SQRT2 * mWidth * mWidth;
-	// Go through the culled list and check for visible regions
-	for (region_list_t::iterator iter = mCulledRegionList.begin();
-		 iter != mCulledRegionList.end(); )
-	{
-		region_list_t::iterator curiter = iter++;
-		LLViewerRegion* regionp = *curiter;
-		F32 height = regionp->getLand().getMaxZ() - regionp->getLand().getMinZ();
-		F32 radius = 0.5f*(F32) sqrt(height * height + diagonal_squared);
-		if (!regionp->getLand().hasZData()
-			|| LLViewerCamera::getInstance()->sphereInFrustum(regionp->getCenterAgent(), radius))
-		{
-			mCulledRegionList.erase(curiter);
-			mVisibleRegionList.push_back(regionp);
-		}
-	}
-	
-	// Update all of the visible regions 
-	for (region_list_t::iterator iter = mVisibleRegionList.begin();
-		 iter != mVisibleRegionList.end(); )
-	{
-		region_list_t::iterator curiter = iter++;
-		LLViewerRegion* regionp = *curiter;
-		if (!regionp->getLand().hasZData())
-		{
-			continue;
-		}
-
-		F32 height = regionp->getLand().getMaxZ() - regionp->getLand().getMinZ();
-		F32 radius = 0.5f*(F32) sqrt(height * height + diagonal_squared);
-		if (LLViewerCamera::getInstance()->sphereInFrustum(regionp->getCenterAgent(), radius))
-		{
-			regionp->calculateCameraDistance();
-			if (!gNoRender)
-			{
-				regionp->getLand().updatePatchVisibilities(gAgent);
-			}
-		}
-		else
-		{
-			mVisibleRegionList.erase(curiter);
-			mCulledRegionList.push_back(regionp);
-		}
-	}
-
-	// Sort visible regions
-	mVisibleRegionList.sort(LLViewerRegion::CompareDistance());
-	
-	LLViewerCamera::getInstance()->setFar(cur_far_clip);
-}
-
-void LLWorld::updateRegions(F32 max_update_time)
-{
-	LLMemType mt_ur(LLMemType::MTYPE_IDLE_UPDATE_REGIONS);
-	LLTimer update_timer;
-	BOOL did_one = FALSE;
-	
-	// Perform idle time updates for the regions (and associated surfaces)
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		F32 max_time = max_update_time - update_timer.getElapsedTimeF32();
-		if (did_one && max_time <= 0.f)
-			break;
-		max_time = llmin(max_time, max_update_time*.1f);
-		did_one |= regionp->idleUpdate(max_update_time);
-	}
-}
-
-void LLWorld::updateParticles()
-{
-	LLViewerPartSim::getInstance()->updateSimulation();
-}
-
-void LLWorld::updateClouds(const F32 dt)
-{
-	static LLFastTimer::DeclareTimer ftm("World Clouds");
-	LLFastTimer t(ftm);
-
-	if ( gSavedSettings.getBOOL("FreezeTime") )
-	{
-		// don't move clouds in snapshot mode
-		return;
-	}
-
-	if (
-		mClassicCloudsEnabled !=
-		gSavedSettings.getBOOL("SkyUseClassicClouds") )
-	{
-		// The classic cloud toggle has been flipped
-		// gotta update all of the cloud layers
-		mClassicCloudsEnabled =
-			gSavedSettings.getBOOL("SkyUseClassicClouds");
-
-		if ( !mClassicCloudsEnabled && mActiveRegionList.size() )
-		{
-			// We've transitioned to having classic clouds disabled
-			// reset all cloud layers.
-			for (
-				region_list_t::iterator iter = mActiveRegionList.begin();
-				iter != mActiveRegionList.end();
-				++iter)
-			{
-				LLViewerRegion* regionp = *iter;
-				regionp->mCloudLayer.reset();
-			}
-
-			return;
-		}
-	}
-	else if ( !mClassicCloudsEnabled ) return;
-
-	if (mActiveRegionList.size())
-	{
-		for (region_list_t::iterator iter = mActiveRegionList.begin();
-			 iter != mActiveRegionList.end(); ++iter)
-		{
-			LLViewerRegion* regionp = *iter;
-			regionp->mCloudLayer.updatePuffs(dt);
-		}
-
-		// Reshuffle who owns which puffs
-		for (region_list_t::iterator iter = mActiveRegionList.begin();
-			 iter != mActiveRegionList.end(); ++iter)
-		{
-			LLViewerRegion* regionp = *iter;
-			regionp->mCloudLayer.updatePuffOwnership();
-		}
-
-		// Add new puffs
-		for (region_list_t::iterator iter = mActiveRegionList.begin();
-			 iter != mActiveRegionList.end(); ++iter)
-		{
-			LLViewerRegion* regionp = *iter;
-			regionp->mCloudLayer.updatePuffCount();
-		}
-	}
-}
-
-LLCloudGroup* LLWorld::findCloudGroup(const LLCloudPuff &puff)
-{
-	if (mActiveRegionList.size())
-	{
-		// Update all the cloud puff positions, and timer based stuff
-		// such as death decay
-		for (region_list_t::iterator iter = mActiveRegionList.begin();
-			 iter != mActiveRegionList.end(); ++iter)
-		{
-			LLViewerRegion* regionp = *iter;
-			LLCloudGroup *groupp = regionp->mCloudLayer.findCloudGroup(puff);
-			if (groupp)
-			{
-				return groupp;
-			}
-		}
-	}
-	return NULL;
-}
-
-
-void LLWorld::renderPropertyLines()
-{
-	S32 region_count = 0;
-	S32 vertex_count = 0;
-
-	for (region_list_t::iterator iter = mVisibleRegionList.begin();
-		 iter != mVisibleRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		region_count++;
-		vertex_count += regionp->renderPropertyLines();
-	}
-}
-
-
-void LLWorld::updateNetStats()
-{
-	F32 bits = 0.f;
-	U32 packets = 0;
-
-	for (region_list_t::iterator iter = mActiveRegionList.begin();
-		 iter != mActiveRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		regionp->updateNetStats();
-		bits += regionp->mBitStat.getCurrent();
-		packets += llfloor( regionp->mPacketsStat.getCurrent() );
-	}
-
-	S32 packets_in = gMessageSystem->mPacketsIn - mLastPacketsIn;
-	S32 packets_out = gMessageSystem->mPacketsOut - mLastPacketsOut;
-	S32 packets_lost = gMessageSystem->mDroppedPackets - mLastPacketsLost;
-
-	S32 actual_in_bits = gMessageSystem->mPacketRing.getAndResetActualInBits();
-	S32 actual_out_bits = gMessageSystem->mPacketRing.getAndResetActualOutBits();
-	LLViewerStats::getInstance()->mActualInKBitStat.addValue(actual_in_bits/1024.f);
-	LLViewerStats::getInstance()->mActualOutKBitStat.addValue(actual_out_bits/1024.f);
-	LLViewerStats::getInstance()->mKBitStat.addValue(bits/1024.f);
-	LLViewerStats::getInstance()->mPacketsInStat.addValue(packets_in);
-	LLViewerStats::getInstance()->mPacketsOutStat.addValue(packets_out);
-	LLViewerStats::getInstance()->mPacketsLostStat.addValue(gMessageSystem->mDroppedPackets);
-	if (packets_in)
-	{
-		LLViewerStats::getInstance()->mPacketsLostPercentStat.addValue(100.f*((F32)packets_lost/(F32)packets_in));
-	}
-	else
-	{
-		LLViewerStats::getInstance()->mPacketsLostPercentStat.addValue(0.f);
-	}
-
-	mLastPacketsIn = gMessageSystem->mPacketsIn;
-	mLastPacketsOut = gMessageSystem->mPacketsOut;
-	mLastPacketsLost = gMessageSystem->mDroppedPackets;
-}
-
-
-void LLWorld::printPacketsLost()
-{
-	llinfos << "Simulators:" << llendl;
-	llinfos << "----------" << llendl;
-
-	LLCircuitData *cdp = NULL;
-	for (region_list_t::iterator iter = mActiveRegionList.begin();
-		 iter != mActiveRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		cdp = gMessageSystem->mCircuitInfo.findCircuit(regionp->getHost());
-		if (cdp)
-		{
-			LLVector3d range = regionp->getCenterGlobal() - gAgent.getPositionGlobal();
-				
-			llinfos << regionp->getHost() << ", range: " << range.length()
-					<< " packets lost: " << cdp->getPacketsLost() << llendl;
-		}
-	}
-}
-
-void LLWorld::processCoarseUpdate(LLMessageSystem* msg, void** user_data)
-{
-	LLViewerRegion* region = LLWorld::getInstance()->getRegion(msg->getSender());
-	if( region )
-	{
-		region->updateCoarseLocations(msg);
-	}
-}
-
-F32 LLWorld::getLandFarClip() const
-{
-	return mLandFarClip;
-}
-
-void LLWorld::setLandFarClip(const F32 far_clip)
-{
-	static S32 const rwidth = (S32)REGION_WIDTH_U32;
-	S32 const n1 = (llceil(mLandFarClip) - 1) / rwidth;
-	S32 const n2 = (llceil(far_clip) - 1) / rwidth;
-	bool need_water_objects_update = n1 != n2;
-
-	mLandFarClip = far_clip;
-
-	if (need_water_objects_update)
-	{
-		updateWaterObjects();
-	}
-}
-
-// Some region that we're connected to, but not the one we're in, gave us
-// a (possibly) new water height. Update it in our local copy.
-void LLWorld::waterHeightRegionInfo(std::string const& sim_name, F32 water_height)
-{
-	for (region_list_t::iterator iter = mRegionList.begin(); iter != mRegionList.end(); ++iter)
-	{
-		if ((*iter)->getName() == sim_name)
-		{
-			(*iter)->setWaterHeight(water_height);
-			break;
-		}
-	}
-}
-
+/** 

+ * @file llworld.cpp

+ * @brief Initial test structure to organize viewer regions

+ *

+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ * 

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ * 

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ * 

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ * 

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llworld.h"

+#include "llrender.h"

+

+#include "indra_constants.h"

+#include "llstl.h"

+

+#include "llagent.h"

+#include "llviewercontrol.h"

+#include "lldrawpool.h"

+#include "llglheaders.h"

+#include "llhttpnode.h"

+#include "llregionhandle.h"

+#include "llsurface.h"

+#include "lltrans.h"

+#include "llviewercamera.h"

+#include "llviewertexture.h"

+#include "llviewertexturelist.h"

+#include "llviewernetwork.h"

+#include "llviewerobjectlist.h"

+#include "llviewerparceloverlay.h"

+#include "llviewerregion.h"

+#include "llviewerstats.h"

+#include "llvlcomposition.h"

+#include "llvoavatar.h"

+#include "llvowater.h"

+#include "message.h"

+#include "pipeline.h"

+#include "llappviewer.h"		// for do_disconnect()

+

+#include <deque>

+#include <queue>

+#include <map>

+#include <cstring>

+

+//

+// Globals

+//

+U32			gAgentPauseSerialNum = 0;

+

+//

+// Constants

+//

+const S32 MAX_NUMBER_OF_CLOUDS	= 750;

+const S32 WORLD_PATCH_SIZE = 16;

+

+extern LLColor4U MAX_WATER_COLOR;

+

+const U32 LLWorld::mWidth = 256;

+

+// meters/point, therefore mWidth * mScale = meters per edge

+const F32 LLWorld::mScale = 1.f;

+

+const F32 LLWorld::mWidthInMeters = mWidth * mScale;

+

+//

+// Functions

+//

+

+// allocate the stack

+LLWorld::LLWorld() :

+	mLandFarClip(DEFAULT_FAR_PLANE),

+	mLastPacketsIn(0),

+	mLastPacketsOut(0),

+	mLastPacketsLost(0),

+	mSpaceTimeUSec(0),

+	mClassicCloudsEnabled(TRUE)

+{

+	for (S32 i = 0; i < 8; i++)

+	{

+		mEdgeWaterObjects[i] = NULL;

+	}

+

+	if (gNoRender)

+	{

+		return;

+	}

+

+	LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,4);

+	U8 *default_texture = raw->getData();

+	*(default_texture++) = MAX_WATER_COLOR.mV[0];

+	*(default_texture++) = MAX_WATER_COLOR.mV[1];

+	*(default_texture++) = MAX_WATER_COLOR.mV[2];

+	*(default_texture++) = MAX_WATER_COLOR.mV[3];

+	

+	mDefaultWaterTexturep = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE);

+	gGL.getTexUnit(0)->bind(mDefaultWaterTexturep);

+	mDefaultWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);

+

+}

+

+

+void LLWorld::destroyClass()

+{

+	mHoleWaterObjects.clear();

+	gObjectList.destroy();

+	for(region_list_t::iterator region_it = mRegionList.begin(); region_it != mRegionList.end(); )

+	{

+		LLViewerRegion* region_to_delete = *region_it++;

+		removeRegion(region_to_delete->getHost());

+	}

+	if(LLVOCache::hasInstance())

+	{

+		LLVOCache::getInstance()->destroyClass() ;

+	}

+	LLViewerPartSim::getInstance()->destroyClass();

+}

+

+

+LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)

+{

+	LLMemType mt(LLMemType::MTYPE_REGIONS);

+	llinfos << "Add region with handle: " << region_handle << " on host " << host << llendl;

+	LLViewerRegion *regionp = getRegionFromHandle(region_handle);

+	if (regionp)

+	{

+		llinfos << "Region exists, removing it " << llendl;

+		LLHost old_host = regionp->getHost();

+		// region already exists!

+		if (host == old_host && regionp->isAlive())

+		{

+			// This is a duplicate for the same host and it's alive, don't bother.

+			return regionp;

+		}

+

+		if (host != old_host)

+		{

+			llwarns << "LLWorld::addRegion exists, but old host " << old_host

+					<< " does not match new host " << host << llendl;

+		}

+		if (!regionp->isAlive())

+		{

+			llwarns << "LLWorld::addRegion exists, but isn't alive" << llendl;

+		}

+

+		// Kill the old host, and then we can continue on and add the new host.  We have to kill even if the host

+		// matches, because all the agent state for the new camera is completely different.

+		removeRegion(old_host);

+	}

+

+	U32 iindex = 0;

+	U32 jindex = 0;

+	from_region_handle(region_handle, &iindex, &jindex);

+	S32 x = (S32)(iindex/mWidth);

+	S32 y = (S32)(jindex/mWidth);

+	llinfos << "Adding new region (" << x << ":" << y << ")" << llendl;

+	llinfos << "Host: " << host << llendl;

+

+	LLVector3d origin_global;

+

+	origin_global = from_region_handle(region_handle);

+

+	regionp = new LLViewerRegion(region_handle,

+								    host,

+									mWidth,

+									WORLD_PATCH_SIZE,

+									getRegionWidthInMeters() );

+	if (!regionp)

+	{

+		llerrs << "Unable to create new region!" << llendl;

+	}

+

+	regionp->mCloudLayer.create(regionp);

+	regionp->mCloudLayer.setWidth((F32)mWidth);

+	regionp->mCloudLayer.setWindPointer(&regionp->mWind);

+

+	mRegionList.push_back(regionp);

+	mActiveRegionList.push_back(regionp);

+	mCulledRegionList.push_back(regionp);

+

+

+	// Find all the adjacent regions, and attach them.

+	// Generate handles for all of the adjacent regions, and attach them in the correct way.

+	// connect the edges

+	F32 adj_x = 0.f;

+	F32 adj_y = 0.f;

+	F32 region_x = 0.f;

+	F32 region_y = 0.f;

+	U64 adj_handle = 0;

+

+	F32 width = getRegionWidthInMeters();

+

+	LLViewerRegion *neighborp;

+	from_region_handle(region_handle, &region_x, &region_y);

+

+	// Iterate through all directions, and connect neighbors if there.

+	S32 dir;

+	for (dir = 0; dir < 8; dir++)

+	{

+		adj_x = region_x + width * gDirAxes[dir][0];

+		adj_y = region_y + width * gDirAxes[dir][1];

+		to_region_handle(adj_x, adj_y, &adj_handle);

+

+		neighborp = getRegionFromHandle(adj_handle);

+		if (neighborp)

+		{

+			//llinfos << "Connecting " << region_x << ":" << region_y << " -> " << adj_x << ":" << adj_y << llendl;

+			regionp->connectNeighbor(neighborp, dir);

+		}

+	}

+

+	updateWaterObjects();

+

+	return regionp;

+}

+

+

+void LLWorld::removeRegion(const LLHost &host)

+{

+	F32 x, y;

+

+	LLViewerRegion *regionp = getRegion(host);

+	if (!regionp)

+	{

+		llwarns << "Trying to remove region that doesn't exist!" << llendl;

+		return;

+	}

+	

+	if (regionp == gAgent.getRegion())

+	{

+		for (region_list_t::iterator iter = mRegionList.begin();

+			 iter != mRegionList.end(); ++iter)

+		{

+			LLViewerRegion* reg = *iter;

+			llwarns << "RegionDump: " << reg->getName()

+				<< " " << reg->getHost()

+				<< " " << reg->getOriginGlobal()

+				<< llendl;

+		}

+

+		llwarns << "Agent position global " << gAgent.getPositionGlobal() 

+			<< " agent " << gAgent.getPositionAgent()

+			<< llendl;

+

+		llwarns << "Regions visited " << gAgent.getRegionsVisited() << llendl;

+

+		llwarns << "gFrameTimeSeconds " << gFrameTimeSeconds << llendl;

+

+		llwarns << "Disabling region " << regionp->getName() << " that agent is in!" << llendl;

+		LLAppViewer::instance()->forceDisconnect(LLTrans::getString("YouHaveBeenDisconnected"));

+

+		regionp->saveObjectCache() ; //force to save objects here in case that the object cache is about to be destroyed.

+		return;

+	}

+

+	from_region_handle(regionp->getHandle(), &x, &y);

+	llinfos << "Removing region " << x << ":" << y << llendl;

+

+	mRegionList.remove(regionp);

+	mActiveRegionList.remove(regionp);

+	mCulledRegionList.remove(regionp);

+	mVisibleRegionList.remove(regionp);

+	

+	delete regionp;

+

+	updateWaterObjects();

+

+	//double check all objects of this region are removed.

+	gObjectList.clearAllMapObjectsInRegion(regionp) ;

+	//llassert_always(!gObjectList.hasMapObjectInRegion(regionp)) ;

+}

+

+

+LLViewerRegion* LLWorld::getRegion(const LLHost &host)

+{

+	for (region_list_t::iterator iter = mRegionList.begin();

+		 iter != mRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		if (regionp->getHost() == host)

+		{

+			return regionp;

+		}

+	}

+	return NULL;

+}

+

+LLViewerRegion* LLWorld::getRegionFromPosAgent(const LLVector3 &pos)

+{

+	return getRegionFromPosGlobal(gAgent.getPosGlobalFromAgent(pos));

+}

+

+LLViewerRegion* LLWorld::getRegionFromPosGlobal(const LLVector3d &pos)

+{

+	for (region_list_t::iterator iter = mRegionList.begin();

+		 iter != mRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		if (regionp->pointInRegionGlobal(pos))

+		{

+			return regionp;

+		}

+	}

+	return NULL;

+}

+

+

+LLVector3d	LLWorld::clipToVisibleRegions(const LLVector3d &start_pos, const LLVector3d &end_pos)

+{

+	if (positionRegionValidGlobal(end_pos))

+	{

+		return end_pos;

+	}

+

+	LLViewerRegion* regionp = getRegionFromPosGlobal(start_pos);

+	if (!regionp) 

+	{

+		return start_pos;

+	}

+

+	LLVector3d delta_pos = end_pos - start_pos;

+	LLVector3d delta_pos_abs;

+	delta_pos_abs.setVec(delta_pos);

+	delta_pos_abs.abs();

+

+	LLVector3 region_coord = regionp->getPosRegionFromGlobal(end_pos);

+	F64 clip_factor = 1.0;

+	F32 region_width = regionp->getWidth();

+	if (region_coord.mV[VX] < 0.f)

+	{

+		if (region_coord.mV[VY] < region_coord.mV[VX])

+		{

+			// clip along y -

+			clip_factor = -(region_coord.mV[VY] / delta_pos_abs.mdV[VY]);

+		}

+		else

+		{

+			// clip along x -

+			clip_factor = -(region_coord.mV[VX] / delta_pos_abs.mdV[VX]);

+		}

+	}

+	else if (region_coord.mV[VX] > region_width)

+	{

+		if (region_coord.mV[VY] > region_coord.mV[VX])

+		{

+			// clip along y +

+			clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY];

+		}

+		else

+		{

+			//clip along x +

+			clip_factor = (region_coord.mV[VX] - region_width) / delta_pos_abs.mdV[VX];

+		}

+	}

+	else if (region_coord.mV[VY] < 0.f)

+	{

+		// clip along y -

+		clip_factor = -(region_coord.mV[VY] / delta_pos_abs.mdV[VY]);

+	}

+	else if (region_coord.mV[VY] > region_width)

+	{ 

+		// clip along y +

+		clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY];

+	}

+

+	// clamp to within region dimensions

+	LLVector3d final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor);

+	final_region_pos.mdV[VX] = llclamp(final_region_pos.mdV[VX], 0.0,

+									   (F64)(region_width - F_ALMOST_ZERO));

+	final_region_pos.mdV[VY] = llclamp(final_region_pos.mdV[VY], 0.0,

+									   (F64)(region_width - F_ALMOST_ZERO));

+	final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,

+									   (F64)(LLWorld::getInstance()->getRegionMaxHeight() - F_ALMOST_ZERO));

+	return regionp->getPosGlobalFromRegion(LLVector3(final_region_pos));

+}

+

+LLViewerRegion* LLWorld::getRegionFromHandle(const U64 &handle)

+{

+	for (region_list_t::iterator iter = mRegionList.begin();

+		 iter != mRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		if (regionp->getHandle() == handle)

+		{

+			return regionp;

+		}

+	}

+	return NULL;

+}

+

+

+void LLWorld::updateAgentOffset(const LLVector3d &offset_global)

+{

+#if 0

+	for (region_list_t::iterator iter = mRegionList.begin();

+		 iter != mRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		regionp->setAgentOffset(offset_global);

+	}

+#endif

+}

+

+

+BOOL LLWorld::positionRegionValidGlobal(const LLVector3d &pos_global)

+{

+	for (region_list_t::iterator iter = mRegionList.begin();

+		 iter != mRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		if (regionp->pointInRegionGlobal(pos_global))

+		{

+			return TRUE;

+		}

+	}

+	return FALSE;

+}

+

+

+// Allow objects to go up to their radius underground.

+F32 LLWorld::getMinAllowedZ(LLViewerObject* object, const LLVector3d &global_pos)

+{

+	F32 land_height = resolveLandHeightGlobal(global_pos);

+	F32 radius = 0.5f * object->getScale().length();

+	return land_height - radius;

+}

+

+

+

+LLViewerRegion* LLWorld::resolveRegionGlobal(LLVector3 &pos_region, const LLVector3d &pos_global)

+{

+	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);

+

+	if (regionp)

+	{

+		pos_region = regionp->getPosRegionFromGlobal(pos_global);

+		return regionp;

+	}

+

+	return NULL;

+}

+

+

+LLViewerRegion* LLWorld::resolveRegionAgent(LLVector3 &pos_region, const LLVector3 &pos_agent)

+{

+	LLVector3d pos_global = gAgent.getPosGlobalFromAgent(pos_agent);

+	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);

+

+	if (regionp)

+	{

+		pos_region = regionp->getPosRegionFromGlobal(pos_global);

+		return regionp;

+	}

+

+	return NULL;

+}

+

+

+F32 LLWorld::resolveLandHeightAgent(const LLVector3 &pos_agent)

+{

+	LLVector3d pos_global = gAgent.getPosGlobalFromAgent(pos_agent);

+	return resolveLandHeightGlobal(pos_global);

+}

+

+

+F32 LLWorld::resolveLandHeightGlobal(const LLVector3d &pos_global)

+{

+	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);

+	if (regionp)

+	{

+		return regionp->getLand().resolveHeightGlobal(pos_global);

+	}

+	return 0.0f;

+}

+

+

+// Takes a line defined by "point_a" and "point_b" and determines the closest (to point_a) 

+// point where the the line intersects an object or the land surface.  Stores the results

+// in "intersection" and "intersection_normal" and returns a scalar value that represents

+// the normalized distance along the line from "point_a" to "intersection".

+//

+// Currently assumes point_a and point_b only differ in z-direction, 

+// but it may eventually become more general.

+F32 LLWorld::resolveStepHeightGlobal(const LLVOAvatar* avatarp, const LLVector3d &point_a, const LLVector3d &point_b, 

+							   LLVector3d &intersection, LLVector3 &intersection_normal,

+							   LLViewerObject **viewerObjectPtr)

+{

+	// initialize return value to null

+	if (viewerObjectPtr)

+	{

+		*viewerObjectPtr = NULL;

+	}

+

+	LLViewerRegion *regionp = getRegionFromPosGlobal(point_a);

+	if (!regionp)

+	{

+		// We're outside the world 

+		intersection = 0.5f * (point_a + point_b);

+		intersection_normal.setVec(0.0f, 0.0f, 1.0f);

+		return 0.5f;

+	}

+	

+	// calculate the length of the segment

+	F32 segment_length = (F32)((point_a - point_b).length());

+	if (0.0f == segment_length)

+	{

+		intersection = point_a;

+		intersection_normal.setVec(0.0f, 0.0f, 1.0f);

+		return segment_length;

+	}

+

+	// get land height	

+	// Note: we assume that the line is parallel to z-axis here

+	LLVector3d land_intersection = point_a;

+	F32 normalized_land_distance;

+

+	land_intersection.mdV[VZ] = regionp->getLand().resolveHeightGlobal(point_a);

+	normalized_land_distance = (F32)(point_a.mdV[VZ] - land_intersection.mdV[VZ]) / segment_length;

+	intersection = land_intersection;

+	intersection_normal = resolveLandNormalGlobal(land_intersection);

+

+	if (avatarp && !avatarp->mFootPlane.isExactlyClear())

+	{

+		LLVector3 foot_plane_normal(avatarp->mFootPlane.mV);

+		LLVector3 start_pt = avatarp->getRegion()->getPosRegionFromGlobal(point_a);

+		// added 0.05 meters to compensate for error in foot plane reported by Havok

+		F32 norm_dist_from_plane = ((start_pt * foot_plane_normal) - avatarp->mFootPlane.mV[VW]) + 0.05f;

+		norm_dist_from_plane = llclamp(norm_dist_from_plane / segment_length, 0.f, 1.f);

+		if (norm_dist_from_plane < normalized_land_distance)

+		{

+			// collided with object before land

+			normalized_land_distance = norm_dist_from_plane;

+			intersection = point_a;

+			intersection.mdV[VZ] -= norm_dist_from_plane * segment_length;

+			intersection_normal = foot_plane_normal;

+		}

+		else

+		{

+			intersection = land_intersection;

+			intersection_normal = resolveLandNormalGlobal(land_intersection);

+		}

+	}

+

+	return normalized_land_distance;

+}

+

+

+LLSurfacePatch * LLWorld::resolveLandPatchGlobal(const LLVector3d &pos_global)

+{

+	//  returns a pointer to the patch at this location

+	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);

+	if (!regionp)

+	{

+		return NULL;

+	}

+

+	return regionp->getLand().resolvePatchGlobal(pos_global);

+}

+

+

+LLVector3 LLWorld::resolveLandNormalGlobal(const LLVector3d &pos_global)

+{

+	LLViewerRegion *regionp = getRegionFromPosGlobal(pos_global);

+	if (!regionp)

+	{

+		return LLVector3::z_axis;

+	}

+

+	return regionp->getLand().resolveNormalGlobal(pos_global);

+}

+

+

+void LLWorld::updateVisibilities()

+{

+	F32 cur_far_clip = LLViewerCamera::getInstance()->getFar();

+

+	LLViewerCamera::getInstance()->setFar(mLandFarClip);

+

+	F32 diagonal_squared = F_SQRT2 * F_SQRT2 * mWidth * mWidth;

+	// Go through the culled list and check for visible regions

+	for (region_list_t::iterator iter = mCulledRegionList.begin();

+		 iter != mCulledRegionList.end(); )

+	{

+		region_list_t::iterator curiter = iter++;

+		LLViewerRegion* regionp = *curiter;

+		F32 height = regionp->getLand().getMaxZ() - regionp->getLand().getMinZ();

+		F32 radius = 0.5f*(F32) sqrt(height * height + diagonal_squared);

+		if (!regionp->getLand().hasZData()

+			|| LLViewerCamera::getInstance()->sphereInFrustum(regionp->getCenterAgent(), radius))

+		{

+			mCulledRegionList.erase(curiter);

+			mVisibleRegionList.push_back(regionp);

+		}

+	}

+	

+	// Update all of the visible regions 

+	for (region_list_t::iterator iter = mVisibleRegionList.begin();

+		 iter != mVisibleRegionList.end(); )

+	{

+		region_list_t::iterator curiter = iter++;

+		LLViewerRegion* regionp = *curiter;

+		if (!regionp->getLand().hasZData())

+		{

+			continue;

+		}

+

+		F32 height = regionp->getLand().getMaxZ() - regionp->getLand().getMinZ();

+		F32 radius = 0.5f*(F32) sqrt(height * height + diagonal_squared);

+		if (LLViewerCamera::getInstance()->sphereInFrustum(regionp->getCenterAgent(), radius))

+		{

+			regionp->calculateCameraDistance();

+			if (!gNoRender)

+			{

+				regionp->getLand().updatePatchVisibilities(gAgent);

+			}

+		}

+		else

+		{

+			mVisibleRegionList.erase(curiter);

+			mCulledRegionList.push_back(regionp);

+		}

+	}

+

+	// Sort visible regions

+	mVisibleRegionList.sort(LLViewerRegion::CompareDistance());

+	

+	LLViewerCamera::getInstance()->setFar(cur_far_clip);

+}

+

+void LLWorld::updateRegions(F32 max_update_time)

+{

+	LLMemType mt_ur(LLMemType::MTYPE_IDLE_UPDATE_REGIONS);

+	LLTimer update_timer;

+	BOOL did_one = FALSE;

+	

+	// Perform idle time updates for the regions (and associated surfaces)

+	for (region_list_t::iterator iter = mRegionList.begin();

+		 iter != mRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		F32 max_time = max_update_time - update_timer.getElapsedTimeF32();

+		if (did_one && max_time <= 0.f)

+			break;

+		max_time = llmin(max_time, max_update_time*.1f);

+		did_one |= regionp->idleUpdate(max_update_time);

+	}

+}

+

+void LLWorld::updateParticles()

+{

+	LLViewerPartSim::getInstance()->updateSimulation();

+}

+

+void LLWorld::updateClouds(const F32 dt)

+{

+	static LLFastTimer::DeclareTimer ftm("World Clouds");

+	LLFastTimer t(ftm);

+

+	if ( gSavedSettings.getBOOL("FreezeTime") )

+	{

+		// don't move clouds in snapshot mode

+		return;

+	}

+

+	if (

+		mClassicCloudsEnabled !=

+		gSavedSettings.getBOOL("SkyUseClassicClouds") )

+	{

+		// The classic cloud toggle has been flipped

+		// gotta update all of the cloud layers

+		mClassicCloudsEnabled =

+			gSavedSettings.getBOOL("SkyUseClassicClouds");

+

+		if ( !mClassicCloudsEnabled && mActiveRegionList.size() )

+		{

+			// We've transitioned to having classic clouds disabled

+			// reset all cloud layers.

+			for (

+				region_list_t::iterator iter = mActiveRegionList.begin();

+				iter != mActiveRegionList.end();

+				++iter)

+			{

+				LLViewerRegion* regionp = *iter;

+				regionp->mCloudLayer.reset();

+			}

+

+			return;

+		}

+	}

+	else if ( !mClassicCloudsEnabled ) return;

+

+	if (mActiveRegionList.size())

+	{

+		for (region_list_t::iterator iter = mActiveRegionList.begin();

+			 iter != mActiveRegionList.end(); ++iter)

+		{

+			LLViewerRegion* regionp = *iter;

+			regionp->mCloudLayer.updatePuffs(dt);

+		}

+

+		// Reshuffle who owns which puffs

+		for (region_list_t::iterator iter = mActiveRegionList.begin();

+			 iter != mActiveRegionList.end(); ++iter)

+		{

+			LLViewerRegion* regionp = *iter;

+			regionp->mCloudLayer.updatePuffOwnership();

+		}

+

+		// Add new puffs

+		for (region_list_t::iterator iter = mActiveRegionList.begin();

+			 iter != mActiveRegionList.end(); ++iter)

+		{

+			LLViewerRegion* regionp = *iter;

+			regionp->mCloudLayer.updatePuffCount();

+		}

+	}

+}

+

+LLCloudGroup* LLWorld::findCloudGroup(const LLCloudPuff &puff)

+{

+	if (mActiveRegionList.size())

+	{

+		// Update all the cloud puff positions, and timer based stuff

+		// such as death decay

+		for (region_list_t::iterator iter = mActiveRegionList.begin();

+			 iter != mActiveRegionList.end(); ++iter)

+		{

+			LLViewerRegion* regionp = *iter;

+			LLCloudGroup *groupp = regionp->mCloudLayer.findCloudGroup(puff);

+			if (groupp)

+			{

+				return groupp;

+			}

+		}

+	}

+	return NULL;

+}

+

+

+void LLWorld::renderPropertyLines()

+{

+	S32 region_count = 0;

+	S32 vertex_count = 0;

+

+	for (region_list_t::iterator iter = mVisibleRegionList.begin();

+		 iter != mVisibleRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		region_count++;

+		vertex_count += regionp->renderPropertyLines();

+	}

+}

+

+

+void LLWorld::updateNetStats()

+{

+	F32 bits = 0.f;

+	U32 packets = 0;

+

+	for (region_list_t::iterator iter = mActiveRegionList.begin();

+		 iter != mActiveRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		regionp->updateNetStats();

+		bits += regionp->mBitStat.getCurrent();

+		packets += llfloor( regionp->mPacketsStat.getCurrent() );

+	}

+

+	S32 packets_in = gMessageSystem->mPacketsIn - mLastPacketsIn;

+	S32 packets_out = gMessageSystem->mPacketsOut - mLastPacketsOut;

+	S32 packets_lost = gMessageSystem->mDroppedPackets - mLastPacketsLost;

+

+	S32 actual_in_bits = gMessageSystem->mPacketRing.getAndResetActualInBits();

+	S32 actual_out_bits = gMessageSystem->mPacketRing.getAndResetActualOutBits();

+	LLViewerStats::getInstance()->mActualInKBitStat.addValue(actual_in_bits/1024.f);

+	LLViewerStats::getInstance()->mActualOutKBitStat.addValue(actual_out_bits/1024.f);

+	LLViewerStats::getInstance()->mKBitStat.addValue(bits/1024.f);

+	LLViewerStats::getInstance()->mPacketsInStat.addValue(packets_in);

+	LLViewerStats::getInstance()->mPacketsOutStat.addValue(packets_out);

+	LLViewerStats::getInstance()->mPacketsLostStat.addValue(gMessageSystem->mDroppedPackets);

+	if (packets_in)

+	{

+		LLViewerStats::getInstance()->mPacketsLostPercentStat.addValue(100.f*((F32)packets_lost/(F32)packets_in));

+	}

+	else

+	{

+		LLViewerStats::getInstance()->mPacketsLostPercentStat.addValue(0.f);

+	}

+

+	mLastPacketsIn = gMessageSystem->mPacketsIn;

+	mLastPacketsOut = gMessageSystem->mPacketsOut;

+	mLastPacketsLost = gMessageSystem->mDroppedPackets;

+}

+

+

+void LLWorld::printPacketsLost()

+{

+	llinfos << "Simulators:" << llendl;

+	llinfos << "----------" << llendl;

+

+	LLCircuitData *cdp = NULL;

+	for (region_list_t::iterator iter = mActiveRegionList.begin();

+		 iter != mActiveRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		cdp = gMessageSystem->mCircuitInfo.findCircuit(regionp->getHost());

+		if (cdp)

+		{

+			LLVector3d range = regionp->getCenterGlobal() - gAgent.getPositionGlobal();

+				

+			llinfos << regionp->getHost() << ", range: " << range.length()

+					<< " packets lost: " << cdp->getPacketsLost() << llendl;

+		}

+	}

+}

+

+void LLWorld::processCoarseUpdate(LLMessageSystem* msg, void** user_data)

+{

+	LLViewerRegion* region = LLWorld::getInstance()->getRegion(msg->getSender());

+	if( region )

+	{

+		region->updateCoarseLocations(msg);

+	}

+}

+

+F32 LLWorld::getLandFarClip() const

+{

+	return mLandFarClip;

+}

+

+void LLWorld::setLandFarClip(const F32 far_clip)

+{

+	static S32 const rwidth = (S32)REGION_WIDTH_U32;

+	S32 const n1 = (llceil(mLandFarClip) - 1) / rwidth;

+	S32 const n2 = (llceil(far_clip) - 1) / rwidth;

+	bool need_water_objects_update = n1 != n2;

+

+	mLandFarClip = far_clip;

+

+	if (need_water_objects_update)

+	{

+		updateWaterObjects();

+	}

+}

+

+// Some region that we're connected to, but not the one we're in, gave us

+// a (possibly) new water height. Update it in our local copy.

+void LLWorld::waterHeightRegionInfo(std::string const& sim_name, F32 water_height)

+{

+	for (region_list_t::iterator iter = mRegionList.begin(); iter != mRegionList.end(); ++iter)

+	{

+		if ((*iter)->getName() == sim_name)

+		{

+			(*iter)->setWaterHeight(water_height);

+			break;

+		}

+	}

+}

+

 void LLWorld::updateWaterObjects()

 {

 	if (!gAgent.getRegion())

@@ -1013,298 +1015,334 @@ void LLWorld::updateWaterObjects()
 		gObjectList.updateActive(waterp);

 	}

 }

-
-
-void LLWorld::shiftRegions(const LLVector3& offset)
-{
-	for (region_list_t::const_iterator i = getRegionList().begin(); i != getRegionList().end(); ++i)
-	{
-		LLViewerRegion* region = *i;
-		region->updateRenderMatrix();
-	}
-
-	LLViewerPartSim::getInstance()->shift(offset);
-}
-
-LLViewerTexture* LLWorld::getDefaultWaterTexture()
-{
-	return mDefaultWaterTexturep;
-}
-
-void LLWorld::setSpaceTimeUSec(const U64 space_time_usec)
-{
-	mSpaceTimeUSec = space_time_usec;
-}
-
-U64 LLWorld::getSpaceTimeUSec() const
-{
-	return mSpaceTimeUSec;
-}
-
-void LLWorld::requestCacheMisses()
-{
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		regionp->requestCacheMisses();
-	}
-}
-
-void LLWorld::getInfo(LLSD& info)
-{
-	LLSD region_info;
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{	
-		LLViewerRegion* regionp = *iter;
-		regionp->getInfo(region_info);
-		info["World"].append(region_info);
-	}
-}
-
-void LLWorld::disconnectRegions()
-{
-	LLMessageSystem* msg = gMessageSystem;
-	for (region_list_t::iterator iter = mRegionList.begin();
-		 iter != mRegionList.end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		if (regionp == gAgent.getRegion())
-		{
-			// Skip the main agent
-			continue;
-		}
-
-		llinfos << "Sending AgentQuitCopy to: " << regionp->getHost() << llendl;
-		msg->newMessageFast(_PREHASH_AgentQuitCopy);
-		msg->nextBlockFast(_PREHASH_AgentData);
-		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-		msg->nextBlockFast(_PREHASH_FuseBlock);
-		msg->addU32Fast(_PREHASH_ViewerCircuitCode, gMessageSystem->mOurCircuitCode);
-		msg->sendMessage(regionp->getHost());
-	}
-}
-
-static LLFastTimer::DeclareTimer FTM_ENABLE_SIMULATOR("Enable Sim");
-
-void process_enable_simulator(LLMessageSystem *msg, void **user_data)
-{
-	LLFastTimer t(FTM_ENABLE_SIMULATOR);
-	// enable the appropriate circuit for this simulator and 
-	// add its values into the gSimulator structure
-	U64		handle;
-	U32		ip_u32;
-	U16		port;
-
-	msg->getU64Fast(_PREHASH_SimulatorInfo, _PREHASH_Handle, handle);
-	msg->getIPAddrFast(_PREHASH_SimulatorInfo, _PREHASH_IP, ip_u32);
-	msg->getIPPortFast(_PREHASH_SimulatorInfo, _PREHASH_Port, port);
-
-	// which simulator should we modify?
-	LLHost sim(ip_u32, port);
-
-	// Viewer trusts the simulator.
-	msg->enableCircuit(sim, TRUE);
-	LLWorld::getInstance()->addRegion(handle, sim);
-
-	// give the simulator a message it can use to get ip and port
-	llinfos << "simulator_enable() Enabling " << sim << " with code " << msg->getOurCircuitCode() << llendl;
-	msg->newMessageFast(_PREHASH_UseCircuitCode);
-	msg->nextBlockFast(_PREHASH_CircuitCode);
-	msg->addU32Fast(_PREHASH_Code, msg->getOurCircuitCode());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->addUUIDFast(_PREHASH_ID, gAgent.getID());
-	msg->sendReliable(sim);
-}
-
-class LLEstablishAgentCommunication : public LLHTTPNode
-{
-	LOG_CLASS(LLEstablishAgentCommunication);
-public:
- 	virtual void describe(Description& desc) const
-	{
-		desc.shortInfo("seed capability info for a region");
-		desc.postAPI();
-		desc.input(
-			"{ seed-capability: ..., sim-ip: ..., sim-port }");
-		desc.source(__FILE__, __LINE__);
-	}
-
-	virtual void post(ResponsePtr response, const LLSD& context, const LLSD& input) const
-	{
-		if (!input["body"].has("agent-id") ||
-			!input["body"].has("sim-ip-and-port") ||
-			!input["body"].has("seed-capability"))
-		{
-			llwarns << "invalid parameters" << llendl;
-            return;
-		}
-
-		LLHost sim(input["body"]["sim-ip-and-port"].asString());
-	
-		LLViewerRegion* regionp = LLWorld::getInstance()->getRegion(sim);
-		if (!regionp)
-		{
-			llwarns << "Got EstablishAgentCommunication for unknown region "
-					<< sim << llendl;
-			return;
-		}
-		regionp->setSeedCapability(input["body"]["seed-capability"]);
-	}
-};
-
-// disable the circuit to this simulator
-// Called in response to "DisableSimulator" message.
-void process_disable_simulator(LLMessageSystem *mesgsys, void **user_data)
-{	
-	LLHost host = mesgsys->getSender();
-
-	//llinfos << "Disabling simulator with message from " << host << llendl;
-	LLWorld::getInstance()->removeRegion(host);
-
-	mesgsys->disableCircuit(host);
-}
-
-
-void process_region_handshake(LLMessageSystem* msg, void** user_data)
-{
-	LLHost host = msg->getSender();
-	LLViewerRegion* regionp = LLWorld::getInstance()->getRegion(host);
-	if (!regionp)
-	{
-		llwarns << "Got region handshake for unknown region "
-			<< host << llendl;
-		return;
-	}
-
-	regionp->unpackRegionHandshake();
-}
-
-
-void send_agent_pause()
-{
-	// *NOTE:Mani Pausing the mainloop timeout. Otherwise a long modal event may cause
-	// the thread monitor to timeout.
-	LLAppViewer::instance()->pauseMainloopTimeout();
-	
-	// Note: used to check for LLWorld initialization before it became a singleton.
-	// Rather than just remove this check I'm changing it to assure that the message 
-	// system has been initialized. -MG
-	if (!gMessageSystem)
-	{
-		return;
-	}
-	
-	gMessageSystem->newMessageFast(_PREHASH_AgentPause);
-	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgentID);
-	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
-
-	gAgentPauseSerialNum++;
-	gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);
-
-	for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
-		 iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		gMessageSystem->sendReliable(regionp->getHost());
-	}
-
-	gObjectList.mWasPaused = TRUE;
-}
-
-
-void send_agent_resume()
-{
-	// Note: used to check for LLWorld initialization before it became a singleton.
-	// Rather than just remove this check I'm changing it to assure that the message 
-	// system has been initialized. -MG
-	if (!gMessageSystem)
-	{
-		return;
-	}
-
-	gMessageSystem->newMessageFast(_PREHASH_AgentResume);
-	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgentID);
-	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
-
-	gAgentPauseSerialNum++;
-	gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);
-	
-
-	for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
-		 iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		gMessageSystem->sendReliable(regionp->getHost());
-	}
-
-	// Reset the FPS counter to avoid an invalid fps
-	LLViewerStats::getInstance()->mFPSStat.start();
-
-	LLAppViewer::instance()->resumeMainloopTimeout();
-}
-
-static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin)
-{
-	LLVector3d pos_global;
-	LLVector3 pos_local;
-	U8 bits;
-
-	bits = compact_local & 0xFF;
-	pos_local.mV[VZ] = F32(bits) * 4.f;
-	compact_local >>= 8;
-
-	bits = compact_local & 0xFF;
-	pos_local.mV[VY] = (F32)bits;
-	compact_local >>= 8;
-
-	bits = compact_local & 0xFF;
-	pos_local.mV[VX] = (F32)bits;
-
-	pos_global.setVec( pos_local );
-	pos_global += region_origin;
-	return pos_global;
-}
-
-void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const
-{
-	if(avatar_ids != NULL)
-	{
-		avatar_ids->clear();
-	}
-	if(positions != NULL)
-	{
-		positions->clear();
-	}
-	for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
-		iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
-	{
-		LLViewerRegion* regionp = *iter;
-		const LLVector3d& origin_global = regionp->getOriginGlobal();
-		S32 count = regionp->mMapAvatars.count();
-		for (S32 i = 0; i < count; i++)
-		{
-			LLVector3d pos_global = unpackLocalToGlobalPosition(regionp->mMapAvatars.get(i), origin_global);
-			if(dist_vec(pos_global, relative_to) <= radius)
-			{
-				if(positions != NULL)
-				{
-					positions->push_back(pos_global);
-				}
-				if(avatar_ids != NULL)
-				{
-					avatar_ids->push_back(regionp->mMapAvatarIDs.get(i));
-				}
-			}
-		}
-	}
-}
-
-
-LLHTTPRegistration<LLEstablishAgentCommunication>
-	gHTTPRegistrationEstablishAgentCommunication(
-							"/message/EstablishAgentCommunication");
+

+

+void LLWorld::shiftRegions(const LLVector3& offset)

+{

+	for (region_list_t::const_iterator i = getRegionList().begin(); i != getRegionList().end(); ++i)

+	{

+		LLViewerRegion* region = *i;

+		region->updateRenderMatrix();

+	}

+

+	LLViewerPartSim::getInstance()->shift(offset);

+}

+

+LLViewerTexture* LLWorld::getDefaultWaterTexture()

+{

+	return mDefaultWaterTexturep;

+}

+

+void LLWorld::setSpaceTimeUSec(const U64 space_time_usec)

+{

+	mSpaceTimeUSec = space_time_usec;

+}

+

+U64 LLWorld::getSpaceTimeUSec() const

+{

+	return mSpaceTimeUSec;

+}

+

+void LLWorld::requestCacheMisses()

+{

+	for (region_list_t::iterator iter = mRegionList.begin();

+		 iter != mRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		regionp->requestCacheMisses();

+	}

+}

+

+void LLWorld::getInfo(LLSD& info)

+{

+	LLSD region_info;

+	for (region_list_t::iterator iter = mRegionList.begin();

+		 iter != mRegionList.end(); ++iter)

+	{	

+		LLViewerRegion* regionp = *iter;

+		regionp->getInfo(region_info);

+		info["World"].append(region_info);

+	}

+}

+

+void LLWorld::disconnectRegions()

+{

+	LLMessageSystem* msg = gMessageSystem;

+	for (region_list_t::iterator iter = mRegionList.begin();

+		 iter != mRegionList.end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		if (regionp == gAgent.getRegion())

+		{

+			// Skip the main agent

+			continue;

+		}

+

+		llinfos << "Sending AgentQuitCopy to: " << regionp->getHost() << llendl;

+		msg->newMessageFast(_PREHASH_AgentQuitCopy);

+		msg->nextBlockFast(_PREHASH_AgentData);

+		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

+		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());

+		msg->nextBlockFast(_PREHASH_FuseBlock);

+		msg->addU32Fast(_PREHASH_ViewerCircuitCode, gMessageSystem->mOurCircuitCode);

+		msg->sendMessage(regionp->getHost());

+	}

+}

+

+static LLFastTimer::DeclareTimer FTM_ENABLE_SIMULATOR("Enable Sim");

+

+void process_enable_simulator(LLMessageSystem *msg, void **user_data)

+{

+	LLFastTimer t(FTM_ENABLE_SIMULATOR);

+	// enable the appropriate circuit for this simulator and 

+	// add its values into the gSimulator structure

+	U64		handle;

+	U32		ip_u32;

+	U16		port;

+

+	msg->getU64Fast(_PREHASH_SimulatorInfo, _PREHASH_Handle, handle);

+	msg->getIPAddrFast(_PREHASH_SimulatorInfo, _PREHASH_IP, ip_u32);

+	msg->getIPPortFast(_PREHASH_SimulatorInfo, _PREHASH_Port, port);

+

+	// which simulator should we modify?

+	LLHost sim(ip_u32, port);

+

+	// Viewer trusts the simulator.

+	msg->enableCircuit(sim, TRUE);

+	LLWorld::getInstance()->addRegion(handle, sim);

+

+	// give the simulator a message it can use to get ip and port

+	llinfos << "simulator_enable() Enabling " << sim << " with code " << msg->getOurCircuitCode() << llendl;

+	msg->newMessageFast(_PREHASH_UseCircuitCode);

+	msg->nextBlockFast(_PREHASH_CircuitCode);

+	msg->addU32Fast(_PREHASH_Code, msg->getOurCircuitCode());

+	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());

+	msg->addUUIDFast(_PREHASH_ID, gAgent.getID());

+	msg->sendReliable(sim);

+}

+

+class LLEstablishAgentCommunication : public LLHTTPNode

+{

+	LOG_CLASS(LLEstablishAgentCommunication);

+public:

+ 	virtual void describe(Description& desc) const

+	{

+		desc.shortInfo("seed capability info for a region");

+		desc.postAPI();

+		desc.input(

+			"{ seed-capability: ..., sim-ip: ..., sim-port }");

+		desc.source(__FILE__, __LINE__);

+	}

+

+	virtual void post(ResponsePtr response, const LLSD& context, const LLSD& input) const

+	{

+		if (!input["body"].has("agent-id") ||

+			!input["body"].has("sim-ip-and-port") ||

+			!input["body"].has("seed-capability"))

+		{

+			llwarns << "invalid parameters" << llendl;

+            return;

+		}

+

+		LLHost sim(input["body"]["sim-ip-and-port"].asString());

+	

+		LLViewerRegion* regionp = LLWorld::getInstance()->getRegion(sim);

+		if (!regionp)

+		{

+			llwarns << "Got EstablishAgentCommunication for unknown region "

+					<< sim << llendl;

+			return;

+		}

+		regionp->setSeedCapability(input["body"]["seed-capability"]);

+	}

+};

+

+// disable the circuit to this simulator

+// Called in response to "DisableSimulator" message.

+void process_disable_simulator(LLMessageSystem *mesgsys, void **user_data)

+{	

+	LLHost host = mesgsys->getSender();

+

+	//llinfos << "Disabling simulator with message from " << host << llendl;

+	LLWorld::getInstance()->removeRegion(host);

+

+	mesgsys->disableCircuit(host);

+}

+

+

+void process_region_handshake(LLMessageSystem* msg, void** user_data)

+{

+	LLHost host = msg->getSender();

+	LLViewerRegion* regionp = LLWorld::getInstance()->getRegion(host);

+	if (!regionp)

+	{

+		llwarns << "Got region handshake for unknown region "

+			<< host << llendl;

+		return;

+	}

+

+	regionp->unpackRegionHandshake();

+}

+

+

+void send_agent_pause()

+{

+	// *NOTE:Mani Pausing the mainloop timeout. Otherwise a long modal event may cause

+	// the thread monitor to timeout.

+	LLAppViewer::instance()->pauseMainloopTimeout();

+	

+	// Note: used to check for LLWorld initialization before it became a singleton.

+	// Rather than just remove this check I'm changing it to assure that the message 

+	// system has been initialized. -MG

+	if (!gMessageSystem)

+	{

+		return;

+	}

+	

+	gMessageSystem->newMessageFast(_PREHASH_AgentPause);

+	gMessageSystem->nextBlockFast(_PREHASH_AgentData);

+	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgentID);

+	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);

+

+	gAgentPauseSerialNum++;

+	gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);

+

+	for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();

+		 iter != LLWorld::getInstance()->getRegionList().end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		gMessageSystem->sendReliable(regionp->getHost());

+	}

+

+	gObjectList.mWasPaused = TRUE;

+}

+

+

+void send_agent_resume()

+{

+	// Note: used to check for LLWorld initialization before it became a singleton.

+	// Rather than just remove this check I'm changing it to assure that the message 

+	// system has been initialized. -MG

+	if (!gMessageSystem)

+	{

+		return;

+	}

+

+	gMessageSystem->newMessageFast(_PREHASH_AgentResume);

+	gMessageSystem->nextBlockFast(_PREHASH_AgentData);

+	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgentID);

+	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);

+

+	gAgentPauseSerialNum++;

+	gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);

+	

+

+	for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();

+		 iter != LLWorld::getInstance()->getRegionList().end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		gMessageSystem->sendReliable(regionp->getHost());

+	}

+

+	// Reset the FPS counter to avoid an invalid fps

+	LLViewerStats::getInstance()->mFPSStat.start();

+

+	LLAppViewer::instance()->resumeMainloopTimeout();

+}

+

+static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin)

+{

+	LLVector3d pos_global;

+	LLVector3 pos_local;

+	U8 bits;

+

+	bits = compact_local & 0xFF;

+	pos_local.mV[VZ] = F32(bits) * 4.f;

+	compact_local >>= 8;

+

+	bits = compact_local & 0xFF;

+	pos_local.mV[VY] = (F32)bits;

+	compact_local >>= 8;

+

+	bits = compact_local & 0xFF;

+	pos_local.mV[VX] = (F32)bits;

+

+	pos_global.setVec( pos_local );

+	pos_global += region_origin;

+	return pos_global;

+}

+

+void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const

+{

+	if(avatar_ids != NULL)

+	{

+		avatar_ids->clear();

+	}

+	if(positions != NULL)

+	{

+		positions->clear();

+	}

+	for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();

+		iter != LLWorld::getInstance()->getRegionList().end(); ++iter)

+	{

+		LLViewerRegion* regionp = *iter;

+		const LLVector3d& origin_global = regionp->getOriginGlobal();

+		S32 count = regionp->mMapAvatars.count();

+		for (S32 i = 0; i < count; i++)

+		{

+			LLVector3d pos_global = unpackLocalToGlobalPosition(regionp->mMapAvatars.get(i), origin_global);

+			if(dist_vec(pos_global, relative_to) <= radius)

+			{

+				if(positions != NULL)

+				{

+					positions->push_back(pos_global);

+				}

+				if(avatar_ids != NULL)

+				{

+					avatar_ids->push_back(regionp->mMapAvatarIDs.get(i));

+				}

+			}

+		}

+	}

+	// retrieve the list of close avatars from viewer objects as well

+	// for when we are above 1000m, only do this when we are retrieving

+	// uuid's too as there could be duplicates

+	if(avatar_ids != NULL)

+	{

+		for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();

+			iter != LLCharacter::sInstances.end(); ++iter)

+		{

+			LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter;

+			if(pVOAvatar->isDead() || pVOAvatar->isSelf())

+				continue;

+			LLUUID uuid = pVOAvatar->getID();

+			if(uuid.isNull())

+				continue;

+			LLVector3d pos_global = pVOAvatar->getPositionGlobal();

+			if(dist_vec(pos_global, relative_to) <= radius)

+			{

+				bool found = false;

+				uuid_vec_t::iterator sel_iter = avatar_ids->begin();

+				for (; sel_iter != avatar_ids->end(); sel_iter++)

+				{

+					if(*sel_iter == uuid)

+					{

+						found = true;

+						break;

+					}

+				}

+				if(!found)

+				{

+					if(positions != NULL)

+						positions->push_back(pos_global);

+					avatar_ids->push_back(uuid);

+				}

+			}

+		}

+	}

+}

+

+

+LLHTTPRegistration<LLEstablishAgentCommunication>

+	gHTTPRegistrationEstablishAgentCommunication(

+							"/message/EstablishAgentCommunication");

diff --git a/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png b/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png
new file mode 100644
index 0000000000..8b58db0cba
--- /dev/null
+++ b/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 10aeef7c8a..87d8e54a89 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -131,6 +131,7 @@ with the same filename but different name
   
   <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" />
 
+  <texture name="ChatBarHandle" file_name="bottomtray/ChatBarHandle.png" preload="false" />
   <texture name="DownArrow" file_name="bottomtray/DownArrow.png" preload="false" />
   <texture name="DownArrow_Off" file_name="icons/DownArrow_Off.png" preload="false" />
   <texture name="Dragbar" file_name="windows/Dragbar.png" preload="false" scale.left="35" scale.top="5" scale.right="29" scale.bottom="5" />
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index a096a87928..e78924a1ab 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -87,15 +87,9 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			<text name="Owner:">
 				Ejer:
 			</text>
-			<text name="OwnerText">
-				Leyla Linden
-			</text>
 			<text name="Group:">
 				Gruppe:
 			</text>
-			<text name="GroupText">
-				Leyla Linden
-			</text>
 			<button label="Vælg" name="Set..."/>
 			<check_box label="Tillad dedikering til gruppe" name="check deed" tool_tip="En gruppe administrator kan dedikere denne jord til gruppen, så det vil blive støttet af gruppen&apos;s jord tildeling."/>
 			<button label="Dedikér" name="Deed..." tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe."/>
@@ -396,7 +390,6 @@ Kun større parceller kan vises i søgning.
 				Hjemmeside:
 			</text>
 			<button label="Vælg" name="set_media_url"/>
-			<check_box label="Skjul medie URL" name="hide_media_url" tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/>
 			<text left="4" name="Description:">
 				Beskrivelse:
 			</text>
@@ -424,7 +417,6 @@ Kun større parceller kan vises i søgning.
 			<check_box label="Gentag afspil" name="media_loop" tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra."/>
 		</panel>
 		<panel label="LYD" name="land_audio_panel">
-			<check_box label="Skjul URL" name="hide_music_url" tool_tip="Ved at vælge her, vil musik URL skjules for alle ikke autoriserede brugere der læser denne parcels information."/>
 			<check_box label="Tillad stemmer" name="parcel_enable_voice_channel"/>
 			<check_box label="Tillad stemmer (håndteret af estate)" name="parcel_enable_voice_channel_is_estate_disabled"/>
 			<check_box label="Begræns stemme chat til denne parcel" name="parcel_enable_voice_channel_local"/>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
index fa36fab762..59dcc87140 100644
--- a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
@@ -24,16 +24,10 @@
 	<text name="LabelCreatorTitle">
 		Skaber:
 	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
 	<button label="Profil..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Ejer:
 	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
 	<button label="Profil..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Erhvervet:
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index 781adcd50b..9e673d0d5b 100644
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -167,15 +167,9 @@
 			<text name="Creator:">
 				Skaber:
 			</text>
-			<text name="Creator Name">
-				Mrs. Esbee Linden (esbee.linden)
-			</text>
 			<text name="Owner:">
 				Ejer:
 			</text>
-			<text name="Owner Name">
-				Mrs. Erica &quot;Moose&quot; Linden (erica.linden)
-			</text>
 			<text name="Group:">
 				Gruppe:
 			</text>
diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml
index f581210e1b..dc1ed562eb 100644
--- a/indra/newview/skins/default/xui/da/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/da/inspect_avatar.xml
@@ -10,8 +10,6 @@
 	<string name="Details">
 		[SL_PROFILE]
 	</string>
-	<text name="user_name_small" value="Grumpity ProductEngine med et langt navn"/>
-	<text name="user_slid" value="james.linden"/>
 	<text name="user_details">
 		Dette er min second life beskrivelse og jeg synes den er rigtig god. Men af en eller ande grund er min beskrivelse meget lang fordi jeg taler en hel masse
 	</text>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
index 80b20f15e9..14fd48ba2f 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
@@ -26,11 +26,7 @@
 				<text name="display_name_label" value="Visningsnavn:"/>
 				<text name="solo_username_label" value="Bugernavn:"/>
 				<button name="set_name" tool_tip="Sæt visningsnavn"/>
-				<text name="solo_user_name" value="Hamilton Hitchings"/>
-				<text name="user_name" value="Hamilton Hitchings"/>
-				<text name="user_name_small" value="Hamilton Hitchings"/>
 				<text name="user_label" value="Brugernavn:"/>
-				<text name="user_slid" value="hamilton.linden"/>
 				<panel name="lifes_images_panel">
 					<icon label="" name="2nd_life_edit_icon" tool_tip="Klik for at vælge et billede"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_profile_view.xml b/indra/newview/skins/default/xui/da/panel_profile_view.xml
index 5e0a51eb28..e6e8ca4d10 100644
--- a/indra/newview/skins/default/xui/da/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/da/panel_profile_view.xml
@@ -10,10 +10,8 @@
 	<text name="solo_username_label" value="Brugernavn:"/>
 	<text name="status" value="Online"/>
 	<text name="user_name_small" value="Se på mig med dette enormt ekstremt super lange navn"/>
-	<text name="user_name" value="Jack Linden"/>
 	<button name="copy_to_clipboard" tool_tip="Kopiér til udskriftsholder"/>
 	<text name="user_label" value="Brugernavn:"/>
-	<text name="user_slid" value="jack.linden"/>
 	<tab_container name="tabs">
 		<panel label="PROFIL" name="panel_profile"/>
 		<panel label="FAVORITTER" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
index 746cf201bc..f80d5aeb15 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
@@ -48,15 +48,9 @@
 		<text name="CreatorNameLabel">
 			Skaber:
 		</text>
-		<text name="Creator Name">
-			Erica Linden
-		</text>
 		<text name="Owner:">
 			Ejer:
 		</text>
-		<text name="Owner Name">
-			Erica Linden
-		</text>
 		<text name="Group_label">
 			Gruppe:
 		</text>
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index f9169ed748..8783b52013 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -86,15 +86,9 @@
 			<text name="Owner:">
 				Eigentümer:
 			</text>
-			<text name="OwnerText">
-				Leyla Linden
-			</text>
 			<text name="Group:">
 				Gruppe:
 			</text>
-			<text name="GroupText">
-				Leyla Linden
-			</text>
 			<button label="Festlegen" label_selected="Einstellen..." name="Set..." width="90"/>
 			<check_box label="Übertragung an Gruppe zulassen" name="check deed" tool_tip="Ein Gruppen-Officer kann dieses Land der Gruppe übertragen. Das Land wird dann über die Landzuteilung der Gruppe verwaltet."/>
 			<button label="Übertragung" label_selected="Übertragen..." name="Deed..." tool_tip="Sie können Land nur übertragen, wenn Sie in der ausgewählten Gruppe Officer sind."/>
@@ -398,7 +392,6 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 				Homepage:
 			</text>
 			<button label="Festlegen" name="set_media_url"/>
-			<check_box label="URL ausblenden" name="hide_media_url" tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Medien-URL sehen können. Diese Option ist für HTML-Medien nicht verfügbar."/>
 			<text name="Description:">
 				Inhalt:
 			</text>
@@ -428,7 +421,6 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 			<text name="MusicURL:">
 				Musik-URL:
 			</text>
-			<check_box label="URL ausblenden" name="hide_music_url" tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Musik-URL sehen können"/>
 			<text name="Sound:">
 				Sound:
 			</text>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index f98e23bbc4..7f48105460 100644
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@@ -24,16 +24,10 @@
 	<text name="LabelCreatorTitle">
 		Ersteller:
 	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
 	<button label="Profil..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Eigentümer:
 	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
 	<button label="Profil..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Erworben:
diff --git a/indra/newview/skins/default/xui/de/floater_script_search.xml b/indra/newview/skins/default/xui/de/floater_script_search.xml
index de959cbb28..ffae96f6a1 100644
--- a/indra/newview/skins/default/xui/de/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_search.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script search" title="SKRIPT-SUCHE">
-	<check_box label="Groß-/Kleinschreibung irrelevant" name="case_text"/>
+	<check_box label="Groß-/Kleinschreibung ignorieren" name="case_text"/>
 	<button label="Suchen" label_selected="Suchen" name="search_btn"/>
 	<button label="Ersetzen" label_selected="Ersetzen" name="replace_btn"/>
 	<button label="Alle ersetzen" label_selected="Alle ersetzen" name="replace_all_btn"/>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 2d30814974..d201fc327c 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -170,15 +170,9 @@
 			<text name="Creator:">
 				Ersteller:
 			</text>
-			<text name="Creator Name">
-				Frau Esbee Linden (esbee.linden)
-			</text>
 			<text name="Owner:">
 				Eigentümer:
 			</text>
-			<text name="Owner Name">
-				Frau Erica &quot;Elch&quot; Linden (erica.linden)
-			</text>
 			<text name="Group:">
 				Gruppe:
 			</text>
diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml
index 92d9bc37c4..4b8fd8a0ad 100644
--- a/indra/newview/skins/default/xui/de/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/de/inspect_avatar.xml
@@ -10,9 +10,6 @@
 	<string name="Details">
 		[SL_PROFILE]
 	</string>
-	<text name="user_name_small" value="Launische Produktengine mit langem Namen"/>
-	<text name="user_name" value="Grumpity ProductEngine"/>
-	<text name="user_slid" value="james.linden"/>
 	<text name="user_subtitle" value="11 Monate und 3 Tage alt"/>
 	<text name="user_details">
 		Dies ist meine Second Life-Beschreibung und ich finde sie wirklich gut! Meine Beschreibung ist deshalb so lang, weil ich gerne rede.
diff --git a/indra/newview/skins/default/xui/de/inspect_group.xml b/indra/newview/skins/default/xui/de/inspect_group.xml
index badb47bf08..d85ca7ce4d 100644
--- a/indra/newview/skins/default/xui/de/inspect_group.xml
+++ b/indra/newview/skins/default/xui/de/inspect_group.xml
@@ -16,9 +16,6 @@
 	<string name="YouAreMember">
 		Sie sind Mitglied
 	</string>
-	<text name="group_name">
-		Grumpitys schlecht gelaunte Elche
-	</text>
 	<text name="group_subtitle">
 		123 Mitglieder
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_activeim_row.xml b/indra/newview/skins/default/xui/de/panel_activeim_row.xml
deleted file mode 100644
index 84272752cf..0000000000
--- a/indra/newview/skins/default/xui/de/panel_activeim_row.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_activeim_row">
-	<text name="contact_name">
-		Grumpity ProductEngine
-	</text>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_chat_header.xml b/indra/newview/skins/default/xui/de/panel_chat_header.xml
index babbff3132..7916bf5155 100644
--- a/indra/newview/skins/default/xui/de/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/de/panel_chat_header.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="im_header" name="im_header">
-	<text_editor name="user_name" value="Ericag Vader"/>
 	<text name="time_box" value="23:30"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml
index be124050e8..03974e7f7f 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_profile.xml
@@ -29,11 +29,7 @@
 				<text name="display_name_label" value="Anzeigename:"/>
 				<text name="solo_username_label" value="Benutzername:"/>
 				<button name="set_name" tool_tip="Anzeigenamen festlegen"/>
-				<text name="solo_user_name" value="Hamilton Hitchings"/>
-				<text name="user_name" value="Hamilton Hitchings"/>
-				<text name="user_name_small" value="Hamilton Hitchings"/>
 				<text name="user_label" value="Benutzername:"/>
-				<text name="user_slid" value="hamilton.linden"/>
 				<panel name="lifes_images_panel">
 					<panel name="second_life_image_panel">
 						<text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 4e3a304609..5f323d80dd 100644
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -10,7 +10,7 @@
 		Einige der ausgewählten Einwohner sind bereits Gruppenmitglieder und haben aus diesem Grund keine Einladung erhalten.
 	</panel.string>
 	<text name="help_text">
-		Sie können mehrere Einwohner Ihre Gruppe einladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.
+		Sie können mehrere Einwohner in Ihre Gruppe einladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.
 	</text>
 	<button label="Einwohnerliste öffnen" name="add_button" tool_tip=""/>
 	<name_list name="invitee_list" tool_tip="Halten Sie zur Mehrfachauswahl die Strg-Taste gedrückt und klicken Sie auf die Namen."/>
diff --git a/indra/newview/skins/default/xui/de/panel_instant_message.xml b/indra/newview/skins/default/xui/de/panel_instant_message.xml
index 1433552c15..372def78ca 100644
--- a/indra/newview/skins/default/xui/de/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/de/panel_instant_message.xml
@@ -4,7 +4,6 @@
 		6
 	</string>
 	<panel label="im_header" name="im_header">
-		<text name="user_name" value="Erica Vader"/>
 		<text name="time_box" value="23:30"/>
 	</panel>
 	<button label="Antworten" name="reply"/>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_view.xml b/indra/newview/skins/default/xui/de/panel_profile_view.xml
index b44c128000..7e93bd1ede 100644
--- a/indra/newview/skins/default/xui/de/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile_view.xml
@@ -10,10 +10,8 @@
 	<text name="solo_username_label" value="Benutzername:"/>
 	<text name="status" value="Online"/>
 	<text name="user_name_small" value="Dieser Name ist ein ganz außerordentlich langer Name"/>
-	<text name="user_name" value="Jack Linden"/>
 	<button name="copy_to_clipboard" tool_tip="In Zwischenablage kopieren"/>
 	<text name="user_label" value="Benutzername:"/>
-	<text name="user_slid" value="jack.linden"/>
 	<tab_container name="tabs" tab_min_width="60">
 		<panel label="PROFIL" name="panel_profile"/>
 		<panel label="AUSWAHL" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 6474576c0f..7b46ee7c9b 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -48,15 +48,9 @@
 		<text name="CreatorNameLabel">
 			Ersteller:
 		</text>
-		<text name="Creator Name">
-			Erica Linden
-		</text>
 		<text name="Owner:">
 			Eigentümer:
 		</text>
-		<text name="Owner Name">
-			Erica Linden
-		</text>
 		<text name="Group_label">
 			Gruppe:
 		</text>
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index acab7498fb..6e985e0476 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -220,9 +220,10 @@
              layout="topleft"
              left_pad="2"
              name="OwnerText"
+             translate="false"
              use_ellipses="true" 
              width="360">
-                Leyla Linden
+                TestString PleaseIgnore
             </text>
              <button
      follows="right"
@@ -260,8 +261,10 @@
              left_pad="2"
              layout="topleft"
              name="GroupText"
+             translate="false"
              width="240">
-Leyla Linden               </text>
+                TestString PleaseIgnore
+            </text>
                  <button
      follows="right"
      height="23"
@@ -1405,6 +1408,10 @@ Only large parcels can be listed in search.
                  name="item11"
                  value="shopping" />
                 <combo_box.item
+                 label="Rental"
+                 name="item13"
+                 value="rental" />
+                <combo_box.item
                  label="Other"
                  name="item12"
                  value="other" />
@@ -1462,6 +1469,10 @@ Only large parcels can be listed in search.
                  name="item11"
                  value="shopping" />
                 <combo_box.item
+                 label="Rental"
+                 name="item13"
+                 value="rental" />
+                <combo_box.item
                  label="Other"
                  name="item12"
                  value="other" />
@@ -1638,16 +1649,6 @@ Only large parcels can be listed in search.
              name="set_media_url"
              width="70"
              top_delta="0"/>
-            <check_box
-             follows="top|left"
-             height="16"
-             label="Hide URL"
-             layout="topleft"
-             left="110"
-             name="hide_media_url"
-             tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types."
-             width="50"
-             top_pad="5"/>
             <text
              type="string"
              length="1"
@@ -1825,15 +1826,6 @@ Only large parcels can be listed in search.
              top_delta="0"
              right="-15"
              select_on_focus="true" />
-			<check_box
-             height="16"
-             label="Hide URL"
-             layout="topleft"
-             name="hide_music_url"
-			 tool_tip="Checking this option will hide the music url to any non-authorized viewers of this parcel information."
-			 left_delta="10"
-             top_pad="5"
-             width="292" /> 
             <text
              type="string"
              length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 29f09dd0b2..0cf07926c2 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -106,9 +106,10 @@
      left_delta="78"
      name="LabelCreatorName"
      top_delta="0"
+     translate="false"
      use_ellipses="true" 
      width="170">
-        Nicole Linden
+        TestString PleaseIgnore
     </text>
     <button
      follows="top|right"
@@ -140,9 +141,10 @@
      left_delta="78"
      name="LabelOwnerName"
      top_delta="0"
+     translate="false"
      use_ellipses="true"
      width="170">
-      Thrax Linden
+      TestString PleaseIgnore
     </text>
     <button
      follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 0b241a9796..73190a05ca 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -248,30 +248,53 @@
 			function="BuildTool.commitRadioEdit"/>
     </radio_group>
     <check_box
-     left="10"
+     left="5"
      follows="left|top"
      height="28"
 	 control_name="EditLinkedParts"
      label="Edit linked"
      layout="topleft"
      name="checkbox edit linked parts"
-     top_pad="2">
+     top_pad="-10">
 		  <check_box.commit_callback
 			function="BuildTool.selectComponent"/>
 	</check_box>
 
-   <text
-   text_color="LtGray_50"
-   follows="top|left"
-   halign="left"
-   left="13"
-   name="RenderingCost"
-   tool_tip="Shows the rendering cost calculated for this object"
-   top_pad="0"
-   type="string"
-   width="100">
-   þ: [COUNT]
-   </text>
+   <button
+     follows="left|top"
+     height="23"
+     label="Link"
+     top_pad="2"
+     layout="topleft"
+     left="5"
+     name="link_btn"
+     width="50">
+	  <button.commit_callback
+	     function="BuildTool.LinkObjects"/>
+    </button>
+    <button
+     follows="left|top"
+     height="23"
+     label="Unlink"
+     layout="topleft"
+     left_pad="2"
+     name="unlink_btn"
+     width="50">
+	  <button.commit_callback
+	     function="BuildTool.UnlinkObjects"/>
+    </button>
+    <text
+	   text_color="LtGray_50"
+	   follows="top|left"
+	   halign="left"
+	   left_pad="3"
+	   name="RenderingCost"
+	   tool_tip="Shows the rendering cost calculated for this object"
+	   top_delta="11"
+	   type="string"
+	   width="100">
+	   þ: [COUNT]
+	   </text>
 	<check_box
      control_name="ScaleUniform"
      height="19"
@@ -299,7 +322,7 @@
      layout="topleft"
      left="143"
      name="checkbox stretch textures"
-     top_pad="7"
+     top_pad="-6"
      width="134" />
    <check_box
      control_name="SnapEnabled"
@@ -960,10 +983,11 @@
              layout="topleft"
              name="Creator Name"
              top_delta="0"
+             translate="false"
              width="190"
              word_wrap="true"
              use_ellipses="true">
-                Mrs. Esbee Linden (esbee.linden)
+                TestString PleaseIgnore (please.ignore)
             </text>
             <text
              type="string"
@@ -987,10 +1011,11 @@
              name="Owner Name"
              left_pad="0"
              top_delta="0"
+             translate="false"
              width="190"
              word_wrap="true"
              use_ellipses="true">
-                Mrs. Erica "Moose" Linden (erica.linden)
+                TestString PleaseIgnore (please.ignore)
             </text>
            <text
              type="string"
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 853d5f8735..bd9e367d1f 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -40,10 +40,11 @@
      name="user_name_small"
      top="7"
      text_color="White"
+     translate="false"
      use_ellipses="true"
      word_wrap="true"
     visible="false" 
-     value="Grumpity ProductEngine with a long name"
+     value="TestString PleaseIgnore"
      width="185" />
    <text
     follows="top|left"
@@ -53,8 +54,9 @@
     name="user_name"
     top="10"
     text_color="White"
+    translate="false"
     use_ellipses="true"
-    value="Grumpity ProductEngine"
+    value="TestString PleaseIgnore"
     width="190" />
    <text
      follows="top|left"
@@ -63,7 +65,8 @@
      name="user_slid"
      font="SansSerifSmallBold"
      text_color="EmphasisColor"
-     value="james.linden"
+     translate="false"
+     value="teststring.pleaseignore"
      width="185"
      use_ellipses="true" />
     <text
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index bcdb63228d..324ff3eabd 100644
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
@@ -28,10 +28,11 @@
      name="group_name"
      top="10"
      text_color="White"
+     translate="false"
      use_ellipses="true"
      width="175"
      word_wrap="false">
-    Grumpity&apos;s Grumpy Group of Moose
+    TestString PleaseIgnore
   </text>
   <text
    follows="all"
diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
index 5beafef4e4..1b55fa4fd3 100644
--- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
@@ -9,6 +9,18 @@
  visible="false"
  width="128">
     <menu_item_check
+         label="Voice Enabled"
+         layout="topleft"
+         name="EnableVoiceChat">
+           <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="EnableVoiceChat" /> 
+             <menu_item_check.on_check
+             function="CheckControl"
+             parameter="EnableVoiceChat" />
+    </menu_item_check>
+    <menu_item_separator/>
+    <menu_item_check
          label="Gesture button"
          layout="topleft"
          name="ShowGestureButton">
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
index 72f41c62f4..1d8bfa0672 100644
--- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
@@ -65,6 +65,7 @@
     speaker.visible="false">
   </chiclet_im_adhoc>
 	<text
+	    translate="false"
 		type="string"
 		name="contact_name"
 		layout="topleft"
@@ -76,7 +77,7 @@
 		follows="right|left"
 		use_ellipses="true"
 		font="SansSerifBold">
-    Grumpity ProductEngine
+    TestString PleaseIgnore
   </text>
   <button
     top="10"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 013a8090f7..a92cc886e7 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -45,11 +45,11 @@
          min_width="214"
          height="28" 
          mouse_opaque="false"
-		 name="chat_bar_layout_panel"
+         name="chat_bar_layout_panel"
          user_resize="true"
-         width="308" >
+         width="310" >
           <panel
-         name="chat_bar"
+            name="chat_bar"
             filename="panel_nearby_chat_bar.xml"
             left="0"
             height="28"
@@ -60,11 +60,30 @@
           />
         </layout_panel>
         <!--
-        There is resize bar between chatbar and Speak button. It has 2px width (is is set as 2*UIResizeBarOverlap)
+         This 5px Panel is an indicator of where the resize handle is.
+         The panel provides a gap between the resize handle icon and a button to the right.  
         -->
         <layout_panel
          auto_resize="false"
-         follows="right"
+         layout="topleft"
+         max_width="5" 
+         min_width="5"
+         name="chat_bar_resize_handle_panel"
+         user_resize="false"
+         width="5">
+            <icon
+             follows="top|right"
+             height="25"
+             image_name="ChatBarHandle"
+             layout="topleft"
+             left="-7"
+             name="resize_handle"
+             top="4"
+             width="5" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
          height="28"
          layout="topleft"
          min_height="28"
@@ -72,13 +91,13 @@
          mouse_opaque="false"
          name="speak_panel"
          top_delta="0"
-         user_resize="true"
-         width="110">
+         user_resize="false"
+         width="108">
             <talk_button
              follows="left|right"
              height="23"
              layout="topleft"
-             left="2"
+             left="0"
              name="talk"
              top="5"
              width="105">
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 17e8d4d2df..2645d472f9 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -35,9 +35,10 @@
       text_color="white"
       bg_readonly_color="black"
       top="0"
+      translate="false"
       use_ellipses="true"
       valign="bottom" 
-      value="Ericag Vader" />
+      value="TestString PleaseIgnore" />
   <text
     allow_scroll="false"
     font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 37265d65f1..442eb8c28d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -127,7 +127,8 @@
        name="solo_user_name"
        text_color="white"
        top_delta="3"
-       value="Hamilton Hitchings"
+       translate="false"
+       value="TestString PleaseIgnore"
        use_ellipses="true"
        visible="false"
        width="275" />
@@ -140,7 +141,8 @@
        name="user_name"
        text_color="white"
        top_delta="0"
-       value="Hamilton Hitchings"
+       translate="false"
+       value="TestString PleaseIgnore"
        use_ellipses="true"
        visible="true"
        width="250" />
@@ -153,7 +155,8 @@
        name="user_name_small"
        text_color="white"
        top_delta="-4"
-       value="Hamilton Hitchings"
+       translate="false"
+       value="TestString PleaseIgnore"
        use_ellipses="true"
        visible="false"
        wrap="true"
@@ -177,8 +180,9 @@
        text_color="EmphasisColor"
         font="SansSerifBold"
        top_delta="-2"
+       translate="false"
        use_ellipses="true" 
-       value="hamilton.linden"
+       value="teststring.pleaseignore"
        wrap="true" 
        width="205" />
      <panel
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 70b96ca5eb..38b680ba86 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -21,7 +21,7 @@ Hover your mouse over the options for more help.
     </panel.string>
    <panel
       name="group_info_top"
-      follows="top|left"
+      follows="top|left|right"
       top="0"
       left="0"
       height="129"
@@ -43,7 +43,7 @@ Hover your mouse over the options for more help.
       font="SansSerifSmall"
       text_color="White_50"
       width="190"
-      follows="top|left"
+      follows="top|left|right"
       layout="topleft"
       mouse_opaque="false"
      type="string"
@@ -55,7 +55,7 @@ Hover your mouse over the options for more help.
       Founder:
     </text>
      <text
-      follows="left|top"
+      follows="left|top|right"
      height="16"
      layout="topleft"
      left_delta="-2"
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 021cf00d03..46c1add739 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -65,8 +65,9 @@
          name="user_name"
          text_color="white"
          top="8"
+         translate="false"
          use_ellipses="true"
-         value="Erica Vader"
+         value="TestString PleaseIgnore"
          width="205" />
 	 <!-- TIME STAMP -->
         <text
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 96633cb5b4..0df9aa2868 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -46,7 +46,7 @@
    label="Filter Inventory"
    layout="topleft"
    left="10"
-   max_length="300"
+   max_length_chars="300"
    name="inventory search editor"
    top="18"
    width="303" />
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 26efe783f8..2ad2416179 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -127,9 +127,9 @@
                          label="Wear"
                          layout="topleft"
                          name="wear_btn"
-                         left="0"
+                         left="1"
                          top="0"
-                         width="147" />
+                         width="146" />
 			    </layout_panel>
 			</layout_stack>
    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index f423dbb91c..daf571297f 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -214,10 +214,9 @@ background_visible="true"
 						<menu_button
 				         follows="bottom|left|right"
 				         height="23"
-                         image_disabled="ComboButton_Off"
-                         image_unselected="ComboButton_Off"
-                         image_pressed="ComboButton_Off"
-                         image_pressed_selected="ComboButton_Off"
+						 image_disabled="ComboButton_UpOff"
+						 image_unselected="ComboButton_UpOff"
+						 image_selected="ComboButton_UpSelected"
 				         layout="topleft"
 						 mouse_opaque="false"
 				         name="overflow_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index c553a3aba0..646875b52e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -83,8 +83,9 @@
    left="45"
    name="user_name"
    text_color="LtGray"
+   translate="false"
    top="25"
-   value="Jack Linden"
+   value="TestString PleaseIgnore"
    visible="true"
    use_ellipses="true"
    width="258" /> 
@@ -118,8 +119,9 @@
    text_color="EmphasisColor"
    font="SansSerifBold"
    top_delta="-2"
+   translate="false"
    use_ellipses="true"
-   value="jack.linden"
+   value="teststring.pleaseignore"
    width="195" 
    wrap="true "/>
   <tab_container
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index e2b3d81bf6..c2394a3fa2 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -168,9 +168,10 @@
      left_pad="0"
              name="Creator Name"
 		     top_delta="0"
+		     translate="false"
          use_ellipses="true" 
 		     width="225">
-	        Erica Linden
+	        TestString PleaseIgnore
 	     </text>
 	    <text
 			 type="string"
@@ -193,9 +194,10 @@
 			    left_pad="0"
 			    name="Owner Name"
 			    top_delta="0"
+			    translate="false"
           use_ellipses="true" 
 			    width="225">
-			    Erica Linden
+			    TestString PleaseIgnore
 	     </text>
 	    	    <text
 			 type="string"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4b871343e2..b7bf2526ab 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2372,6 +2372,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<!--<string name="Shopping">Shopping</string>	-->
 	<string name="Stage">Stage</string>
 	<string name="Other">Other</string>
+	<string name="Rental">Rental</string>
 	<string name="Any">Any</string>
 	<string name="You">You</string>
 
@@ -3427,4 +3428,13 @@ Abuse Report</string>
   <string name="Z">Z</string>
   <!-- Key names end -->
 
+  <!-- llviewerwindow -->
+  <string name="BeaconParticle">Viewing particle beacons (blue)</string>
+  <string name="BeaconPhysical">Viewing physical object beacons (green)</string>
+  <string name="BeaconScripted">Viewing scripted object beacons (red)</string>
+  <string name="BeaconScriptedTouch">Viewing scripted object with touch function beacons (red)</string>
+  <string name="BeaconSound">Viewing sound beacons (yellow)</string>
+  <string name="BeaconMedia">Viewing media beacons (white)</string>
+  <string name="ParticleHiding">Hiding Particles</string>
+
   </strings>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index be5b5d011c..3f50437c13 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -87,15 +87,9 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text name="Owner:">
 				Propietario:
 			</text>
-			<text name="OwnerText">
-				Leyla Linden
-			</text>
 			<text name="Group:">
 				Grupo:
 			</text>
-			<text name="GroupText">
-				Leyla Linden
-			</text>
 			<button label="Configurar" name="Set..."/>
 			<check_box label="Permitir transferir al grupo" name="check deed" tool_tip="Un oficial del grupo puede transferir este terreno al grupo. El terreno será apoyado por el grupo en sus asignaciones de terreno."/>
 			<button label="Transferir" name="Deed..." tool_tip="Sólo si es usted un oficial del grupo seleccionado puede transferir terreno."/>
@@ -398,7 +392,6 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 			</text>
 			<line_editor left="97" name="media_url"/>
 			<button label="Definir" name="set_media_url"/>
-			<check_box label="Ocultar la URL del media" left="97" name="hide_media_url" tool_tip="Marcando esta opción esconderá en la información de esta parcela -a quien no esté autorizado a verla- la URL del media. Note que esto no está disponible para HTML."/>
 			<text name="Description:">
 				Descripción:
 			</text>
@@ -430,7 +423,6 @@ los media:
 			<text name="MusicURL:">
 				URL de música:
 			</text>
-			<check_box label="Ocultar la URL" name="hide_music_url" tool_tip="Al marcar esta opción se ocultará la URL de la música a quien no esté autorizado a ver la información de esta parcela."/>
 			<text name="Sound:">
 				Sonido:
 			</text>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
index 5746688962..bf84c3d808 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
@@ -24,16 +24,10 @@
 	<text name="LabelCreatorTitle">
 		Creador:
 	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
 	<button label="Perfil..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Propietario:
 	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
 	<button label="Perfil..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Adquirido:
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index d85b43b7e8..e2ff4a25ce 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -170,15 +170,9 @@
 			<text name="Creator:">
 				Creador:
 			</text>
-			<text name="Creator Name">
-				Dª Esbee Linden (esbee.linden)
-			</text>
 			<text name="Owner:">
 				Propietario:
 			</text>
-			<text name="Owner Name">
-				Dª Erica &quot;Moose&quot; Linden (erica.linden)
-			</text>
 			<text name="Group:">
 				Grupo:
 			</text>
diff --git a/indra/newview/skins/default/xui/es/inspect_avatar.xml b/indra/newview/skins/default/xui/es/inspect_avatar.xml
index 119f252db2..1d70fa6a90 100644
--- a/indra/newview/skins/default/xui/es/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/es/inspect_avatar.xml
@@ -10,8 +10,6 @@
 	<string name="Details">
 		[SL_PROFILE]
 	</string>
-	<text name="user_name_small" value="Grumpity ProductEngine con un nombre demasiado largo"/>
-	<text name="user_slid" value="james.linden"/>
 	<text name="user_details">
 		Ésta es mi descripción de Second Life que, por cierto, me encanta. Pero, por lo que sea, me he enrollado más de la cuenta y la descripción es larguísima.
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
index 56d03dccc2..8e5e09cfec 100644
--- a/indra/newview/skins/default/xui/es/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
@@ -25,11 +25,7 @@
 				<text name="display_name_label" value="Nombre mostrado:"/>
 				<text name="solo_username_label" value="Nombre de usuario:"/>
 				<button name="set_name" tool_tip="Configurar nombre mostrado"/>
-				<text name="solo_user_name" value="Hamilton Hitchings"/>
-				<text name="user_name" value="Hamilton Hitchings"/>
-				<text name="user_name_small" value="Hamilton Hitchings"/>
 				<text name="user_label" value="Nombre de usuario:"/>
-				<text name="user_slid" value="hamilton.linden"/>
 				<panel name="lifes_images_panel">
 					<icon label="" name="2nd_life_edit_icon" tool_tip="Pulsa para elegir una imagen"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_view.xml b/indra/newview/skins/default/xui/es/panel_profile_view.xml
index a11fc31607..cb374dee52 100644
--- a/indra/newview/skins/default/xui/es/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/es/panel_profile_view.xml
@@ -10,10 +10,8 @@
 	<text name="solo_username_label" value="Nombre de usuario:"/>
 	<text name="status" value="Conectado/a"/>
 	<text name="user_name_small" value="Jack, ¿has visto esto? Es un nombre larguísimo."/>
-	<text name="user_name" value="Jack Linden"/>
 	<button name="copy_to_clipboard" tool_tip="Copiar al portapapeles"/>
 	<text name="user_label" value="Nombre de usuario:"/>
-	<text name="user_slid" value="jack.linden"/>
 	<tab_container name="tabs">
 		<panel label="PERFIL" name="panel_profile"/>
 		<panel label="DESTACADOS" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
index 0a5d7c2786..06f4fffacf 100644
--- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
@@ -27,8 +27,8 @@
 	</text_editor>
 	<button label="Cambiar" name="reset_covenant"/>
 	<text name="covenant_help_text">
-		Los cambios en el contrato se mostrarán en todas las parcelas
-      del estado.
+		Los cambios en el contrato se mostrarán en todas las parcelas 
+del estado.
 	</text>
 	<text bottom_delta="-31" name="covenant_instructions">
 		Arrastra y suelta una nota para cambiar el contrato de este estado.
@@ -73,7 +73,8 @@
 		El terreno comprado en esta región no se podrá revender.
 	</string>
 	<string name="can_change">
-		El terreno comprado en esta región se podrá unir o subdividir.
+		El terreno comprado en esta región se podrá unir o 
+subdividir.
 	</string>
 	<string name="can_not_change">
 		El terreno comprado en esta región no se podrá unir ni
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index e6d9e28aff..bd814ecc66 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -48,15 +48,9 @@
 		<text name="CreatorNameLabel">
 			Creador:
 		</text>
-		<text name="Creator Name">
-			Erica Linden
-		</text>
 		<text name="Owner:">
 			Propietario:
 		</text>
-		<text name="Owner Name">
-			Erica Linden
-		</text>
 		<text name="Group_label">
 			Grupo:
 		</text>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 19adf29d29..df40a2b6b4 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -1692,7 +1692,7 @@
 	<string name="RegionNoCovenantOtherOwner">
 		No se ha aportado un contrato para este estado. El terreno de este estado lo vende el propietario del estado, no Linden Lab.  Por favor, contacta con ese propietario para informarte sobre la venta.
 	</string>
-	<string name="covenant_last_modified" value="Última modificación:"/>
+	<string name="covenant_last_modified" value="Última modificación: "/>
 	<string name="none_text" value="(no hay)"/>
 	<string name="never_text" value=" (nunca)"/>
 	<string name="GroupOwned">
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index b0ef1cf8df..6e6409725f 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -88,15 +88,9 @@
 			<text name="Owner:">
 				Propriétaire :
 			</text>
-			<text name="OwnerText">
-				Leyla Linden
-			</text>
 			<text name="Group:">
 				Groupe :
 			</text>
-			<text name="GroupText">
-				Leyla Linden
-			</text>
 			<button label="Choisir" label_selected="Définir..." name="Set..."/>
 			<check_box label="Autoriser la cession au groupe" name="check deed" tool_tip="Un officier du groupe peut céder ce terrain à ce groupe, afin qu&apos;il soit pris en charge par l&apos;allocation de terrains du groupe."/>
 			<button label="Céder" label_selected="Céder..." name="Deed..." tool_tip="Vous ne pouvez céder le terrain que si vous avez un rôle d&apos;officier dans le groupe sélectionné."/>
@@ -403,7 +397,6 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			</text>
 			<line_editor left="97" name="media_url"/>
 			<button label="Choisir" name="set_media_url"/>
-			<check_box label="Masquer l&apos;URL" left="97" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL du média. Cette option n&apos;est pas disponible pour les fichiers HTML."/>
 			<text name="Description:">
 				Description :
 			</text>
@@ -435,7 +428,6 @@ texture :
 				URL de la 
 musique :
 			</text>
-			<check_box label="Masquer l&apos;URL" name="hide_music_url" tool_tip="Si vous cochez cette option, l&apos;URL de musique sera masquée et invisible pour tous les utilisateurs non autorisés des informations de cette parcelle."/>
 			<text name="Sound:">
 				Son :
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index 29b61fc98d..f2eb3cb6bc 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -24,16 +24,10 @@
 	<text name="LabelCreatorTitle">
 		Créateur :
 	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
 	<button label="Profil..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Propriétaire :
 	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
 	<button label="Profil..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Acquis :
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 46a27e960c..01274b4cbc 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -170,15 +170,9 @@
 			<text name="Creator:">
 				Créateur :
 			</text>
-			<text name="Creator Name">
-				Mrs. Esbee Linden (esbee.linden)
-			</text>
 			<text name="Owner:">
 				Propriétaire :
 			</text>
-			<text name="Owner Name">
-				Mrs. Erica &quot;Moose&quot; Linden (erica.linden)
-			</text>
 			<text name="Group:">
 				Groupe :
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/inspect_avatar.xml b/indra/newview/skins/default/xui/fr/inspect_avatar.xml
index f34ca1f8dd..553646f8e9 100644
--- a/indra/newview/skins/default/xui/fr/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/inspect_avatar.xml
@@ -10,9 +10,6 @@
 	<string name="Details">
 		[SL_PROFILE]
 	</string>
-	<text name="user_name_small" value="Grumpity ProductEngine with a long name"/>
-	<text name="user_name" value="Grumpity ProductEngine"/>
-	<text name="user_slid" value="james.linden"/>
 	<text name="user_subtitle" value="11 mois, 3 jours"/>
 	<text name="user_details">
 		This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot
diff --git a/indra/newview/skins/default/xui/fr/inspect_group.xml b/indra/newview/skins/default/xui/fr/inspect_group.xml
index 4519c380c5..e8c528c1ac 100644
--- a/indra/newview/skins/default/xui/fr/inspect_group.xml
+++ b/indra/newview/skins/default/xui/fr/inspect_group.xml
@@ -16,9 +16,6 @@
 	<string name="YouAreMember">
 		Vous êtes membre
 	</string>
-	<text name="group_name">
-		Groupe grognon des Orignaux Grumpity
-	</text>
 	<text name="group_subtitle">
 		123 membres
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_activeim_row.xml b/indra/newview/skins/default/xui/fr/panel_activeim_row.xml
deleted file mode 100644
index 84272752cf..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_activeim_row.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_activeim_row">
-	<text name="contact_name">
-		Grumpity ProductEngine
-	</text>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_chat_header.xml b/indra/newview/skins/default/xui/fr/panel_chat_header.xml
index babbff3132..7916bf5155 100644
--- a/indra/newview/skins/default/xui/fr/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/fr/panel_chat_header.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="im_header" name="im_header">
-	<text_editor name="user_name" value="Ericag Vader"/>
 	<text name="time_box" value="23:30"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
index ef65d2fe24..9e63c88221 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
@@ -29,11 +29,7 @@
 				<text name="display_name_label" value="Nom d&apos;affichage :"/>
 				<text name="solo_username_label" value="Nom d&apos;utilisateur :"/>
 				<button name="set_name" tool_tip="Définir un nom d&apos;affichage"/>
-				<text name="solo_user_name" value="Hamilton Hitchings"/>
-				<text name="user_name" value="Hamilton Hitchings"/>
-				<text name="user_name_small" value="Hamilton Hitchings"/>
 				<text name="user_label" value="Nom d&apos;utilisateur :"/>
-				<text name="user_slid" value="hamilton.linden"/>
 				<panel name="lifes_images_panel">
 					<panel name="second_life_image_panel">
 						<text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_instant_message.xml b/indra/newview/skins/default/xui/fr/panel_instant_message.xml
index bf3720f411..305d2d853c 100644
--- a/indra/newview/skins/default/xui/fr/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/fr/panel_instant_message.xml
@@ -4,7 +4,6 @@
 		6
 	</string>
 	<panel label="im_header" name="im_header">
-		<text name="user_name" value="Erica Vader"/>
 		<text name="time_box" value="23:30"/>
 	</panel>
 	<button label="Répondre" name="reply"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_view.xml b/indra/newview/skins/default/xui/fr/panel_profile_view.xml
index 0447618420..76ba44e899 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile_view.xml
@@ -10,10 +10,8 @@
 	<text name="solo_username_label" value="Nom d&apos;utilisateur :"/>
 	<text name="status" value="En ligne"/>
 	<text name="user_name_small" value="Jack oh look at me this is a super duper long name"/>
-	<text name="user_name" value="Jack Linden"/>
 	<button name="copy_to_clipboard" tool_tip="Copier dans le presse-papiers"/>
 	<text name="user_label" value="Nom d&apos;utilisateur :"/>
-	<text name="user_slid" value="jack.linden"/>
 	<tab_container name="tabs">
 		<panel label="PROFIL" name="panel_profile"/>
 		<panel label="FAVORIS" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index c8e76118a1..bd8a39fe16 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -48,15 +48,9 @@
 		<text name="CreatorNameLabel">
 			Créateur :
 		</text>
-		<text name="Creator Name">
-			Erica Linden
-		</text>
 		<text name="Owner:">
 			Propriétaire :
 		</text>
-		<text name="Owner Name">
-			Erica Linden
-		</text>
 		<text name="Group_label">
 			Groupe :
 		</text>
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index d6834fa70a..186ed59e36 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -87,15 +87,11 @@ Vai al menu Mondo &gt; Informazioni sul terreno oppure seleziona un altro appezz
 			<text name="Owner:">
 				Proprietario:
 			</text>
-			<text left="119" name="OwnerText" width="227">
-				Leyla Linden
-			</text>
+			<text left="119" name="OwnerText" width="227"/>
 			<text name="Group:">
 				Gruppo:
 			</text>
-			<text left="119" name="GroupText" width="227">
-				Leyla Linden
-			</text>
+			<text left="119" name="GroupText" width="227"/>
 			<button label="Imposta" name="Set..."/>
 			<check_box label="Permetti cessione al gruppo" left="119" name="check deed" tool_tip="Un funzionario del gruppo può cedere questa terra al gruppo stesso cosicchè essa sarà  supportata  dalle terre del gruppo."/>
 			<button label="Cedi" name="Deed..." tool_tip="Puoi solo offrire terra se sei un funzionario del gruppo selezionato."/>
@@ -401,7 +397,6 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 			</text>
 			<line_editor left="97" name="media_url"/>
 			<button label="Imposta" name="set_media_url"/>
-			<check_box label="Nascondi indirizzo URL Media" left="94" name="hide_media_url" tool_tip="Abilitando questa opzione nasconderai l&apos;indirizzo url dei media a tutte le persone non autorizzate a vedere le informazioni del terreno. Nota che questo non è disponibile per contenuto di tipo HTML."/>
 			<text name="Description:">
 				Descrizione:
 			</text>
@@ -433,7 +428,6 @@ Media:
 			<text name="MusicURL:">
 				URL musica:
 			</text>
-			<check_box label="Nascondi URL" name="hide_music_url" tool_tip="Questa opzione consente di nascondere l&apos;url della musica a chi non è autorizzato a visionare le informazioni di questo parcel."/>
 			<text name="Sound:">
 				Audio:
 			</text>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
index d3dc4d7eae..7ed3486b9b 100644
--- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
@@ -24,16 +24,10 @@
 	<text name="LabelCreatorTitle">
 		Creatore:
 	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
 	<button label="Profilo..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		proprietario:
 	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
 	<button label="Profilo..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Acquisito:
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index a8c985cb12..fc13e09d1c 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -171,15 +171,9 @@
 			<text name="Creator:">
 				Creatore:
 			</text>
-			<text name="Creator Name">
-				Thrax Linden
-			</text>
 			<text name="Owner:">
 				Proprietario:
 			</text>
-			<text name="Owner Name">
-				Thrax Linden
-			</text>
 			<text name="Group:">
 				Gruppo:
 			</text>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_view.xml b/indra/newview/skins/default/xui/it/panel_profile_view.xml
index 20c62d4ceb..cf65aabebc 100644
--- a/indra/newview/skins/default/xui/it/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/it/panel_profile_view.xml
@@ -6,7 +6,6 @@
 	<string name="status_offline">
 		Offline
 	</string>
-	<text_editor name="user_name" value="(Caricamento in corso...)"/>
 	<text name="status" value="Online"/>
 	<tab_container name="tabs">
 		<panel label="PROFILO" name="panel_profile"/>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index 67870d9b76..cfabdc81b0 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -48,15 +48,9 @@
 		<text name="CreatorNameLabel">
 			Ideatore:
 		</text>
-		<text name="Creator Name">
-			Erica Linden
-		</text>
 		<text name="Owner:">
 			Proprietario:
 		</text>
-		<text name="Owner Name">
-			Erica Linden
-		</text>
 		<text name="Group_label">
 			Gruppo:
 		</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 2de9e781d4..eefe71c9a5 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -87,15 +87,9 @@
 			<text name="Owner:">
 				所有者：
 			</text>
-			<text name="OwnerText">
-				Leyla Linden
-			</text>
 			<text name="Group:">
 				グループ：
 			</text>
-			<text name="GroupText">
-				Leyla Linden
-			</text>
 			<button label="設定" label_selected="設定..." name="Set..."/>
 			<check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループのオフィサーはこの土地をグループに譲渡できます。グループの土地割り当てによってサポートされます。"/>
 			<button label="譲渡" label_selected="譲渡..." name="Deed..." tool_tip="選択したグループのオフィサーのみ、土地を譲渡できます。"/>
@@ -399,7 +393,6 @@
 				ホームページ：
 			</text>
 			<button label="設定" name="set_media_url"/>
-			<check_box label="URL を非表示" name="hide_media_url" tool_tip="このオプションをオンにすると、許可なしでこの区画情報にアクセスしているユーザーにはメディア URL が表示されません。 これは HTML タイプには使用できませんのでご注意ください。"/>
 			<text name="Description:">
 				説明：
 			</text>
@@ -429,7 +422,6 @@
 			<text name="MusicURL:">
 				音楽 URL：
 			</text>
-			<check_box label="URL を非表示にする" name="hide_music_url" tool_tip="このオプションにチェックを入れると、権限のない人が区画情報を見たときに音楽の URL が隠れます。"/>
 			<text name="Sound:">
 				サウンド：
 			</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index 7480b04856..725214086a 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
@@ -24,16 +24,10 @@
 	<text name="LabelCreatorTitle">
 		クリエーター
 	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
 	<button label="情報" label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		オーナー：
 	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
 	<button label="情報" label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		入手日時：
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index bbd78fb818..2272234d7a 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -170,15 +170,9 @@
 			<text name="Creator:">
 				制作者：
 			</text>
-			<text name="Creator Name">
-				Esbee Linden
-			</text>
 			<text name="Owner:">
 				所有者：
 			</text>
-			<text name="Owner Name">
-				Erica Linden
-			</text>
 			<text name="Group:">
 				グループ：
 			</text>
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
index fb4937242b..f3ea794bc7 100644
--- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
@@ -10,7 +10,6 @@
 	<string name="Details">
 		[SL_PROFILE]
 	</string>
-	<text name="user_name" value="Grumpity ProductEngine"/>
 	<text name="user_subtitle" value="11 Months, 3 days old"/>
 	<text name="user_details">
 		This is my second life description and I really think it is great.
diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml
index b461b93f65..be628befdf 100644
--- a/indra/newview/skins/default/xui/ja/inspect_group.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_group.xml
@@ -16,9 +16,6 @@
 	<string name="YouAreMember">
 		あなたはメンバーです
 	</string>
-	<text name="group_name">
-		Grumpity&apos;s Grumpy Group of Moose
-	</text>
 	<text name="group_subtitle">
 		123 メートル
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_activeim_row.xml b/indra/newview/skins/default/xui/ja/panel_activeim_row.xml
deleted file mode 100644
index 84272752cf..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_activeim_row.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_activeim_row">
-	<text name="contact_name">
-		Grumpity ProductEngine
-	</text>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
index babbff3132..7916bf5155 100644
--- a/indra/newview/skins/default/xui/ja/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="im_header" name="im_header">
-	<text_editor name="user_name" value="Ericag Vader"/>
 	<text name="time_box" value="23:30"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
index 9fd0cb3b0d..bf4cbcdc46 100644
--- a/indra/newview/skins/default/xui/ja/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
@@ -4,7 +4,6 @@
 		6
 	</string>
 	<panel label="im_header" name="im_header">
-		<text name="user_name" value="Erica Vader"/>
 		<text name="time_box" value="23:30"/>
 	</panel>
 	<button label="返信" name="reply"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_view.xml b/indra/newview/skins/default/xui/ja/panel_profile_view.xml
index 5666a93cf0..82807bc8fc 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_view.xml
@@ -6,7 +6,6 @@
 	<string name="status_offline">
 		オフライン
 	</string>
-	<text_editor name="user_name" value="（ローディング...）"/>
 	<text name="status" value="オンライン"/>
 	<tab_container name="tabs">
 		<panel label="プロフィール" name="panel_profile"/>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index ff9b5dc6aa..eb2bfa993b 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -48,15 +48,9 @@
 		<text name="CreatorNameLabel">
 			制作者：
 		</text>
-		<text name="Creator Name">
-			Erica Linden
-		</text>
 		<text name="Owner:">
 			所有者：
 		</text>
-		<text name="Owner Name">
-			Erica Linden
-		</text>
 		<text name="Group_label">
 			グループ：
 		</text>
diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml
index 4271ad5b82..d51ea1c0f8 100644
--- a/indra/newview/skins/default/xui/nl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml
@@ -23,9 +23,7 @@
 			<text name="Owner:">
 				Eigenaar:
 			</text>
-			<text name="OwnerText" left="102" width="242">
-				Leyla Linden
-			</text>
+			<text name="OwnerText" left="102" width="242"/>
 			<button label="Profiel" name="Profile..."/>
 			<text name="Group:">
 				Groep:
@@ -427,8 +425,6 @@ hebt geklikt.)
 			</text>
 			<check_box label="Automatisch schalen" name="media_auto_scale" tool_tip="Het aanvinken van deze optie zal de inhoud voor dit perceel automatisch schalen. Het kan enigszins trager zijn en de visuele kwaliteit kan iets lager zijn, maar er zal geen andere textuurschaling of uitlijning nodig zijn."/>
 			<check_box label="Herhaal media" name="media_loop" tool_tip="Speel media af in een lus. Wanneer de media klaar is met afspelen zal het herstarten vanaf het begin."/>
-			<check_box label="Verberg media URL" name="hide_media_url" tool_tip="Het aanvinken van deze optie zal de media URL verbergen voor alle niet-geautoriseerde bekijkers van de perceelinformatie. Let op: dit is niet beschikbaar voor HTML types."/>
-			<check_box label="Verberg muziek URL" name="hide_music_url" tool_tip="Het aanvinken van deze optie zal de muziek URL verbergen voor alle niet-geautoriseerde bekijkers van de perceelinformatie."/>
 			<text name="media_size" tool_tip="Grootte om webmedia weer te geven, laat op 0 staan voor standaard." width="120">
 				Media grootte:
 			</text>
diff --git a/indra/newview/skins/default/xui/nl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/nl/floater_inventory_item_properties.xml
index 63cfafab81..81a823acd4 100644
--- a/indra/newview/skins/default/xui/nl/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/nl/floater_inventory_item_properties.xml
@@ -9,16 +9,10 @@
 	<text name="LabelCreatorTitle">
 		Maker:
 	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
 	<button label="Profiel..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Eigenaar
 	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
 	<button label="Profiel..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Verworven:
diff --git a/indra/newview/skins/default/xui/nl/floater_tools.xml b/indra/newview/skins/default/xui/nl/floater_tools.xml
index 4ffe675831..98339383e4 100644
--- a/indra/newview/skins/default/xui/nl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/nl/floater_tools.xml
@@ -98,16 +98,10 @@
 			<text name="Creator:">
 				Maker:
 			</text>
-			<text name="Creator Name">
-				Thrax Linden
-			</text>
 			<button label="Profiel..." label_selected="Profiel..." name="button creator profile"/>
 			<text name="Owner:">
 				Eigenaar:
 			</text>
-			<text name="Owner Name">
-				Thrax Linden
-			</text>
 			<button label="Profiel..." label_selected="Profiel..." name="button owner profile"/>
 			<text name="Group:">
 				Groep:
diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
index 0974518a1f..b935615fcb 100644
--- a/indra/newview/skins/default/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
@@ -87,15 +87,9 @@ Idź do Świat &gt; O Posiadłości albo wybierz inną posiadłość żeby pokaz
 			<text name="Owner:">
 				Właściciel:
 			</text>
-			<text name="OwnerText">
-				Leyla Linden
-			</text>
 			<text name="Group:">
 				Grupa:
 			</text>
-			<text name="GroupText">
-				Leyla Linden
-			</text>
 			<button label="Ustaw" name="Set..."/>
 			<check_box label="Udostępnij przypisywanie na Grupę" name="check deed" tool_tip="Oficer Grupy ma prawo przepisać prawo własności Posiadłości na Grupę. Posiadłość wspierana jest przez przydziały pochodzące od członków Grupy."/>
 			<button label="Przypisz" name="Deed..." tool_tip="Prawo przypisania Posiadłości na Grupę może dokonać jedynie oficer Grupy."/>
@@ -399,7 +393,6 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki.
 				URL mediów:
 			</text>
 			<button label="Ustaw" name="set_media_url"/>
-			<check_box label="Ukryj URL mediów" name="hide_media_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów wszystkim nieautoryzowanym Rezydentom. Nie dotyczy to jednak typów HTML."/>
 			<text name="Description:">
 				Opis:
 			</text>
@@ -428,7 +421,6 @@ Mediów:
 			<check_box label="Powtórka Odtwarzania" name="media_loop" tool_tip="Odtwarzaj media z powtórką. Po wyświetleniu materialu, rozpocznie się odtwarzanie od początku."/>
 		</panel>
 		<panel label="DŹWIĘK" name="land_audio_panel">
-			<check_box label="Ukryj URL muzyki" name="hide_music_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów muzycznych w posiadłości wszystkim nieautoryzowanym Użytkownikom"/>
 			<check_box label="Rozmowy dozwolone" name="parcel_enable_voice_channel"/>
 			<check_box label="Rozmowy dozwolone (ustawione przez Majątek)" name="parcel_enable_voice_channel_is_estate_disabled"/>
 			<check_box label="Ogranicz komunikację głosową w tej Posiadłości." name="parcel_enable_voice_channel_local"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
index 1e63987585..054d74b234 100644
--- a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
@@ -24,16 +24,10 @@
 	<text name="LabelCreatorTitle">
 		Twórca:
 	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
 	<button label="Profil..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Właściciel:
 	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
 	<button label="Profil..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Nabyte:
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 7c1ced0eae..337998efc9 100644
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -173,15 +173,9 @@
 			<text name="Creator:">
 				Twórca:
 			</text>
-			<text name="Creator Name">
-				Pani Esbee Linden (esbee.linden)
-			</text>
 			<text name="Owner:">
 				Właściciel:
 			</text>
-			<text name="Owner Name">
-				Pani Erica &quot;Moose&quot; Linden (erica.linden)
-			</text>
 			<text name="Group:">
 				Grupa:
 			</text>
diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
index 1db3339352..5e982c0185 100644
--- a/indra/newview/skins/default/xui/pl/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
@@ -10,8 +10,6 @@
 	<string name="Details">
 		[SL_PROFILE]
 	</string>
-	<text name="user_name_small" value="Grumpity ProductEngine with a long name"/>
-	<text name="user_slid" value="james.linden"/>
 	<text name="user_details">
 		To jest mój opis w Second Life.
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
index c409666ec9..e6fd8b18f8 100644
--- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
@@ -25,11 +25,7 @@
 				<text name="display_name_label" value="Wyświetlana nazwa:"/>
 				<text name="solo_username_label" value="Nazwa użytkownika:"/>
 				<button name="set_name" tool_tip="Ustaw wyświetlanią nazwę."/>
-				<text name="solo_user_name" value="Hamilton Hitchings"/>
-				<text name="user_name" value="Hamilton Hitchings"/>
-				<text name="user_name_small" value="Hamilton Hitchings"/>
 				<text name="user_label" value="Nazwa użytkownika:"/>
-				<text name="user_slid" value="hamilton.linden"/>
 				<panel name="lifes_images_panel">
 					<icon label="" name="2nd_life_edit_icon" tool_tip="Kliknij aby wybrać teksturę"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_profile_view.xml b/indra/newview/skins/default/xui/pl/panel_profile_view.xml
index 3590e9222e..1fd6bc1d10 100644
--- a/indra/newview/skins/default/xui/pl/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/pl/panel_profile_view.xml
@@ -10,10 +10,8 @@
 	<text name="solo_username_label" value="Nazwa użytkownika:"/>
 	<text name="status" value="Obecnie w SL"/>
 	<text name="user_name_small" value="Jack oh look at me this is a super duper long name"/>
-	<text name="user_name" value="Jack Linden"/>
 	<button name="copy_to_clipboard" tool_tip="Kopiuj do schowka"/>
 	<text name="user_label" value="Nazwa użytkownika:"/>
-	<text name="user_slid" value="jack.linden"/>
 	<tab_container name="tabs">
 		<panel label="PROFIL" name="panel_profile"/>
 		<panel label="ULUBIONE" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
index d8cf456c64..eb8c9cdbbb 100644
--- a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
@@ -48,15 +48,9 @@
 		<text name="CreatorNameLabel">
 			Twórca:
 		</text>
-		<text name="Creator Name">
-			Erica Linden
-		</text>
 		<text name="Owner:">
 			Właściciel:
 		</text>
-		<text name="Owner Name">
-			Erica Linden
-		</text>
 		<text name="Group_label">
 			Grupa:
 		</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 3fb4bc272e..ffd1cce76c 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -87,15 +87,9 @@ Vá para o menu Mundo &gt; Sobre o terreno ou selecione outro lote para mostrar
 			<text name="Owner:">
 				Proprietário:
 			</text>
-			<text name="OwnerText">
-				Leyla Linden
-			</text>
 			<text name="Group:">
 				Grupo:
 			</text>
-			<text name="GroupText">
-				Leyla Linden
-			</text>
 			<button label="Ajustar" name="Set..."/>
 			<check_box label="Permitir doação para o grupo" name="check deed" tool_tip="Oficiais do grupo podem doar esse terreno ao grupo, passando a administração para o gestor da ilha"/>
 			<button label="Passar" name="Deed..." tool_tip="Você só pode doar o terreno se você for um dos oficiais do grupo selecionado."/>
@@ -398,7 +392,6 @@ Apenas lotes maiores podem ser listados na busca.
 			</text>
 			<line_editor left="97" name="media_url"/>
 			<button label="Definir..." label_selected="Definir..." name="set_media_url"/>
-			<check_box label="Esconder a URL da mídia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mídia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponível para tipos HTML."/>
 			<text name="Description:">
 				Descrição:
 			</text>
@@ -430,7 +423,6 @@ Mídia:
 			<text name="MusicURL:">
 				URL de música:
 			</text>
-			<check_box label="Ocultar URL" name="hide_music_url" tool_tip="Selecionar esta opção oculta o URL de música a visitantes não autorizados aos dados do terreno."/>
 			<text name="Sound:">
 				Som:
 			</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
index 8fe69c097d..8a8f1f5b34 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
@@ -24,16 +24,10 @@
 	<text name="LabelCreatorTitle">
 		Criador:
 	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
 	<button label="Perfil..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Dono:
 	</text>
-	<text name="LabelOwnerName">
-		Thrax Linden
-	</text>
 	<button label="Perfil..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Adquirido:
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index bd5fbf80d1..f90097bf22 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -170,15 +170,9 @@
 			<text name="Creator:">
 				Criador:
 			</text>
-			<text name="Creator Name">
-				Mrs. Esbee Linden (esbee.linden)
-			</text>
 			<text name="Owner:">
 				Proprietário:
 			</text>
-			<text name="Owner Name">
-				Mrs. Erica &quot;Moose&quot; Linden (erica.linden)
-			</text>
 			<text name="Group:">
 				Grupo:
 			</text>
diff --git a/indra/newview/skins/default/xui/pt/inspect_avatar.xml b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
index a95d5ff31a..a199c58c15 100644
--- a/indra/newview/skins/default/xui/pt/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
@@ -10,8 +10,6 @@
 	<string name="Details">
 		[PERFIL_SL]
 	</string>
-	<text name="user_name_small" value="Grumpity ProductEngine with a long name"/>
-	<text name="user_slid" value="james.linden"/>
 	<text name="user_details">
 		This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
index 4066842b25..0ba7382845 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
@@ -25,11 +25,7 @@
 				<text name="display_name_label" value="Nome de tela:"/>
 				<text name="solo_username_label" value="Nome de usuário:"/>
 				<button name="set_name" tool_tip="Definir nome de tela"/>
-				<text name="solo_user_name" value="Hamilton Hitchings"/>
-				<text name="user_name" value="Hamilton Hitchings"/>
-				<text name="user_name_small" value="Hamilton Hitchings"/>
 				<text name="user_label" value="Nome de usuário:"/>
-				<text name="user_slid" value="hamilton.linden"/>
 				<panel name="lifes_images_panel">
 					<icon label="" name="2nd_life_edit_icon" tool_tip="Selecione uma imagem"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index c861e29624..11a31570d1 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
@@ -6,8 +6,8 @@
 	<panel.string name="want_apply_text">
 		Deseja salvar essas mudanças?
 	</panel.string>
-	<tab_container height="164" name="roles_tab_container">
-		<panel height="148" label="MEMBROS" name="members_sub_tab" tool_tip="Membros">
+	<tab_container name="roles_tab_container">
+		<panel label="MEMBROS" name="members_sub_tab" tool_tip="Membros">
 			<panel.string name="help_text">
 				Você pode adicionar ou remover as funções designadas aos membros. Selecione vários membros, segurando a tecla Ctrl e clicando em seus nomes.
 			</panel.string>
@@ -15,15 +15,15 @@
 				[AREA] m²
 			</panel.string>
 			<filter_editor label="Filtrar por membro" name="filter_input"/>
-			<name_list bottom_delta="-105" height="104" name="member_list">
+			<name_list name="member_list">
 				<name_list.columns label="Membro" name="name"/>
 				<name_list.columns label="Doações" name="donated"/>
 				<name_list.columns label="Status" name="online"/>
 			</name_list>
-			<button label="Convidar" name="member_invite" width="165"/>
+			<button label="Convidar" name="member_invite" />
 			<button label="Ejetar" name="member_eject"/>
 		</panel>
-		<panel height="148" label="CARGOS" name="roles_sub_tab">
+		<panel label="CARGOS" name="roles_sub_tab">
 			<panel.string name="help_text">
 				Cada cargo tem um nome e uma lista das funções que membros designados podem desempenhar.
  Os membros podem ter um ou mais cargos.
@@ -36,7 +36,7 @@
 				Inv_FolderClosed
 			</panel.string>
 			<filter_editor label="Filtrar por cargo" name="filter_input"/>
-			<scroll_list bottom_delta="-104" height="104" name="role_list">
+			<scroll_list name="role_list">
 				<scroll_list.columns label="Cargo" name="name"/>
 				<scroll_list.columns label="Título" name="title"/>
 				<scroll_list.columns label="#" name="members"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_view.xml b/indra/newview/skins/default/xui/pt/panel_profile_view.xml
index d3ec9b82bc..d81ee08e6c 100644
--- a/indra/newview/skins/default/xui/pt/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/pt/panel_profile_view.xml
@@ -10,10 +10,8 @@
 	<text name="solo_username_label" value="Nome de usuário:"/>
 	<text name="status" value="Conectado"/>
 	<text name="user_name_small" value="Jack oh look at me this is a super duper long name"/>
-	<text name="user_name" value="Jack Linden"/>
 	<button name="copy_to_clipboard" tool_tip="Copiar para área de transferência"/>
 	<text name="user_label" value="Nome de usuário:"/>
-	<text name="user_slid" value="jack.linden"/>
 	<tab_container name="tabs">
 		<panel label="PERFIL" name="panel_profile"/>
 		<panel label="DESTAQUES" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index dd65810b22..8092e6c145 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -48,15 +48,9 @@
 		<text name="CreatorNameLabel">
 			Criador:
 		</text>
-		<text name="Creator Name">
-			Erica Linden
-		</text>
 		<text name="Owner:">
 			Proprietário:
 		</text>
-		<text name="Owner Name">
-			Erica Linden
-		</text>
 		<text name="Group_label">
 			Grupo:
 		</text>
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index b4043b0fd9..02d7031b81 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -1,5 +1,4 @@
 # -*- cmake -*-
-
 project(llplugintest)
 
 include(00-Common)