Self-reviewed.

Reviewed by Poppy.

svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated

svn merge -r 93027:93128 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server --> release

Backport fixes from production branch

* DEV-8282  integrated alt check with durls white list code
* Fix for memory stomping due to deleting vector as scalars
* DEV-16904 Email message shows incorrect owner when inventory item is sent to offline resident from scripted object inworld

Explicitly mark the generated files with the GENERATED property to make sure CMake handles them correctly

Remainder of CMake 2.6.0 compatibility fixes.  CMake 2.4.7/2.4.8 or 2.6.0 can now be used for Mac builds.

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

svn merge -r 92383:92992 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server --> release

Backport fixes and other cruft from the production branch:
* DEV-16158 make_deploy_group.py queries simulator_standby table not region conductor
* DEV-17891 SEC-118: Classifieds can be created with any amount paid for L$50
* QAR-745 Test rez object security break - SEC-104 (and possibly SEC-115)
* DEV-18161 allow_negative_balance parameter for sink operation so fraud team can dock the accounts of people who bought bad L$
* DEV-18217 Crash rate >10x higher in 1.23.2 than 1.22.4
* DEV-15570 Enable Improved IM web service
* add auth.py from interop-5 (for interop login testing on preview grid)

did-you-know-that-dataserver-is-deprecated?

remove erroneous texture entries which were probably the result of a
mismerge.

approved by steve & james.

QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL

Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.

svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4

merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456

    * featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
    * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
    * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
    * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)

Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry

* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes

Backport fixes from the 1.23 Server branch

* DEV-17223 remove the words slot and bets from dataserver.xml
* DEV-17351 Unable to set estate manager
* DEV-17138 users with god mode capabilities not able to join groups
* DEV-17785 SVC-2633: Floating Text which was set before Server Update 1.23 does not do linebreaks anymore but one line instead
* DEV-17863 Memory Leak in 1.23 (related to returning objects?)
* DEV-17804 CSR tool showing old data on Summary page
* DEV-17811 Ban list showing (???) (???) for names

dataserver-is-deprecated

svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release.  This is for QAR-730: Combination merge of QAR-432 and QAR-601

Check the actual version of the compiler we're going to use to compile the sources to determine which options need to be added rather than the version of some other compiler on the system.

Added citation to doc/contributions.txt for VWR-6 patch.  This is just a doc change, not a code change.  I verified that VWR-6 code is currently in release such that this citation is deserved.

Authorized by: Robla.

simple crash fix if someone creates a bad command line. fallout from string cleanup. very small. revert if there are problems.

Fix for DEV-17484: package-grabber omits fontconfig

This also requires a putty session to be created, same as we do for svn.

Removing status msg: "Could not find scp or pscp executable" for case when scp not on system.  Clutters output, and is not really necessary.

Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."

Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h

QAR-648   1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release

removing conditional install

reviewed by cg

dataserver-is-deprecated

Reviewed by Richard

QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release