From 305cc649697fa347538973f4f70b707529208e02 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Tue, 12 Jan 2010 14:28:21 +0200
Subject: Fixed normal bug EXT-4150([BSI] Last Landmark in Teleport History
disables teleport button)
--HG--
branch : product-engine
---
indra/newview/llpanelteleporthistory.cpp | 2 +-
indra/newview/llteleporthistorystorage.cpp | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 65a3d9d41b..0a2217fc51 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -550,7 +550,7 @@ void LLTeleportHistoryPanel::updateVerbs()
LLTeleportHistoryFlatItem* itemp = dynamic_cast<LLTeleportHistoryFlatItem *> (mLastSelectedFlatlList->getSelectedItem());
- mTeleportBtn->setEnabled(NULL != itemp && itemp->getIndex() < (S32)mTeleportHistory->getItems().size() - 1);
+ mTeleportBtn->setEnabled(NULL != itemp);
mShowOnMapBtn->setEnabled(NULL != itemp);
}
diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp
index d3bbda1c72..c635f91423 100644
--- a/indra/newview/llteleporthistorystorage.cpp
+++ b/indra/newview/llteleporthistorystorage.cpp
@@ -246,13 +246,6 @@ void LLTeleportHistoryStorage::goToItem(S32 idx)
dump();
return;
}
-
- if (idx == (S32)mItems.size() - 1)
- {
- llwarns << "Will not teleport to the same location." << llendl;
- dump();
- return;
- }
// Attempt to teleport to the requested item.
gAgent.teleportViaLocation(mItems[idx].mGlobalPos);
--
cgit v1.2.3