diff options
author | Justin Clarke Casey | 2008-03-20 13:03:26 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-20 13:03:26 +0000 |
commit | 20473af89240457c1517bb547f8fc239478fd720 (patch) | |
tree | 80e6b35e567ff48d12a74299f8942c6d2c442a57 /OpenSim | |
parent | Fix server crash when setting prims physical under basic physics. (diff) | |
download | opensim-SC_OLD-20473af89240457c1517bb547f8fc239478fd720.zip opensim-SC_OLD-20473af89240457c1517bb547f8fc239478fd720.tar.gz opensim-SC_OLD-20473af89240457c1517bb547f8fc239478fd720.tar.bz2 opensim-SC_OLD-20473af89240457c1517bb547f8fc239478fd720.tar.xz |
Another poxy patch which consists mainly of logging changes (some already commented out) to find out what CAPS is doing
Diffstat (limited to 'OpenSim')
4 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 80949fe..878b0cc 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -105,8 +105,8 @@ namespace OpenSim.Region.Capabilities | |||
105 | /// </summary> | 105 | /// </summary> |
106 | public void RegisterHandlers() | 106 | public void RegisterHandlers() |
107 | { | 107 | { |
108 | m_log.Info("[CAPS]: Registering CAPS handlers"); | ||
109 | string capsBase = "/CAPS/" + m_capsObjectPath; | 108 | string capsBase = "/CAPS/" + m_capsObjectPath; |
109 | |||
110 | try | 110 | try |
111 | { | 111 | { |
112 | m_httpListener.AddStreamHandler( | 112 | m_httpListener.AddStreamHandler( |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs index bf47be7..a39f5aa 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | |||
@@ -35,6 +35,9 @@ namespace OpenSim.Region.Capabilities | |||
35 | { | 35 | { |
36 | public class LLSDHelpers | 36 | public class LLSDHelpers |
37 | { | 37 | { |
38 | // private static readonly log4net.ILog m_log | ||
39 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
40 | |||
38 | public static string SerialiseLLSDReply(object obj) | 41 | public static string SerialiseLLSDReply(object obj) |
39 | { | 42 | { |
40 | StringWriter sw = new StringWriter(); | 43 | StringWriter sw = new StringWriter(); |
@@ -44,6 +47,9 @@ namespace OpenSim.Region.Capabilities | |||
44 | SerializeLLSDType(writer, obj); | 47 | SerializeLLSDType(writer, obj); |
45 | writer.WriteEndElement(); | 48 | writer.WriteEndElement(); |
46 | writer.Close(); | 49 | writer.Close(); |
50 | |||
51 | //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString()); | ||
52 | |||
47 | return sw.ToString(); | 53 | return sw.ToString(); |
48 | } | 54 | } |
49 | 55 | ||
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index dca8e65..9f47239 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -43,7 +43,8 @@ namespace OpenSim.Region.Communications.Local | |||
43 | 43 | ||
44 | public class LocalLoginService : LoginService | 44 | public class LocalLoginService : LoginService |
45 | { | 45 | { |
46 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly log4net.ILog m_log |
47 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
47 | 48 | ||
48 | private CommunicationsLocal m_Parent; | 49 | private CommunicationsLocal m_Parent; |
49 | 50 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 01c78ab..e51c58d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -97,8 +97,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
97 | regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing; | 97 | regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing; |
98 | regionCommsHost.OnCloseAgentConnection += CloseConnection; | 98 | regionCommsHost.OnCloseAgentConnection += CloseConnection; |
99 | regionCommsHost.OnRegionUp += newRegionUp; | 99 | regionCommsHost.OnRegionUp += newRegionUp; |
100 | regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate; | 100 | regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate; |
101 | |||
102 | } | 101 | } |
103 | else | 102 | else |
104 | { | 103 | { |