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

This is "really" the merge of everything that went out in the 1.18.2(0) viewer release.

* Tweak simulator_version script to slam all regions to the new version we're deploying

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

Fixing typo in contributor name (Fee Larsson->Feep Larsson) and removing another instance of Duckless VanDyke being
credited where he/she should not have been

svn merge --ignore-ancestry  svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131

Result of svn merge -r66742:66741 svn+ssh://svn/svn/linden/release in release to revert revision 66742 which was a merge from mp-backbone.

svn merge -r 64468:66735 svn+ssh://svn/svn/linden/branches/lookatyou/indra/newview > release/indra/newview

New mysql connection pool for Python, plus unit tests that verify that it's actually non-blocking.  Some additional behavior in saranwrap, with tests that pass. Reviewd by Donovan.

Includes voice-server-changes (0:66493)

EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392

ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)

Minor bugfixes for a line in viewer_manifest that never gets run (because of the way the SConstruct file on Linux is built).  However, it might get run in the future, so there we go.  Thanks cg for finding this.  Not reviewed.

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.

Fixed cache invalidation in simulator.cpp, llsd.php, added RFC 1123 compliant date format, and unit test for the new date function

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.

* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269

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.

(everything outside of indra, missing some file additions)

(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.

(only inside indra)

(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.

NOTE: r63705 is *not* the earliest rev# for dpo-3-bug-fix.

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

QA'd.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@65172
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-24190i-based-on-r65172

svn merge -r 65078:65118 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release

Sync up last minute patches that went into 1.18.

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.

SL-47720 Crash on startup due to SSE instructions.  Disable SSE code generation on Windows build.  This prevents global constants from being initialized with SSE instructions.  We can use the SSE code on Intel Mac (since they all support SSE) and if we enable SSE compilation for the entire Windows viewer.  Reviewed by Kelly.