aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelplace.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-03-22 12:27:26 -0700
committerMcCabe Maxsted2009-03-22 12:27:26 -0700
commitca7fb9c8bbc1fab2f5ed0c4940ffa12be0ad542f (patch)
treea19b3c1d8e021ffb8187a5032fc0a7cd9a9da276 /linden/indra/newview/llpanelplace.cpp
parentRemoved slviewer-0-v12160-RememberStatsPosAndSize.patch (diff)
downloadmeta-impy-ca7fb9c8bbc1fab2f5ed0c4940ffa12be0ad542f.zip
meta-impy-ca7fb9c8bbc1fab2f5ed0c4940ffa12be0ad542f.tar.gz
meta-impy-ca7fb9c8bbc1fab2f5ed0c4940ffa12be0ad542f.tar.bz2
meta-impy-ca7fb9c8bbc1fab2f5ed0c4940ffa12be0ad542f.tar.xz
Removed slviewer-0-v12160-VisitedLandmarks.patch
Diffstat (limited to 'linden/indra/newview/llpanelplace.cpp')
-rw-r--r--linden/indra/newview/llpanelplace.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index 42134f3..d8813b3 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -333,7 +333,6 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
333 333
334void LLPanelPlace::displayParcelInfo(const LLVector3& pos_region, 334void LLPanelPlace::displayParcelInfo(const LLVector3& pos_region,
335 const LLUUID& landmark_asset_id, 335 const LLUUID& landmark_asset_id,
336 const LLUUID& landmark_item_id, // item_id to be able to send map correct id
337 const LLUUID& region_id, 336 const LLUUID& region_id,
338 const LLVector3d& pos_global) 337 const LLVector3d& pos_global)
339{ 338{
@@ -341,7 +340,6 @@ void LLPanelPlace::displayParcelInfo(const LLVector3& pos_region,
341 mPosRegion = pos_region; 340 mPosRegion = pos_region;
342 mPosGlobal = pos_global; 341 mPosGlobal = pos_global;
343 mLandmarkAssetID = landmark_asset_id; 342 mLandmarkAssetID = landmark_asset_id;
344 mLandmarkItemID = landmark_item_id;
345 std::string url = gAgent.getRegion()->getCapability("RemoteParcelRequest"); 343 std::string url = gAgent.getRegion()->getCapability("RemoteParcelRequest");
346 if (!url.empty()) 344 if (!url.empty())
347 { 345 {
@@ -381,8 +379,8 @@ void LLPanelPlace::onClickTeleport(void* data)
381 if(self->mLandmarkAssetID.notNull()) 379 if(self->mLandmarkAssetID.notNull())
382 { 380 {
383 gAgent.teleportViaLandmark(self->mLandmarkAssetID); 381 gAgent.teleportViaLandmark(self->mLandmarkAssetID);
384 // remember this must be an inventory item id, not an asset UUID 382 gFloaterWorldMap->trackLandmark(self->mLandmarkAssetID);
385 gFloaterWorldMap->trackLandmark(self->mLandmarkItemID); 383
386 } 384 }
387 else if (!self->mPosGlobal.isExactlyZero()) 385 else if (!self->mPosGlobal.isExactlyZero())
388 { 386 {