diff options
author | Jacek Antonelli | 2008-08-15 23:45:24 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:24 -0500 |
commit | 0a78fa3920b32a51f01ebe7cfa30be45134f398f (patch) | |
tree | 7d0ebbf55bcb0a77c3957dd64315574281cc2f54 /linden/indra/newview/llurldispatcher.cpp | |
parent | Second Life viewer sources 1.18.6.2-RC (diff) | |
download | meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.zip meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.gz meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.bz2 meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.xz |
Second Life viewer sources 1.18.6.4-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llurldispatcher.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/newview/llurldispatcher.cpp b/linden/indra/newview/llurldispatcher.cpp index 51b9505..c2c704d 100644 --- a/linden/indra/newview/llurldispatcher.cpp +++ b/linden/indra/newview/llurldispatcher.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2007, Linden Research, Inc. | 7 | * Copyright (c) 2007-2008, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -39,6 +39,7 @@ | |||
39 | #include "llfloaterdirectory.h" | 39 | #include "llfloaterdirectory.h" |
40 | #include "llfloaterhtmlhelp.h" | 40 | #include "llfloaterhtmlhelp.h" |
41 | //#include "llfloaterworldmap.h" | 41 | //#include "llfloaterworldmap.h" |
42 | #include "llfloaterworldmap.h" | ||
42 | #include "llpanellogin.h" | 43 | #include "llpanellogin.h" |
43 | #include "llstartup.h" // gStartupState | 44 | #include "llstartup.h" // gStartupState |
44 | #include "llurlsimstring.h" | 45 | #include "llurlsimstring.h" |
@@ -238,12 +239,17 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str | |||
238 | LLVector3d global_pos = from_region_handle(region_handle); | 239 | LLVector3d global_pos = from_region_handle(region_handle); |
239 | global_pos += LLVector3d(local_pos); | 240 | global_pos += LLVector3d(local_pos); |
240 | gAgent.teleportViaLocation(global_pos); | 241 | gAgent.teleportViaLocation(global_pos); |
242 | if(gFloaterWorldMap) | ||
243 | { | ||
244 | gFloaterWorldMap->trackLocation(global_pos); | ||
245 | } | ||
241 | } | 246 | } |
242 | else | 247 | else |
243 | { | 248 | { |
244 | // display informational floater, allow user to click teleport btn | 249 | // display informational floater, allow user to click teleport btn |
245 | LLFloaterURLDisplay* url_displayp = LLFloaterURLDisplay::getInstance(LLSD()); | 250 | LLFloaterURLDisplay* url_displayp = LLFloaterURLDisplay::getInstance(LLSD()); |
246 | 251 | ||
252 | |||
247 | url_displayp->displayParcelInfo(region_handle, local_pos); | 253 | url_displayp->displayParcelInfo(region_handle, local_pos); |
248 | if(snapshot_id.notNull()) | 254 | if(snapshot_id.notNull()) |
249 | { | 255 | { |