2.6.4 fixes a Mac bug in get_target_property(... "SLPlugin" LOCATION): before
that version it returns "pathname/SLPlugin", whereas the correct answer is
"pathname/SLPlugin.app/Contents/MacOS/SLPlugin". With 2.6.2, the Mac build
breaks in a mysterious way. Changing this version requirement should clarify
the solution.

Daggified version of http://svn.secondlife.com/trac/linden/changeset/3431
(or of the SNOW-654 part of https://bitbucket.org/Techwolf/viewer-development/changeset/5697874b390b )

svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910

svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.

QAR-1771  Linux Viewer Autoupdater + XUI-parse refactoring

ignore-dead-branch

svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3

svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge

svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448

QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883  svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge

=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .

QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar

DEV's fulfilled as part of this branch:
======================================

DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location

merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme

1. Initial compatibility with CMake 2.6 (verified on Mac OS X, other platforms may need more work)
2. Ability to more easily debug problems fetching prebuilt libraries (./develop.py configure -DDEBUG_PREBUILT=1)
3. Compatibility with Mac OS X MacPorts/Fink installations by trying to find and use system python executable first

adding the fabled "server" and "viewer" targets everyone has been wishing for. Reviewed by cg. not for a jira.

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