QAR-782 Merge featurettes batch #2

merge featurettes-6-merge-2 -> release
dataserver-is-deprecated

1 files changed, 0 insertions, 24 deletions

diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index b5e23550b9..e63dcfc1e8 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -717,11 +717,6 @@ void LLWorldMapView::draw()
 		drawGenericItems(LLWorldMap::getInstance()->mLandForSale, sForSaleImage);
 	}
 
-	if (gSavedSettings.getBOOL("MapShowClassifieds"))
-	{
-		drawGenericItems(LLWorldMap::getInstance()->mClassifieds, sClassifiedsImage);
-	}
-
 	if (gSavedSettings.getBOOL("MapShowEvents"))
 	{
 		drawEvents();
@@ -1549,10 +1544,6 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
 	{
 		(*it).mSelected = FALSE;
 	}
-	for (it = LLWorldMap::getInstance()->mClassifieds.begin(); it != LLWorldMap::getInstance()->mClassifieds.end(); ++it)
-	{
-		(*it).mSelected = FALSE;
-	}
 
 	// Select event you clicked on
 	if (gSavedSettings.getBOOL("MapShowEvents"))
@@ -1601,21 +1592,6 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
 		}
 	}
 
-	if (gSavedSettings.getBOOL("MapShowClassifieds"))
-	{
-		for (it = LLWorldMap::getInstance()->mClassifieds.begin(); it != LLWorldMap::getInstance()->mClassifieds.end(); ++it)
-		{
-			LLItemInfo& classified = *it;
-
-			if (checkItemHit(x, y, classified, id, true))
-			{
-				*hit_type = MAP_ITEM_CLASSIFIED;
-				mItemPicked = TRUE;
-				return;
-			}
-		}
-	}
-
 	// If we get here, we haven't clicked on an icon
 
 	gFloaterWorldMap->trackLocation(pos_global);