Reviewed by Mani.

Added March 2009 DirectX SDK to cmake config.
Reviewed by brad

mean "the development version between release versions 1.27 and 1.30".

Merging server-1.26 back to trunk.

Two conflicts -- llversionserver.hh (kept the trunk version)

and in llsimparcelmgr.cpp -- also kept the trunk version.  There was
                             some code in 1.26 that included error
                             printing from RDW that says "we should
                             really not be hitting this code", and that
                             code was gone in trunk... so, went ahead
                             and kept the trunk part of that one
                             conflict in that file.

tests to fail.

Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462

Set DISTCC_DIR to a location inside the source tree to avoid causing NFS trouble with the default setting.

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

QAR-1459 etch builds enabled

svn merge -r117696:117697 svn+ssh://svn.lindenlab.com/svn/linden/branches/fix-lslrpc/fix-lslrpc-merge to svn+ssh://svn.lindenlab.com/svn/linden/trunk

svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7

svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7

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

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

the XML files.

DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)

This is causing open source build problems - cherrypicked DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining

Reviewed by Brad.

Merging from server-1.26 to trunk

Only a few conflicts:

   scripts/farm_distribute : the upload rate in trunk was even more
                             conservative than the one I switched to in
                             1.26, so kept the trunk version.

   indra/llcommon/llversionserver.h : did svn revert to keep trunk

   indra/newsim/lltask.cpp : svn is weird.  The merge conflict was one
                            that it's not obvious why it was there.
                            However, Simon and I looked at it, and the
                            solution was obvious : keep the trunk blob
                            where the conflict was flagged.

   indra/lib/python : conflict was differing versions of the eventlib
                      extern.  did svn revert . to keep trunk.

svn merge -r116334:116916 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2

svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5
no conflicts

These files haven't been touched in years.

Reviewed by Richard.

Result of svn merge -r115238:115240 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial_slave_merge into trunk. In turn a result of svn merge -r113279:113280 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial-changes-1 into trivial_slave_merge and svn merge -r107805:110030 svn+ssh://svn/svn/user/phoenix/slave-ds into trivial_slave_merge. QAR-1329

This is much less painful than maintaining that list by hand, since
we don't use those files for actual builds.

Result of svn merge -r115023:115025 svn+ssh://svn/svn/linden/branches/no_free_uploads/merge_qa_2 into svn+ssh://svn/svn/linden/trunk for QAR-1220

Merge latest 1.26 into trunk

Merging in QAR-1361.