1 files changed, 5 insertions, 13 deletions

diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index 28ae94a..231f5dc 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -160,6 +160,11 @@ void LLWorldMap::reset()
 
         mNeighborMapWidth = 0;
         mNeighborMapHeight = 0;
+
+        for (S32 i=0; i<MAP_SIM_IMAGE_TYPES; i++)
+        {
+                mMapLayers[i].clear();
+        }
 }
 
 void LLWorldMap::eraseItems()
@@ -172,7 +177,6 @@ void LLWorldMap::eraseItems()
                 mInfohubs.clear();
                 mPGEvents.clear();
                 mMatureEvents.clear();
-                mPopular.clear();
                 mLandForSale.clear();
                 mClassifieds.clear();
         }
@@ -299,12 +303,6 @@ void LLWorldMap::setCurrentLayer(S32 layer, bool request_layer)
                 sendItemRequest(MAP_ITEM_MATURE_EVENT);
         }
 
-        if (mPopular.size() == 0)
-        {
-                // Request for popular
-                sendItemRequest(MAP_ITEM_POPULAR);
-        }
-
         if (mLandForSale.size() == 0)
         {
                 // Request for Land For Sale
@@ -763,12 +761,6 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
                                 }
                                 break;
                         }
-                        case MAP_ITEM_POPULAR: // popular
-                        {
-                                new_item.mPosGlobal.mdV[VZ] = (F64)extra2;
-                                LLWorldMap::getInstance()->mPopular.push_back(new_item);
-                                break;
-                        }
                         case MAP_ITEM_LAND_FOR_SALE: // land for sale
                         {
                                 new_item.mToolTip = llformat("%d sq. m. L$%d", new_item.mExtra, new_item.mExtra2);