diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-01-03 20:00:23 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-01-03 20:00:23 +0000 |
| commit | e1d40972220a6f90a2913b713e4daa665b188a56 (patch) | |
| tree | 764d01011eb1801fa3603cea30380e4d71b5bc45 /indra/newview/llurldispatcher.cpp | |
| parent | b6e2a894f524b4dab1f3bb80572920fe926ed4c2 (diff) | |
svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Pick up fixes for:
* DEV-7598 VWR-3829: Cursor in Logon edit boxes difficult to see
* DEV-8125 Language names need to have a consistent format in preferences drop-down
* DEV-8099 SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
* DEV-8107 Crash when connecting to older sims in llviewerparcelmgr age verification code
* DEV-8130 Remove "Alternate Server" option from crash reporter since util.* no longer have public interfaces
* DEV-7372 VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp
Plus corrected line endings for llcrashlogger.* (there's one actual change in those files, the rest is whitespace)
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
| -rw-r--r-- | indra/newview/llurldispatcher.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index f8ebced8b9..6fec904239 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -38,6 +38,7 @@ #include "llfloaterurldisplay.h" #include "llfloaterdirectory.h" #include "llfloaterhtml.h" +#include "llfloaterworldmap.h" #include "llpanellogin.h" #include "llstartup.h" // gStartupState #include "llurlsimstring.h" @@ -238,12 +239,17 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str LLVector3d global_pos = from_region_handle(region_handle); global_pos += LLVector3d(local_pos); gAgent.teleportViaLocation(global_pos); + if(gFloaterWorldMap) + { + gFloaterWorldMap->trackLocation(global_pos); + } } else { // display informational floater, allow user to click teleport btn LLFloaterURLDisplay* url_displayp = LLFloaterURLDisplay::getInstance(LLSD()); + url_displayp->displayParcelInfo(region_handle, local_pos); if(snapshot_id.notNull()) { |