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.

Fixed broken Mac universal build due to missing files and bad LL_VECTORIZE ifdef for sse-skinning code.

svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software avatar rendering.  Visual Studio 2005 project file fixed pending.

reverting jakes accidental check in

Changes to make Logitech code more LL Code Standards compliant, plus remove all the SDK code and instead just used headers and an included lib that we build ourselves from the Trunk directory.

NOTE: Only a partial merge from maintenance!!!!
svn merge -r 64309:64310 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

(https://jira.lindenlab.com/browse/SL-46075)

Revert fix for SL-33506/VWR-53, which was causing SL-46205 "Head is invisible in appearance editor"

"Merged" over from release-candidate - addition of Japanese and German options in Installer language menu

Add German option to the language menu in the installer.
https://jira.lindenlab.com/browse/SL-45054

Addition of Japanese language option to the installer.
https://jira.lindenlab.com/browse/SL-45907

svn merge -r 63401:63939 svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release

NOTE: Skipped whitespace-only changes

Pick up patches committed to 1.17:
* Commented out metrics code that seems to be causing a crash.
* Adding metrics to deployed code.  added missing __hash__ function to lluuid.py, which fixes using uuid's as keys in maps
* Reverting fix for SL-25905; probably cause of script-vieweing exploit on agni.
* Removed deploy key checks from farm

result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release

Revert bad patch for VWR-849 / SL-43759