From 1761ced217ae699e111a4b4f867cde0caffb7413 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Sun, 29 Sep 2013 16:06:02 -0600
Subject: [PATCH] Backout 522df070aa0f "Utilize new GetMesh2 simulator cap"

---
 indra/newview/llmeshrepository.cpp | 4 +---
 indra/newview/llviewerregion.cpp   | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 4d92a9beaa..eccc7441e6 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2710,9 +2710,7 @@ void LLMeshRepository::notifyLoadedMeshes()
 		if (gAgent.getRegion()->getName() != region_name && gAgent.getRegion()->capabilitiesReceived())
 		{
 			region_name = gAgent.getRegion()->getName();
-			mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh2");
-			if (mGetMeshCapability.empty())
-				mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh");
+			mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh");
 		}
 	}
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 7ed2b1d0a6..3d95a77fd1 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1765,7 +1765,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("GetDisplayNames");
 	capabilityNames.append("GroupMemberData");
 	capabilityNames.append("GetMesh");
-	capabilityNames.append("GetMesh2");
 	capabilityNames.append("GetObjectCost");
 	capabilityNames.append("GetObjectPhysicsData");
 	capabilityNames.append("GetTexture");