Removed slviewer-0-v12160-VisitedLandmarks.patch

7 files changed, 13 insertions, 25 deletions

diff --git a/linden/indra/newview/llfloaterurldisplay.cpp b/linden/indra/newview/llfloaterurldisplay.cpp
index 457d8b6..563eaf6 100644
--- a/linden/indra/newview/llfloaterurldisplay.cpp
+++ b/linden/indra/newview/llfloaterurldisplay.cpp
@@ -75,8 +75,7 @@ void LLFloaterURLDisplay::displayParcelInfo(U64 region_handle, const LLVector3&
 
         LLUUID region_id;                       // don't know this
         LLUUID landmark_asset_id;       // don't know this either
-        LLUUID landmark_item_id;        // don't know this either
-        mPlacePanel->displayParcelInfo(pos_local, landmark_asset_id, landmark_item_id, region_id, pos_global);
+        mPlacePanel->displayParcelInfo(pos_local, landmark_asset_id, region_id, pos_global);
 
         this->setVisible(true);
         this->setFrontmost(true);
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 9506786..34277f7 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -2606,7 +2606,7 @@ void LLLandmarkBridge::performAction(LLFolderView* folder, LLInventoryModel* mod
                         // because you'll probably arrive at a telehub instead
                         if( gFloaterWorldMap )
                         {
-                                gFloaterWorldMap->trackLandmark(item->getUUID());  // remember this must be the item UUID, not the asset UUID
+                                gFloaterWorldMap->trackLandmark( item->getAssetUUID() );
                         }
                 }
         }
@@ -2651,19 +2651,20 @@ void open_landmark(LLViewerInventoryItem* inv_item,
 
 static void open_landmark_callback(S32 option, void* data)
 {
-        LLInventoryItem* itemp = (LLInventoryItem*)data;
+        LLUUID* asset_idp = (LLUUID*)data;
         if (option == 0)
         {
                 // HACK: This is to demonstrate teleport on double click for landmarks
-                gAgent.teleportViaLandmark( itemp->getAssetUUID() );
+                gAgent.teleportViaLandmark( *asset_idp );
 
                 // we now automatically track the landmark you're teleporting to
                 // because you'll probably arrive at a telehub instead
                 if( gFloaterWorldMap )
                 {
-                        gFloaterWorldMap->trackLandmark( itemp->getUUID() );  // remember this is the item UUID not the asset UUID
+                        gFloaterWorldMap->trackLandmark( *asset_idp );
                 }
         }
+        delete asset_idp;
 }
 
 void LLLandmarkBridge::openItem()
@@ -2674,9 +2675,9 @@ void LLLandmarkBridge::openItem()
                 // Opening (double-clicking) a landmark immediately teleports,
                 // but warns you the first time.
                 // open_landmark(item, std::string("  ") + getPrefix() + item->getName(), FALSE);
+                LLUUID* asset_idp = new LLUUID(item->getAssetUUID());
                 LLAlertDialog::showXml("TeleportFromLandmark",
-                        // send the full inventory item so the callback can use both asset UUID and inventory item id
-                        open_landmark_callback, (void*)item);
+                        open_landmark_callback, (void*)asset_idp);
         }
 }
 
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 631733a..7277f05 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -1080,11 +1080,7 @@ LLTaskLandmarkBridge::LLTaskLandmarkBridge(
 
 LLUIImagePtr LLTaskLandmarkBridge::getIcon() const
 {
-        LLInventoryItem* item = findItem();
-        BOOL visited = FALSE;
-        if(item->getFlags() & LLInventoryItem::II_FLAGS_LANDMARK_VISITED) visited=TRUE;
-        // attachment point parameter in get_item_icon is used for visited/unvisited landmark
-        return get_item_icon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, visited, FALSE);
+        return get_item_icon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, 0, FALSE);
 }
 
 
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 **)
 
 void LLPanelPlace::displayParcelInfo(const LLVector3& pos_region,
                                                                          const LLUUID& landmark_asset_id,
-                                                                         const LLUUID& landmark_item_id,   // item_id to be able to send map correct id
                                                                          const LLUUID& region_id,
                                                                          const LLVector3d& pos_global)
 {
@@ -341,7 +340,6 @@ void LLPanelPlace::displayParcelInfo(const LLVector3& pos_region,
         mPosRegion = pos_region;
         mPosGlobal = pos_global;
         mLandmarkAssetID = landmark_asset_id;
-        mLandmarkItemID = landmark_item_id;
         std::string url = gAgent.getRegion()->getCapability("RemoteParcelRequest");
         if (!url.empty())
         {
@@ -381,8 +379,8 @@ void LLPanelPlace::onClickTeleport(void* data)
         if(self->mLandmarkAssetID.notNull())
         {
                 gAgent.teleportViaLandmark(self->mLandmarkAssetID);
-                // remember this must be an inventory item id, not an asset UUID
-                gFloaterWorldMap->trackLandmark(self->mLandmarkItemID); 
+                gFloaterWorldMap->trackLandmark(self->mLandmarkAssetID);
+
         }
         else if (!self->mPosGlobal.isExactlyZero())
         {
diff --git a/linden/indra/newview/llpanelplace.h b/linden/indra/newview/llpanelplace.h
index 0478d93..df53013 100644
--- a/linden/indra/newview/llpanelplace.h
+++ b/linden/indra/newview/llpanelplace.h
@@ -70,7 +70,6 @@ public:
         void sendParcelInfoRequest();
         void displayParcelInfo(const LLVector3& pos_region,
                         const LLUUID& landmark_asset_id,
-                        const LLUUID& landmark_item_id,   // so we can send map floater the correct inventory item id
                         const LLUUID& region_id,
                         const LLVector3d& pos_global);
         static void processParcelInfoReply(LLMessageSystem* msg, void**);
@@ -91,7 +90,6 @@ protected:
         LLUUID                  mRequestedID;
         LLUUID                  mRegionID;
         LLUUID                  mLandmarkAssetID;
-        LLUUID                  mLandmarkItemID;
         // Absolute position of the location for teleport, may not
         // be available (hence zero)
         LLVector3d              mPosGlobal;
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index 3a92f5a..20b0ee5 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -189,7 +189,7 @@ void LLPreviewLandmark::draw()
                         LLUUID region_id;
                         mLandmark->getRegionID(region_id);              // might find null?
                         LLVector3d pos_global = getPositionGlobal();    // might be 0
-                        mPlacePanel->displayParcelInfo(pos_region, landmark_asset_id, getItem()->getUUID(), region_id, pos_global);
+                        mPlacePanel->displayParcelInfo(pos_region, landmark_asset_id, region_id, pos_global);
                 }
         }
 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 86eca8f..221de59 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2768,11 +2768,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                 LLVector3 beacon_dir(agent_pos.mV[VX] - (F32)fmod(beacon_pos.mdV[VX], 256.0), agent_pos.mV[VY] - (F32)fmod(beacon_pos.mdV[VY], 256.0), 0);
                 if (beacon_dir.magVecSquared() < 25.f)
                 {
-                        // do not stop tracking landmarks here, so they can properly be marked as visited in LLTracker()
-                        if(LLTracker::getTrackingStatus()!=LLTracker::TRACKING_LANDMARK)
-                        {
-                                LLTracker::stopTracking(NULL);
-                        }
+                        LLTracker::stopTracking(NULL);
                 }
                 else if ( is_teleport )
                 {