dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release

Backport fixes made in the production branch to the trunk now that it is live on the grid:
* DEV-14443 Launcher not producing colo prefix when looking up sim class
* DEV-10840 "/etc/init.d/backbone stop" returns before all child backbones exited; "backbone restart" results in defunct children
* DEV-12558: Able to make anyone's object shout error messages
* QAR-483 user start location migration prelude
* QAR-490 havok4-6
* Revert havok4-5/4-6 code changes causing parcel access check issues
* Revert QAR-277 sqlite-backbone
* DEV-12357 SEC-53: Script that crashes regions
* QAR-486 New proc and query for Web Classifieds Fix

QAR-431

HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.

QAR-448

Make validate_schemas show best-guess for schema script, to help build engineers

svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release

QAR-275 Parcel Media

Sam made me do it.

merge in the fix for template_verifier which avoids multiple
concurrent builds from stomping on each other.

the svn executable, default to "svn" is not set.

when executable is in a weird location...

svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release.  Finished product of QAR-134

EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release

svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release

svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release

merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.

Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://svn/svn/linden/branches/viewer-auth-server-2

Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.

export source now detects the prefix rather than assigning it based on filename. fixed up some comments to match our coding standard. added ability to set default license on export which will be useful for the next source drop. SL-56607

svn merge -r 69806:70964 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release

Merge fixes applied directly to 1.18.3 for server deploy, through the sim rollout:
* Listen on the right port for the auditor, don't rely on catch-all
* Fix XMLRPC test object channel
* Various VAT fixes
* Make update_version_files more resilient
* Add class 502/510 for new datacenter
* Teleport metrics fixes
* DB schema update

Run even if server version files are not present (e.g. if we share this outside LL with a viewer source drop). Also a little bit of variable renaming to clarify what's going on, and more verbosity when requested.

Reviewed by Josh and Don

EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release

Actual action: branched maintenance-r68118, merged in release, then copied result into release

Added tests to version manager and fixed failed tests.  Paired by rdw and Tess.

Added much more error-recovery logic to template-verifier -- e.g. it retries a few times to fetch the master from the web.  Also I changed the master to live in the system global tempdir, mostly because the build machines had a network problem and I wanted to reduce the chance of that happening.  Not reviewed, but I'm checking it in over the weekend so I can silently fix it if there's yet another weird configuration difference that breaks it on the build machines.

SL-49406: template_verifier.py requires network access to build.  Implemented a 4-hour cache so it hits the network less often overall (saving approx .5 seconds every build), and added fault tolerance for when it fails to fetch the master over the network.  It'll whine at you if it can't fetch it, but even if it can't get the master from the network and doesn't have a cached copy at all, it will still at least do a syntax check on the local template.

Replaced usage of urlopen.read(), which isn't guaranteed to return all of the downloaded bytes, with urlopen.readlines(), which (I believe) does have that guarantee.  This should fix the rash of mysteriously-failing prebuilds.  In the process, added some better error messaging about whether the local template has the parse error, or the master on the network.  Also some reorganization.  Reviewed by Tess and Leyla.

Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.

svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341  -> release

SL-38184 Make python scripts in linden/scripts run in place without PYTHONPATH or symlinks.  Reviewed with Donovan.