aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ClientManager.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs3
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs12
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs3
4 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index cdccf0e..6ea12c1 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -71,12 +71,10 @@ namespace OpenSim.Framework
71 71
72 public void Remove(uint id) 72 public void Remove(uint id)
73 { 73 {
74 //m_log.InfoFormat("[CLIENT]: Removing client with code {0}, current count {1}", id, m_clients.Count);
75 lock (m_clients) 74 lock (m_clients)
76 { 75 {
77 m_clients.Remove(id); 76 m_clients.Remove(id);
78 } 77 }
79 m_log.InfoFormat("[CLIENT]: Removed client with code {0}, new client count {1}", id, m_clients.Count);
80 } 78 }
81 79
82 public void Add(uint id, IClientAPI client) 80 public void Add(uint id, IClientAPI client)
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 0cbb717..22aab10 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Communications.Cache
80 if (userID == UUID.Zero) 80 if (userID == UUID.Zero)
81 return; 81 return;
82 82
83 m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID); 83 //m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID);
84 GetUserDetails(userID); 84 GetUserDetails(userID);
85 } 85 }
86 86
@@ -95,7 +95,6 @@ namespace OpenSim.Framework.Communications.Cache
95 { 95 {
96 if (m_userProfiles.ContainsKey(userId)) 96 if (m_userProfiles.ContainsKey(userId))
97 { 97 {
98 m_log.DebugFormat("[USER CACHE]: Removing user {0}", userId);
99 m_userProfiles.Remove(userId); 98 m_userProfiles.Remove(userId);
100 return true; 99 return true;
101 } 100 }
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 91acfbe..6adf68c 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -157,7 +157,9 @@ namespace OpenSim.Framework.Communications.Capabilities
157 { 157 {
158 // the root of all evil 158 // the root of all evil
159 m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); 159 m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest);
160 m_log.Warn("[SEED]: " + capsBase + m_requestPath); 160 m_log.DebugFormat(
161 "[CAPS]: Registering seed capability {0} for {1}", capsBase + m_requestPath, m_agentID);
162
161 //m_capsHandlers["MapLayer"] = 163 //m_capsHandlers["MapLayer"] =
162 // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", 164 // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",
163 // capsBase + m_mapLayerPath, 165 // capsBase + m_mapLayerPath,
@@ -209,7 +211,7 @@ namespace OpenSim.Framework.Communications.Capabilities
209 public void RegisterHandler(string capName, IRequestHandler handler) 211 public void RegisterHandler(string capName, IRequestHandler handler)
210 { 212 {
211 m_capsHandlers[capName] = handler; 213 m_capsHandlers[capName] = handler;
212 m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path); 214 //m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);
213 } 215 }
214 216
215 /// <summary> 217 /// <summary>
@@ -242,10 +244,12 @@ namespace OpenSim.Framework.Communications.Capabilities
242 public string CapsRequest(string request, string path, string param, 244 public string CapsRequest(string request, string path, string param,
243 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 245 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
244 { 246 {
245 m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); 247 //m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);
246 //Console.WriteLine("caps request " + request); 248
247 string result = LLSDHelpers.SerialiseLLSDReply(m_capsHandlers.CapsDetails); 249 string result = LLSDHelpers.SerialiseLLSDReply(m_capsHandlers.CapsDetails);
250
248 //m_log.DebugFormat("[CAPS] CapsRequest {0}", result); 251 //m_log.DebugFormat("[CAPS] CapsRequest {0}", result);
252
249 return result; 253 return result;
250 } 254 }
251 255
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 3f2b902..2e3efd5 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -547,9 +547,6 @@ namespace OpenSim.Framework.Communications
547 547
548 if (userProfile != null) 548 if (userProfile != null)
549 { 549 {
550 // This line needs to be in side the above if statement or the UserServer will crash on some logouts.
551 m_log.Info("[LOGOUT]: " + userProfile.FirstName + " " + userProfile.SurName + " from " + regionhandle + "(" + position.X + "," + position.Y + "," + position.Z + ")");
552
553 UserAgentData userAgent = userProfile.CurrentAgent; 550 UserAgentData userAgent = userProfile.CurrentAgent;
554 if (userAgent != null) 551 if (userAgent != null)
555 { 552 {