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

D'oh, try compiling before committing. (If it's any justification, CG was compiling so I could run home...)

Redo of QAR-170, with correct range. Reviewed by CG.

svn merge -r 76394:76651 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer to pick up LLURI escaping fix and all other changes since last sync.  Not reviewed.

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.

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.

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

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release