From 7dada07dbaae3dfb9b1319453e51019bfff2717f Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 20 Feb 2007 22:02:36 +0000
Subject: svn merge -r 57620:58007
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/newview/llworldmap.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/llworldmap.cpp')

diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp
index 7a6b89fcda..59587ef13c 100644
--- a/indra/newview/llworldmap.cpp
+++ b/indra/newview/llworldmap.cpp
@@ -247,7 +247,6 @@ void LLWorldMap::setCurrentLayer(S32 layer, bool request_layer)
 	if (!mMapLoaded[layer] || request_layer)
 	{
 		sendMapLayerRequest();
-		sendItemRequest(MAP_ITEM_AGENT_COUNT);
 	}
 
 	if (mTelehubs.size() == 0 ||
@@ -698,12 +697,6 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
 				gWorldMap->mClassifieds.push_back(new_item);
 				break;
 			}
-			case MAP_ITEM_AGENT_COUNT: // agent counts
-			{
-				// We only ever receive one per region, i.e. this update superceeds any others
-				gWorldMap->mNumAgents[new_item.mRegionHandle] = new_item.mExtra;
-				break;
-			}
 			case MAP_ITEM_AGENT_LOCATIONS: // agent locations
 			{
 				if (!siminfo)
-- 
cgit v1.2.3