Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

1 files changed, 0 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
index d7af1f2..9f2aed0 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -71,7 +71,6 @@ namespace OpenSim.Region.ClientStack.Linden
                 return;
 
             m_URL = config.GetString("Cap_AvatarPickerSearch", string.Empty);
-            m_log.DebugFormat("[XXX]: Cap_AvatarPickerSearch = {0}", m_URL);
             // Cap doesn't exist
             if (m_URL != string.Empty)
                 m_Enabled = true;