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

svn merge -r87877:87878 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui/maint-ui-12-qa-5 which is the last iteration of the maint-ui series of branches.  Future work will be in featurettes.

svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release

ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release

dataserver-is-deprecated

Passed QA as part of QAR-491.

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

Land store (already deployed to agni as 1.21 patches)
* Increased the available purchase area in the land store.
* Modified select pool query to take a simulator status. Now generating a new uuid for each insert into the fulfill lock table.
* Checking to make sure put-simstate returns a uuid region_id.

Other stuff (going out soon or already out)
* svn merge -r87339 svn/linden/branches/havok4/havok4-6 (Block creation of mega prims.)
* Fix for the mega prim fix to also block 0 scale prims.
* svn merge -r 84565:86084 svn+ssh://svn.lindenlab.com/svn/linden/branches/single-ref-attach-again --> Branch_1-21-Server (Slipstream QAR-518 single ref attachments)
* Switched off indra.known_address in favor of indra_aux.known_address
* DEV-15151 check_group_land.py kills the database
* DEV-14662 - Change the current model of PREPARE/EXECUTE to directly execute the SQL (QAR-580)
* DEV-15167 Random failure with set-classified-stats

The secret word is: dataserver-is-deprecated

svn merge -r87349:87423 svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-03-merge release dataserver-is-deprecated

Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release

merge -r 86279:86925 Branch_1-20-Viewer -> release

dataserver-is-deprecated

QAR-564 - constrained fix for SEC-71

merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.

* QAR-567 Deploy user-start-migration-again login.cgi and friends to agni
* DEV-14807 dir-places and dir-classifieds web-ds calls are failing
* DEV-9962 SVC-1428: Malformed llInstantMessage() gets sent to email, stuck in queue, and spammed to email at every login
* DEV-12696 Limit the number of group_notices in a group

NOTE: merge involved renames to the following to have "nq" extension
* indra/web/dataservice/sql/sequence/cart_items/update (actual change)
* indra/web/dataservice/sql/indra/select-dir-places-parcel (which was a no-op merge)

The magic words are: dataserver-is-deprecated

Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated

QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated

Original Jira: https://jira.lindenlab.com/browse/DEV-11178 (Proposal: To rename named query files to take an extension .nq)
Sandbox Jira:  https://jira.lindenlab.com/browse/QAR-470 (Test a massive rename of named query files from being extensionless to having a .nq extension)
Merge Buildme: https://jira.lindenlab.com/browse/QAR-473

Original Code Review: BillC

merge Branch_1-20-Viewer -r 85828 : 86279 -> release

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

* QAR-522 / DEV-14318: Crash in LLSD:operator[] -- web connected? Traceback includes LLCurl::Responder::completed
* landstore-6 dataservices
* DEV-14141 - Enable avatar-properties. done 2008-05-01 14:00
* new query, for use by sl.com /lib/models/login.php
* disabling evil slave crashing query.

Also the following which has NOT been pushed into production yet
* QAR-531 DEV-14457 SEC-67 Hacked client can bypass estate access lists

Reviewed by Phoenix

Result of svn merge  -r85981:85991 svn+ssh://svn/svn/linden/branches/ssl-sanity-merge into release. QAR-487

Reviewed by Palmer

merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release

merge Branch_1-20-Viewer -r 85100 : 85278 -> release

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-404 - merge - svn merge -r 85795:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/metrics/metrics-4-release release

QAR-500 maint-viewer-5 merge

merge Branch_1-20-Viewer -r 84760 : 85100 -> release

svn merge -c85508
svn+ssh://svn.lindenlab.com/svn/linden/branches/babble-merge1-r85500

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1

merge Branch_1-20-Viewer -r 84432 : 84760 -> release

merge Branch_1-20-Viewer -r 84060 : 84432 -> release

merge Branch_1-20-Viewer -r 84060 : 84432 -> release

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84853
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/signalcrap-merge1

Includes pullout of migrate-start-location-2, webservice changes made to 1.20, DEV-7229, and other web-ds changes. Reviewed by Josh.

QAR-433 make max queued size on event queue configurable

Result of svn merge -r84383:84400 svn+ssh://svn/svn/linden/branches/migrate-start-location-2 intinto release. QAR-458