aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelplace.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-03-07 18:55:47 -0700
committerMcCabe Maxsted2009-03-07 18:55:47 -0700
commit457f0d9f42f1c6d80b95435a5d2650474b96926b (patch)
tree638d7cfb51e43d590f1f1db708bd5c05e185d445 /linden/indra/newview/llpanelplace.cpp
parentBackported fix for VWR-8783, original patch by Gigs Taggart (diff)
downloadmeta-impy-457f0d9f42f1c6d80b95435a5d2650474b96926b.zip
meta-impy-457f0d9f42f1c6d80b95435a5d2650474b96926b.tar.gz
meta-impy-457f0d9f42f1c6d80b95435a5d2650474b96926b.tar.bz2
meta-impy-457f0d9f42f1c6d80b95435a5d2650474b96926b.tar.xz
Landmark icons now correctly change color when visited (patch by Zi Ree--VWR-7896)
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanelplace.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index d8813b3..42134f3 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -333,6 +333,7 @@ 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
336 const LLUUID& region_id, 337 const LLUUID& region_id,
337 const LLVector3d& pos_global) 338 const LLVector3d& pos_global)
338{ 339{
@@ -340,6 +341,7 @@ void LLPanelPlace::displayParcelInfo(const LLVector3& pos_region,
340 mPosRegion = pos_region; 341 mPosRegion = pos_region;
341 mPosGlobal = pos_global; 342 mPosGlobal = pos_global;
342 mLandmarkAssetID = landmark_asset_id; 343 mLandmarkAssetID = landmark_asset_id;
344 mLandmarkItemID = landmark_item_id;
343 std::string url = gAgent.getRegion()->getCapability("RemoteParcelRequest"); 345 std::string url = gAgent.getRegion()->getCapability("RemoteParcelRequest");
344 if (!url.empty()) 346 if (!url.empty())
345 { 347 {
@@ -379,8 +381,8 @@ void LLPanelPlace::onClickTeleport(void* data)
379 if(self->mLandmarkAssetID.notNull()) 381 if(self->mLandmarkAssetID.notNull())
380 { 382 {
381 gAgent.teleportViaLandmark(self->mLandmarkAssetID); 383 gAgent.teleportViaLandmark(self->mLandmarkAssetID);
382 gFloaterWorldMap->trackLandmark(self->mLandmarkAssetID); 384 // remember this must be an inventory item id, not an asset UUID
383 385 gFloaterWorldMap->trackLandmark(self->mLandmarkItemID);
384 } 386 }
385 else if (!self->mPosGlobal.isExactlyZero()) 387 else if (!self->mPosGlobal.isExactlyZero())
386 { 388 {