Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs

2 files changed, 7 insertions, 2 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 842043e..edd22aa 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -503,8 +503,10 @@
     ;;   "<url>" -- capability enabled and served by some other server
     ;;
     ; These are enabled by default to localhost. Change if you see fit.
-      Cap_GetTexture = "localhost"
+    Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
+        Cap_AvatarPickerSearch = "localhost"
+
     ; This is disabled by default. Change if you see fit. Note that
     ; serving this cap from the simulators may lead to poor performace.
     Cap_WebFetchInventoryDescendents = ""
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ca8822c..60e4be2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -541,7 +541,6 @@
     ;; in OpenSim.ini
     ;;
     Cap_AttachmentResources = ""
-    Cap_AvatarPickerSearch = ""
     Cap_ChatSessionRequest = ""
     Cap_CopyInventoryFromNotecard = "localhost"
     Cap_DispatchRegionInfo = ""
@@ -605,6 +604,10 @@
     Cap_WebFetchInventoryDescendents = ""
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
+
+        ; Capability for searching for people
+        Cap_AvatarPickerSearch = "localhost"
+
     
 
 [Chat]