QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883  svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge

QAR-1022 svn merge -r101843:102448 svn+ssh://svn.lindenlab.com/svn/linden/branches/opensource-drops/opensource-drops-4 -> release

QAR-963 svn merge -r101685:101752 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge

svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015

QAR-1016 joystick+spacenav improvements MERGE

QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release

=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .

QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar

DEV's fulfilled as part of this branch:
======================================

DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location

* Shifted common code for copy_bans.py and del_empty_estates.py into the indra library.
* Documented copy_bans.py and del_empty_estates.py.
* Added iter_chunks generator to a new module: indra.util.iterators.
* Added unit tests for indra.util.iterators.

DEV-21940 - Add five new dev grids to the viewer login panel. bharati, chandra, danu, parvati and skanda.

Reviewed by Mani.

QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge

someone added a directory to a file list in one of the prepacked libs. just ignore that use error on cleanup.

force dos drive letters to be uppercase. Patch from Alissa Sabre. vetted through release and cmake lists.

without libapr and libaprutil. Fixed.

Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC5 secu-fix to 1.21.6 release.

DEV-22360 - Interim fix for VWR-9784: Unable to upload scripts - this will be replaced later with final code, but we need to unblock release

Rebuilt x86_64 libOSMesa16, which wasn't really compiled with 16
bit/channel support, and was causing mapserver to crash on startup. Only
affects x86_64 builds.

DEV-22018 : cllsd unit test failures.  Fixed mostly by changing the Python code and the tests to look more like cllsd.

Modified the hkDebugMemory.h file: OutputDebugString(s) ==> OutputDebugStringA(s) to prevent a bad cast error in the windows debug build of the simulator.
I packaged up a new havok-4.6.1 windows binary and modified the install.xml file.

QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release

merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real)

QAR-829: svn merge -r98245:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/dev_10747_5 -> release

svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release

Merging various security fixes from Branch_1-24-Server.

Related to RequestXfer exploit:
* DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id.
* DEV-21767: Migrate RequestXfer to TCP-only
* DEV-21765: Fix RequestXfer traversal exploit
* DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities

Various fixes:
* fix for VFS memory corruption in llvfs.
* Bump server version to 1.24.9.

Landstore fixes:
* Passing locale to fulfill-order-item from region reservation fulfillment.

svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release

merge viewer_1-21 96116-97380 -> release

Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824