Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

1 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 9935e3c..78b09cd 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -243,14 +243,13 @@ namespace OpenSim.Server.Handlers.Simulation
             responsedata["int_response_code"] = HttpStatusCode.OK;
             responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
 
-            m_log.Debug("[AGENT HANDLER]: Agent Released/Deleted.");
+            m_log.DebugFormat("[AGENT HANDLER]: Agent {0} Released/Deleted from region {1}", id, regionID);
         }
 
         protected virtual void ReleaseAgent(UUID regionID, UUID id)
         {
             m_SimulationService.ReleaseAgent(regionID, id, "");
         }
-
     }
 
     public class AgentPostHandler : BaseStreamHandler
@@ -275,7 +274,7 @@ namespace OpenSim.Server.Handlers.Simulation
         public override byte[] Handle(string path, Stream request,
                 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
-            m_log.DebugFormat("[SIMULATION]: Stream handler called");
+//            m_log.DebugFormat("[SIMULATION]: Stream handler called");
 
             Hashtable keysvals = new Hashtable();
             Hashtable headervals = new Hashtable();
@@ -462,7 +461,7 @@ namespace OpenSim.Server.Handlers.Simulation
         public override byte[] Handle(string path, Stream request,
                 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
-            m_log.DebugFormat("[SIMULATION]: Stream handler called");
+//            m_log.DebugFormat("[SIMULATION]: Stream handler called");
 
             Hashtable keysvals = new Hashtable();
             Hashtable headervals = new Hashtable();