svn merge -r 68785:68784 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

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