This fixes the problem that when some package contains symbolic
links, they were never removed anymore (after an uninstall of
that package).

DEV-47845 Fix to work with TCP/LLSD message. This checkin is experimental, so if it breaks a build, just revert to the previous changeset.

Cosmetic change.  Took out unnecessary blank line near the end of LinkInventoryItem in message_template.msg.

Fix error with message template incompatibility for LinkInventoryItem.Merging newinventorymsg__merge__viewer-2.0.0-3__r131585 into viewer-2 trunk, see QAR-1804 and QAR-1805.

Merging revisions 131698-132325 of svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/newinventorymsg__merge__viewer-2.0.0-3__r131585 into D:\viewer-2.0.0-3, respecting ancestry

Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804

Port over the new build scripts from para-test, tweek update_version_files to use the repo revision number for now.

Pilfered from billc.

Pulled all the sisa changes into trunk for QAR-1734
These changes are the same as revisions 126447:126495 from svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-2
or the one merge branch in
svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-3

svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk

This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.

merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

The sets module is no longer needed with Python 2.4, and causes a
DeprecationWarning with 2.6, so drop it

The md5 module causes a DeprecationWarning with 2.6, so try to import
hashlib (its replacement) instead, else fall back

Reviewed by Poppy.

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.

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

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

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

Reviewed by Brad.

Merge latest 1.26 into trunk

svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.