From 144f1400c54419f1b174d7a6fa80c97abda98b67 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 30 Jan 2015 21:22:57 +0000
Subject: [PATCH] Disable display name cap config in RC branch for now until
 issues have been worked through.

---
 bin/OpenSim.ini.example | 1 -
 bin/OpenSimDefaults.ini | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d352c333bc..987d8b2265 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -567,7 +567,6 @@
     Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
     Cap_AvatarPickerSearch = "localhost"
-    Cap_GetDisplayNames = "localhost"
 
 
 [SimulatorFeatures]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 4faf7f3e83..aa5b7e5f94 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -645,7 +645,7 @@
     Cap_ObjectMediaNavigate = "localhost"
     Cap_FetchLib = ""
     Cap_FetchLibDescendents = ""
-    Cap_GetDisplayNames = "localhost"
+    Cap_GetDisplayNames = ""
     Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
     Cap_GetObjectCost = ""