diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 635cedfb915e034ef70ee1674be4e3347e6b15a7..fd71122d7ddb79665840996834d9421c3b84e2b5 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -1339,7 +1339,7 @@ void LLAvatarActions::teleportTo(const LLUUID& avatar_id)
 	if (avatar_id.isNull())
 		return;
 
-	boost::unordered_map<LLUUID, LLVector3d> positions;
+	LLWorld::pos_map_t positions;
 	LLWorld::getInstance()->getAvatars(&positions, gAgent.getPositionGlobal(), 4096.f);
 	auto iter = positions.find(avatar_id);
 	if (iter != positions.cend())
@@ -1359,7 +1359,7 @@ bool LLAvatarActions::canTeleportTo(const LLUUID& avatar_id)
 	if (avatar_id.isNull())
 		return false;
 
-	boost::unordered_map<LLUUID, LLVector3d> positions;
+	LLWorld::pos_map_t positions;
 	LLWorld::getInstance()->getAvatars(&positions, gAgent.getPositionGlobal(), 4096.f);
 	auto iter = positions.find(avatar_id);
 	if (iter != positions.cend())
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 2b105f2a7e63150c6308cec9743db002bb1e204f..927bfac62c45fe2f48a7aab3026ebac68d66bcd5 100755
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -598,9 +598,9 @@ void LLAvatarList::updateDistances()
 		LLAvatarListItem* item = static_cast<LLAvatarListItem*>(*it);
 		if (item->getAvatarId() == gAgentID) continue;
 		
-		boost::unordered_map<LLUUID, LLVector3d> positions;
+		LLWorld::pos_map_t positions;
 		LLWorld::getInstance()->getAvatars(&positions, gAgent.getPositionGlobal(), gSavedSettings.getF32("NearMeRange"));
-		boost::unordered_map<LLUUID, LLVector3d>::iterator iter = positions.find(item->getAvatarId());
+		LLWorld::pos_map_t::iterator iter = positions.find(item->getAvatarId());
 		if (iter != positions.end())
 			item->setDistance((iter->second - gAgent.getPositionGlobal()).magVec());
 		else
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index b31d71eeb00da38d8d975f13f87ada0b9da3cf12..c816333308a2b77d06679e79b44775d3a94304b8 100755
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1651,7 +1651,7 @@ void LLFloaterIMContainer::setNearbyDistances()
 	if (item)
 	{
 		// Get the positions of the nearby avatars and their ids
-		boost::unordered_map<LLUUID, LLVector3d> positions;
+		LLWorld::pos_map_t positions;
 		LLWorld::getInstance()->getAvatars(&positions, gAgent.getPositionGlobal(), 110.f);
 		// Get the position of the agent
 		const LLVector3d& me_pos = gAgent.getPositionGlobal();
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index eb9973eecc90556d728131c523807d8edeb0b8d6..35726f491437aa3b607916692bb78c29b98fc77d 100755
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -382,7 +382,7 @@ void LLNetMap::draw()
 		F32 min_pick_dist_squared = (mDotRadius * MIN_PICK_SCALE) * (mDotRadius * MIN_PICK_SCALE);
 
 		LLVector3 pos_map;
-		boost::unordered_map<LLUUID, LLVector3d> positions;
+		LLWorld::pos_map_t positions;
 		bool unknown_relative_z;
 		LLColor4 color;
 
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp
index ce5fcf2a72eef66a1db4278a809c882319e30051..0a42f96448a7b06827a4829ed9095345145882d4 100755
--- a/indra/newview/lltoolgun.cpp
+++ b/indra/newview/lltoolgun.cpp
@@ -155,7 +155,7 @@ void LLToolGun::draw()
 			LLQuaternion myRotation = LLViewerCamera::getInstance()->getQuaternion();
 			myRotation.set(-myRotation.mQ[VX], -myRotation.mQ[VY], -myRotation.mQ[VZ], myRotation.mQ[VW]);
 
-			boost::unordered_map<LLUUID, LLVector3d> positions;
+			LLWorld::pos_map_t positions;
 			LLWorld::getInstance()->getAvatars(&positions, gAgent.getPositionGlobal(), iff_range);
 			for (auto iter = positions.cbegin(), iter_end = positions.cend(); iter != iter_end; ++iter)
 			{
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 51d23351e92ecfcd26d9186ec01e16e822daee1b..433567b44dee6818705a9348fa19c670b2da40b1 100755
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1334,7 +1334,7 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
 	}
 }
 
-void LLWorld::getAvatars(boost::unordered_map<LLUUID, LLVector3d>* umap, const LLVector3d& relative_to, F32 radius) const
+void LLWorld::getAvatars(pos_map_t* umap, const LLVector3d& relative_to, F32 radius) const
 {
 	F32 radius_squared = radius * radius;
 	
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h
index af20e280bfe9b44621821d6c6e5e018c825d1b2c..8fc59a1db9e0257d9f5be821d0a0e2218753b9a2 100755
--- a/indra/newview/llworld.h
+++ b/indra/newview/llworld.h
@@ -163,7 +163,8 @@ public:
 		std::vector<LLVector3d>* positions = NULL, 
 		const LLVector3d& relative_to = LLVector3d(), F32 radius = FLT_MAX) const;
 	
-	void getAvatars(boost::unordered_map<LLUUID, LLVector3d>* map = NULL,
+	typedef boost::unordered_map<LLUUID, LLVector3d> pos_map_t;
+	void getAvatars(pos_map_t* map = NULL,
 					const LLVector3d& relative_to = LLVector3d(),
 					F32 radius = FLT_MAX) const;