EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
** This should be the last merge from branches/maintenance.  All future merges will be from new maintenance-# branches off release **

ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa

SL-56402 God powers failing in release branch.  Change to llselectmgr.cpp in maintenance rev 68427 broke this.  Reverted that patch.  Paired with Don.

svn merge -r69926:70272 lag-meter, to pick up fixes for shrunk view, icon layout and ping time testing.  QA passed by Devin.

James discovered a bug in the minifriends code that can be triggered when running a new viewer build with VS2005 talking to an old simulator. This change works around that problem and was reviewed by James.

svn merge -r 69597:70080 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release

Merge patches made in the 1-18-3 RC iterations into the trunk.
* SL-55085 Login hangs if optional update is declined.
* SL-55123 Mac app icon missing from open source tarball
* SL-55121 Mac mouse cursors missing from open source tarball
* SL-54978 Remove duplicate code that snuck in during a patch merge
* SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update
* Release notes/version numbers

svn merge -r 69906:69926 svn+ssh://svn.lindenlab.com/svn/linden/branches/lag-meter.  Adds "Lag Meter" option to "Help" menu to give users more useful diagnostics when they see "laggy" behavior.

Revert change for SL-51198 ("VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button"), per Ben - more comprehensive design coming through Rx soon.

ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999

svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release

Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)

Re-apply reversion from RC branch. This was un-reverted by the dpo-4 merge.

Re-apply reversion from RC branch. This was un-reverted by the dpo-4 merge.

Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 into release. had to blow away the libraries directory to clear up svn evil.

revamp.

Passed by QA.  Reviewed by bos.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@68938
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-26604-based-on-r68938
-> release

SL-54168 "Users muted by voice are also muted by text".
Updated Vivox SDK 2.0.2318.

(josh: This appears to be svn merge -r 68529:69170 svn+ssh://svn/svn/linden/branches/bhear3-maintenance1)

Reviewed by Josh and Don

Branch reviewed by Don.  Passed QA buildme this morning.

NOTE: This change requires a DB schema upgrade.  Upgrade script:
indra/upgrade/viewer-stats/redo_viewer_stats

svn merge -r 68474:68690 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release

Sync up fixes, version numbers, and release notes applied to the viewer RC branch.

EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release

Actual action: branched maintenance-r68118, merged in release, then copied result into release

This is "really" the merge of everything that went out in the 1.18.2(0) viewer release.

* Tweak simulator_version script to slam all regions to the new version we're deploying

Added tests to version manager and fixed failed tests.  Paired by rdw and Tess.

svn merge --ignore-ancestry  svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131

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.

svn merge -r 64468:66735 svn+ssh://svn/svn/linden/branches/lookatyou/indra/newview > release/indra/newview

New mysql connection pool for Python, plus unit tests that verify that it's actually non-blocking.  Some additional behavior in saranwrap, with tests that pass. Reviewd by Donovan.

Includes voice-server-changes (0:66493)

EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392

ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)

Minor bugfixes for a line in viewer_manifest that never gets run (because of the way the SConstruct file on Linux is built).  However, it might get run in the future, so there we go.  Thanks cg for finding this.  Not reviewed.