aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-06 21:39:55 +0000
committerJustin Clarke Casey2009-01-06 21:39:55 +0000
commita31792ee5cb1ce619f21f5b428926c4709c3f14b (patch)
treef82a09b918c277741c97fdf4dca85fe1bd8463ac /OpenSim/Region/Environment/Modules
parent* Rename GetRandomCapsPath() to GetRandomCapsObjectPath() to fit in with term... (diff)
downloadopensim-SC_OLD-a31792ee5cb1ce619f21f5b428926c4709c3f14b.zip
opensim-SC_OLD-a31792ee5cb1ce619f21f5b428926c4709c3f14b.tar.gz
opensim-SC_OLD-a31792ee5cb1ce619f21f5b428926c4709c3f14b.tar.bz2
opensim-SC_OLD-a31792ee5cb1ce619f21f5b428926c4709c3f14b.tar.xz
* prune and regrade log messages relating to client login and logout
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs33
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs17
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs48
-rw-r--r--OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs18
-rw-r--r--OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs48
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs15
8 files changed, 70 insertions, 127 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index d281e44..64cd955 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -57,13 +57,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
57 if (appearance != null) 57 if (appearance != null)
58 { 58 {
59 //SetAppearanceAssets(profile, ref appearance); 59 //SetAppearanceAssets(profile, ref appearance);
60 m_log.InfoFormat("[APPEARANCE]: Found : {0}", appearance.ToString()); 60 //m_log.DebugFormat("[APPEARANCE]: Found : {0}", appearance.ToString());
61 return true; 61 return true;
62 } 62 }
63 } 63 }
64 64
65 appearance = CreateDefault(avatarId); 65 appearance = CreateDefault(avatarId);
66 m_log.InfoFormat("[APPEARANCE]: Appearance not found for {0}, creating default", avatarId); 66 m_log.ErrorFormat("[APPEARANCE]: Appearance not found for {0}, creating default", avatarId);
67 return false; 67 return false;
68 } 68 }
69 69
@@ -172,11 +172,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
172 AvatarAppearance avatAppearance = null; 172 AvatarAppearance avatAppearance = null;
173 if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) 173 if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance))
174 { 174 {
175 m_log.Info("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence"); 175 m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence");
176 avatAppearance = avatar.Appearance; 176 avatAppearance = avatar.Appearance;
177 } 177 }
178 178
179 m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name); 179 //m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name);
180 180
181 if (profile != null) 181 if (profile != null)
182 { 182 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index b752404..580982d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -305,7 +305,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
305 if (m_rootAgents.ContainsKey(AgentId)) 305 if (m_rootAgents.ContainsKey(AgentId))
306 { 306 {
307 m_rootAgents.Remove(AgentId); 307 m_rootAgents.Remove(AgentId);
308 m_log.Info("[FRIEND]: Removing " + AgentId + ". Agent was closed.");
309 } 308 }
310 } 309 }
311 } 310 }
@@ -315,7 +314,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
315 lock (m_rootAgents) 314 lock (m_rootAgents)
316 { 315 {
317 m_rootAgents[avatar.UUID] = avatar.RegionHandle; 316 m_rootAgents[avatar.UUID] = avatar.RegionHandle;
318 m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + ".");
319 // Claim User! my user! Mine mine mine! 317 // Claim User! my user! Mine mine mine!
320 } 318 }
321 } 319 }
@@ -331,7 +329,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
331 if (m_rootAgents[avatar.UUID] == avatar.RegionHandle) 329 if (m_rootAgents[avatar.UUID] == avatar.RegionHandle)
332 { 330 {
333 m_rootAgents.Remove(avatar.UUID); 331 m_rootAgents.Remove(avatar.UUID);
334 m_log.Info("[FRIEND]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent"); 332 m_log.Debug("[FRIEND]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent");
335 } 333 }
336 } 334 }
337 } 335 }
@@ -799,11 +797,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
799 /// <param name="iAmOnline"></param> 797 /// <param name="iAmOnline"></param>
800 private void SendPresenceState(IClientAPI client, List<FriendListItem> friendList, bool iAmOnline) 798 private void SendPresenceState(IClientAPI client, List<FriendListItem> friendList, bool iAmOnline)
801 { 799 {
802 m_log.DebugFormat("[FRIEND]: {0} logged {1}; sending presence updates", client.Name, iAmOnline ? "in" : "out"); 800 //m_log.DebugFormat("[FRIEND]: {0} logged {1}; sending presence updates", client.Name, iAmOnline ? "in" : "out");
803 801
804 if (friendList == null || friendList.Count == 0) 802 if (friendList == null || friendList.Count == 0)
805 { 803 {
806 m_log.DebugFormat("[FRIEND]: {0} doesn't have friends.", client.Name); 804 //m_log.DebugFormat("[FRIEND]: {0} doesn't have friends.", client.Name);
807 return; // nothing we can do if she doesn't have friends... 805 return; // nothing we can do if she doesn't have friends...
808 } 806 }
809 807
@@ -984,8 +982,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
984 982
985 private void OnLogout(IClientAPI remoteClient) 983 private void OnLogout(IClientAPI remoteClient)
986 { 984 {
987 m_log.DebugFormat("[FRIEND]: Client {0} logged out", remoteClient.Name);
988
989 List<FriendListItem> fl; 985 List<FriendListItem> fl;
990 lock (m_friendLists) 986 lock (m_friendLists)
991 { 987 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
index eea8e40..dbb645e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
@@ -64,13 +64,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
64 64
65 if (groupsConfig == null) 65 if (groupsConfig == null)
66 { 66 {
67 m_log.Info("[GROUPS] No configuration found. Using defaults"); 67 m_log.Info("[GROUPS]: No configuration found. Using defaults");
68 } 68 }
69 else 69 else
70 { 70 {
71 if (!groupsConfig.GetBoolean("Enabled", false)) 71 if (!groupsConfig.GetBoolean("Enabled", false))
72 { 72 {
73 m_log.Info("[GROUPS] Groups disabled in configuration"); 73 m_log.Info("[GROUPS]: Groups disabled in configuration");
74 return; 74 return;
75 } 75 }
76 76
@@ -78,8 +78,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
78 return; 78 return;
79 } 79 }
80 80
81 m_log.Info("[GROUPS] Activated default groups module");
82
83 lock (m_SceneList) 81 lock (m_SceneList)
84 { 82 {
85 if (!m_SceneList.Contains(scene)) 83 if (!m_SceneList.Contains(scene))
@@ -109,7 +107,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
109 107
110 public void Close() 108 public void Close()
111 { 109 {
112 m_log.Info("[GROUP]: Shutting down group module."); 110// m_log.Debug("[GROUPS]: Shutting down group module.");
111
113 lock (m_ClientMap) 112 lock (m_ClientMap)
114 { 113 {
115 m_ClientMap.Clear(); 114 m_ClientMap.Clear();
@@ -135,7 +134,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
135 134
136 private void OnNewClient(IClientAPI client) 135 private void OnNewClient(IClientAPI client)
137 { 136 {
138
139 // Subscribe to instant messages 137 // Subscribe to instant messages
140 client.OnInstantMessage += OnInstantMessage; 138 client.OnInstantMessage += OnInstantMessage;
141 client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest; 139 client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest;
@@ -148,9 +146,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
148 } 146 }
149 } 147 }
150 148
151 m_log.Info("[GROUP]: Adding " + client.Name + " to " +
152 osGroup.GroupName + " ");
153
154 GroupMembershipData[] updateGroups = new GroupMembershipData[1]; 149 GroupMembershipData[] updateGroups = new GroupMembershipData[1];
155 updateGroups[0] = osGroup; 150 updateGroups[0] = osGroup;
156 151
@@ -211,17 +206,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
211 { 206 {
212 if (m_ClientMap.ContainsKey(agentID)) 207 if (m_ClientMap.ContainsKey(agentID))
213 { 208 {
214 IClientAPI cli = m_ClientMap[agentID]; 209// IClientAPI cli = m_ClientMap[agentID];
215 if (cli != null) 210// if (cli != null)
216 { 211// {
217 m_log.Info("[GROUP]: Removing all reference to groups "+ 212// //m_log.Info("[GROUPS]: Removing all reference to groups for " + cli.Name);
218 "for " + cli.Name); 213// }
219 } 214// else
220 else 215// {
221 { 216// //m_log.Info("[GROUPS]: Removing all reference to groups for " + agentID.ToString());
222 m_log.Info("[GROUP]: Removing all reference to groups "+ 217// }
223 "for " + agentID.ToString());
224 }
225 m_ClientMap.Remove(agentID); 218 m_ClientMap.Remove(agentID);
226 } 219 }
227 } 220 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
index c811833..a7816b0 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
@@ -245,7 +245,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
245 // Triggered when the user logs off. 245 // Triggered when the user logs off.
246 public void OnLogout(IClientAPI client) 246 public void OnLogout(IClientAPI client)
247 { 247 {
248 m_log.DebugFormat("[PRESENCE]: Got OnLogout from {0}", client.Name);
249 if (!(client.Scene is Scene)) 248 if (!(client.Scene is Scene))
250 return; 249 return;
251 Scene scene = (Scene)client.Scene; 250 Scene scene = (Scene)client.Scene;
@@ -343,12 +342,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
343 Hashtable responseData = (Hashtable)resp.Value; 342 Hashtable responseData = (Hashtable)resp.Value;
344 if (responseData == null || (!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE") 343 if (responseData == null || (!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
345 { 344 {
346 m_log.ErrorFormat("[PRESENCE] Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); 345 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
347 } 346 }
348 } 347 }
349 catch (System.Net.WebException) 348 catch (System.Net.WebException)
350 { 349 {
351 m_log.ErrorFormat("[PRESENCE] Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); 350 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
352 } 351 }
353 } 352 }
354 353
@@ -366,12 +365,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
366 Hashtable responseData = (Hashtable)resp.Value; 365 Hashtable responseData = (Hashtable)resp.Value;
367 if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE") 366 if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
368 { 367 {
369 m_log.ErrorFormat("[PRESENCE] Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); 368 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
370 } 369 }
371 } 370 }
372 catch (System.Net.WebException) 371 catch (System.Net.WebException)
373 { 372 {
374 m_log.ErrorFormat("[PRESENCE] Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); 373 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
375 } 374 }
376 } 375 }
377 376
@@ -391,12 +390,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
391 Hashtable responseData = (Hashtable)resp.Value; 390 Hashtable responseData = (Hashtable)resp.Value;
392 if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE") 391 if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
393 { 392 {
394 m_log.ErrorFormat("[PRESENCE] Failed to notify message server of agent location for {0}", agentID.ToString()); 393 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
395 } 394 }
396 } 395 }
397 catch (System.Net.WebException) 396 catch (System.Net.WebException)
398 { 397 {
399 m_log.ErrorFormat("[PRESENCE] Failed to notify message server of agent location for {0}", agentID.ToString()); 398 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
400 } 399 }
401 } 400 }
402 401
@@ -416,12 +415,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
416 Hashtable responseData = (Hashtable)resp.Value; 415 Hashtable responseData = (Hashtable)resp.Value;
417 if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE") 416 if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
418 { 417 {
419 m_log.ErrorFormat("[PRESENCE] Failed to notify message server of agent leaving for {0}", agentID.ToString()); 418 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
420 } 419 }
421 } 420 }
422 catch (System.Net.WebException) 421 catch (System.Net.WebException)
423 { 422 {
424 m_log.ErrorFormat("[PRESENCE] Failed to notify message server of agent leaving for {0}", agentID.ToString()); 423 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
425 } 424 }
426 } 425 }
427 } 426 }
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
index 9006fe0..3f46e95 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
@@ -72,7 +72,6 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
72 private Dictionary<UUID, BlockingLLSDQueue> queues = new Dictionary<UUID, BlockingLLSDQueue>(); 72 private Dictionary<UUID, BlockingLLSDQueue> queues = new Dictionary<UUID, BlockingLLSDQueue>();
73 private Dictionary<UUID, UUID> m_QueueUUIDAvatarMapping = new Dictionary<UUID, UUID>(); 73 private Dictionary<UUID, UUID> m_QueueUUIDAvatarMapping = new Dictionary<UUID, UUID>();
74 private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>(); 74 private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>();
75
76 75
77 #region IRegionModule methods 76 #region IRegionModule methods
78 public void Initialise(Scene scene, IConfigSource config) 77 public void Initialise(Scene scene, IConfigSource config)
@@ -101,11 +100,8 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
101 // circuit is there. 100 // circuit is there.
102 101
103 scene.EventManager.OnClientClosed += ClientClosed; 102 scene.EventManager.OnClientClosed += ClientClosed;
104 scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
105 scene.EventManager.OnMakeChildAgent += MakeChildAgent; 103 scene.EventManager.OnMakeChildAgent += MakeChildAgent;
106 scene.EventManager.OnRegisterCaps += OnRegisterCaps; 104 scene.EventManager.OnRegisterCaps += OnRegisterCaps;
107
108 m_log.DebugFormat("[EVENTQUEUE]: Enabled EventQueueGetModule for region {0}", scene.RegionInfo.RegionName);
109 } 105 }
110 else 106 else
111 { 107 {
@@ -149,10 +145,13 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
149 { 145 {
150 if (!queues.ContainsKey(agentId)) 146 if (!queues.ContainsKey(agentId))
151 { 147 {
152 m_log.DebugFormat("[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", agentId, 148 m_log.DebugFormat(
153 m_scene.RegionInfo.RegionName); 149 "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}",
150 agentId, m_scene.RegionInfo.RegionName);
151
154 queues[agentId] = new BlockingLLSDQueue(); 152 queues[agentId] = new BlockingLLSDQueue();
155 } 153 }
154
156 return queues[agentId]; 155 return queues[agentId];
157 } 156 }
158 } 157 }
@@ -179,17 +178,19 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
179 178
180 public bool Enqueue(OSD ev, UUID avatarID) 179 public bool Enqueue(OSD ev, UUID avatarID)
181 { 180 {
182 m_log.DebugFormat("[EVENTQUEUE]: Enqueuing event for {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName); 181 //m_log.DebugFormat("[EVENTQUEUE]: Enqueuing event for {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName);
183 try 182 try
184 { 183 {
185 BlockingLLSDQueue queue = GetQueue(avatarID); 184 BlockingLLSDQueue queue = GetQueue(avatarID);
186 if (queue != null) 185 if (queue != null)
187 queue.Enqueue(ev); 186 queue.Enqueue(ev);
188 } catch(NullReferenceException e) 187 }
188 catch(NullReferenceException e)
189 { 189 {
190 m_log.Debug("[EVENTQUEUE] Caught exception: " + e); 190 m_log.Error("[EVENTQUEUE] Caught exception: " + e);
191 return false; 191 return false;
192 } 192 }
193
193 return true; 194 return true;
194 } 195 }
195 196
@@ -234,7 +235,6 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
234 { 235 {
235 m_AvatarQueueUUIDMapping.Remove(ky); 236 m_AvatarQueueUUIDMapping.Remove(ky);
236 m_scene.CommsManager.HttpServer.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/"); 237 m_scene.CommsManager.HttpServer.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/");
237 m_log.Debug("[EVENTQUEUE]: Removing " + "/CAPS/EQG/" + ky.ToString() + "/");
238 } 238 }
239 239
240 } 240 }
@@ -258,14 +258,6 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
258 m_QueueUUIDAvatarMapping.Remove(ky); 258 m_QueueUUIDAvatarMapping.Remove(ky);
259 259
260 } 260 }
261
262 m_log.DebugFormat("[EVENTQUEUE]: Client {0} deregistered in region {1}.", AgentID, m_scene.RegionInfo.RegionName);
263 }
264
265 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
266 {
267 m_log.DebugFormat("[EVENTQUEUE]: Avatar {0} entering parcel {1} in region {2}.",
268 avatar.UUID, localLandID, m_scene.RegionInfo.RegionName);
269 } 261 }
270 262
271 private void MakeChildAgent(ScenePresence avatar) 263 private void MakeChildAgent(ScenePresence avatar)
@@ -283,7 +275,11 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
283 275
284 public void OnRegisterCaps(UUID agentID, Caps caps) 276 public void OnRegisterCaps(UUID agentID, Caps caps)
285 { 277 {
286 m_log.DebugFormat("[EVENTQUEUE] OnRegisterCaps: agentID {0} caps {1} region {2}", agentID, caps, m_scene.RegionInfo.RegionName); 278 // Register an event queue for the client
279
280 //m_log.DebugFormat(
281 // "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
282 // agentID, caps, m_scene.RegionInfo.RegionName);
287 283
288 // Let's instantiate a Queue for this agent right now 284 // Let's instantiate a Queue for this agent right now
289 TryGetQueue(agentID); 285 TryGetQueue(agentID);
@@ -302,7 +298,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
302 else 298 else
303 { 299 {
304 EventQueueGetUUID = UUID.Random(); 300 EventQueueGetUUID = UUID.Random();
305 m_log.DebugFormat("[EVENTQUEUE]: Using random UUID!"); 301 //m_log.DebugFormat("[EVENTQUEUE]: Using random UUID!");
306 } 302 }
307 } 303 }
308 304
@@ -318,13 +314,12 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
318 m_AvatarQueueUUIDMapping.Add(agentID, EventQueueGetUUID); 314 m_AvatarQueueUUIDMapping.Add(agentID, EventQueueGetUUID);
319 } 315 }
320 316
321 m_log.DebugFormat("[EVENTQUEUE]: CAPS URL: {0}", capsBase + EventQueueGetUUID.ToString() + "/");
322 // Register this as a caps handler 317 // Register this as a caps handler
323 caps.RegisterHandler("EventQueueGet", 318 caps.RegisterHandler("EventQueueGet",
324 new RestHTTPHandler("POST", capsBase + EventQueueGetUUID.ToString() + "/", 319 new RestHTTPHandler("POST", capsBase + EventQueueGetUUID.ToString() + "/",
325 delegate(Hashtable m_dhttpMethod) 320 delegate(Hashtable m_dhttpMethod)
326 { 321 {
327 return ProcessQueue(m_dhttpMethod,agentID, caps); 322 return ProcessQueue(m_dhttpMethod, agentID, caps);
328 })); 323 }));
329 324
330 // This will persist this beyond the expiry of the caps handlers 325 // This will persist this beyond the expiry of the caps handlers
@@ -339,7 +334,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
339 } 334 }
340 } 335 }
341 336
342 public Hashtable ProcessQueue(Hashtable request,UUID agentID, Caps caps) 337 public Hashtable ProcessQueue(Hashtable request, UUID agentID, Caps caps)
343 { 338 {
344 // TODO: this has to be redone to not busy-wait (and block the thread), 339 // TODO: this has to be redone to not busy-wait (and block the thread),
345 // TODO: as soon as we have a non-blocking way to handle HTTP-requests. 340 // TODO: as soon as we have a non-blocking way to handle HTTP-requests.
@@ -382,9 +377,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
382 responsedata["error_status_text"] = "Upstream error:"; 377 responsedata["error_status_text"] = "Upstream error:";
383 responsedata["http_protocol_version"] = "HTTP/1.0"; 378 responsedata["http_protocol_version"] = "HTTP/1.0";
384 return responsedata; 379 return responsedata;
385 } 380 }
386
387
388 381
389 OSDArray array = new OSDArray(); 382 OSDArray array = new OSDArray();
390 if (element == null) // didn't have an event in 15s 383 if (element == null) // didn't have an event in 15s
@@ -416,7 +409,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
416 responsedata["content_type"] = "application/xml"; 409 responsedata["content_type"] = "application/xml";
417 responsedata["keepalive"] = false; 410 responsedata["keepalive"] = false;
418 responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(events); 411 responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(events);
419 m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]); 412 //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]);
420 413
421 return responsedata; 414 return responsedata;
422 } 415 }
@@ -561,6 +554,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
561 { 554 {
562 //return new LLSD(); 555 //return new LLSD();
563 } 556 }
557
564 return new OSDString("shutdown404!"); 558 return new OSDString("shutdown404!");
565 } 559 }
566 } 560 }
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index 3f82190..88eabe1 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -144,22 +144,20 @@ namespace OpenSim.Region.Environment.Modules
144 //m_log.Debug("[OFFSET]: " + hour + " - " + LindenHour + " - " + offsethours.ToString()); 144 //m_log.Debug("[OFFSET]: " + hour + " - " + LindenHour + " - " + offsethours.ToString());
145 145
146 LindenHourOffset = (long)((float)offsethours * (36000000000/m_day_length)); 146 LindenHourOffset = (long)((float)offsethours * (36000000000/m_day_length));
147 m_log.Info("[SUN]: Directive from the Estate Tools to set the sun phase to LindenHour " + GetLindenEstateHourFromCurrentTime().ToString()); 147 m_log.Debug("[SUN]: Directive from the Estate Tools to set the sun phase to LindenHour " + GetLindenEstateHourFromCurrentTime().ToString());
148 } 148 }
149 149
150 // Called immediately after the module is loaded for a given region 150 // Called immediately after the module is loaded for a given region
151 // i.e. Immediately after instance creation. 151 // i.e. Immediately after instance creation.
152 public void Initialise(Scene scene, IConfigSource config) 152 public void Initialise(Scene scene, IConfigSource config)
153 { 153 {
154 m_log.Debug("[SUN] Initializing");
155
156 m_scene = scene; 154 m_scene = scene;
157 155
158 m_frame = 0; 156 m_frame = 0;
159 157
160 TimeZone local = TimeZone.CurrentTimeZone; 158 TimeZone local = TimeZone.CurrentTimeZone;
161 TicksOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks; 159 TicksOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks;
162 m_log.Debug("[SUN] localtime offset is " + TicksOffset); 160 m_log.Debug("[SUN]: localtime offset is " + TicksOffset);
163 161
164 // Align ticks with Second Life 162 // Align ticks with Second Life
165 163
@@ -185,7 +183,7 @@ namespace OpenSim.Region.Environment.Modules
185 } 183 }
186 catch (Exception e) 184 catch (Exception e)
187 { 185 {
188 m_log.Debug("[SUN] Configuration access failed, using defaults. Reason: "+e.Message); 186 m_log.Debug("[SUN]: Configuration access failed, using defaults. Reason: "+e.Message);
189 m_mode = d_mode; 187 m_mode = d_mode;
190 m_year_length = d_year_length; 188 m_year_length = d_year_length;
191 m_day_length = d_day_length; 189 m_day_length = d_day_length;
@@ -231,10 +229,10 @@ namespace OpenSim.Region.Environment.Modules
231 229
232 ready = true; 230 ready = true;
233 231
234 m_log.Debug("[SUN] Mode is "+m_mode); 232 m_log.Debug("[SUN]: Mode is "+m_mode);
235 m_log.Debug("[SUN] Initialization completed. Day is "+SecondsPerSunCycle+" seconds, and year is "+m_year_length+" days"); 233 m_log.Debug("[SUN]: Initialization completed. Day is "+SecondsPerSunCycle+" seconds, and year is "+m_year_length+" days");
236 m_log.Debug("[SUN] Axis offset is "+m_day_night); 234 m_log.Debug("[SUN]: Axis offset is "+m_day_night);
237 m_log.Debug("[SUN] Positional data updated every "+m_frame_mod+" frames"); 235 m_log.Debug("[SUN]: Positional data updated every "+m_frame_mod+" frames");
238 236
239 break; 237 break;
240 } 238 }
@@ -276,7 +274,6 @@ namespace OpenSim.Region.Environment.Modules
276 if (!sunFixed) 274 if (!sunFixed)
277 GenSunPos(); // Generate shared values once 275 GenSunPos(); // Generate shared values once
278 client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition); 276 client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
279 m_log.Debug("[SUN] Initial update for new client");
280 } 277 }
281 } 278 }
282 } 279 }
@@ -383,7 +380,6 @@ namespace OpenSim.Region.Environment.Modules
383 if (m_rootAgents.ContainsKey(AgentId)) 380 if (m_rootAgents.ContainsKey(AgentId))
384 { 381 {
385 m_rootAgents.Remove(AgentId); 382 m_rootAgents.Remove(AgentId);
386 m_log.Info("[SUN]: Removing " + AgentId + ". Agent logged out.");
387 } 383 }
388 } 384 }
389 } 385 }
diff --git a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
index 52eb6e7..6b06fbd 100644
--- a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
@@ -37,7 +37,6 @@ namespace OpenSim.Region.Environment.Modules
37{ 37{
38 public class WindModule : IWindModule 38 public class WindModule : IWindModule
39 { 39 {
40
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
42 41
43 private int m_frame = 0; 42 private int m_frame = 0;
@@ -46,40 +45,14 @@ namespace OpenSim.Region.Environment.Modules
46 private Scene m_scene = null; 45 private Scene m_scene = null;
47 private bool ready = false; 46 private bool ready = false;
48 private Vector2[] windSpeeds = new Vector2[16 * 16]; 47 private Vector2[] windSpeeds = new Vector2[16 * 16];
49
50 private Dictionary<UUID, ulong> m_rootAgents = new Dictionary<UUID, ulong>(); 48 private Dictionary<UUID, ulong> m_rootAgents = new Dictionary<UUID, ulong>();
51 49
52 // Current time in elpased seconds since Jan 1st 1970
53
54
55 public void Initialise(Scene scene, IConfigSource config) 50 public void Initialise(Scene scene, IConfigSource config)
56 { 51 {
57 m_log.Debug("[WIND] Initializing");
58
59 m_scene = scene; 52 m_scene = scene;
60
61 m_frame = 0; 53 m_frame = 0;
62 54
63 55 scene.EventManager.OnFrame += WindUpdate;
64
65 // Align ticks with Second Life
66
67
68
69 // Just in case they don't have the stanzas
70 try
71 {
72
73 }
74 catch (Exception e)
75 {
76 m_log.Debug("[WIND] Configuration access failed, using defaults. Reason: " + e.Message);
77
78 }
79
80
81 scene.EventManager.OnFrame += WindUpdate;
82
83 scene.EventManager.OnMakeChildAgent += MakeChildAgent; 56 scene.EventManager.OnMakeChildAgent += MakeChildAgent;
84 scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel; 57 scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
85 scene.EventManager.OnClientClosed += ClientLoggedOut; 58 scene.EventManager.OnClientClosed += ClientLoggedOut;
@@ -88,9 +61,6 @@ namespace OpenSim.Region.Environment.Modules
88 GenWindPos(); 61 GenWindPos();
89 62
90 ready = true; 63 ready = true;
91
92
93
94 } 64 }
95 65
96 public void PostInitialise() 66 public void PostInitialise()
@@ -125,13 +95,12 @@ namespace OpenSim.Region.Environment.Modules
125 95
126 public void WindToClient(IClientAPI client) 96 public void WindToClient(IClientAPI client)
127 { 97 {
128 if (ready) 98 if (ready)
129 { 99 {
130 //if (!sunFixed) 100 //if (!sunFixed)
131 //GenWindPos(); // Generate shared values once 101 //GenWindPos(); // Generate shared values once
132 client.SendWindData(windSpeeds); 102 client.SendWindData(windSpeeds);
133 m_log.Debug("[WIND] Initial update for new client"); 103 }
134 }
135 } 104 }
136 105
137 public void WindUpdate() 106 public void WindUpdate()
@@ -199,7 +168,6 @@ namespace OpenSim.Region.Environment.Modules
199 if (m_rootAgents.ContainsKey(AgentId)) 168 if (m_rootAgents.ContainsKey(AgentId))
200 { 169 {
201 m_rootAgents.Remove(AgentId); 170 m_rootAgents.Remove(AgentId);
202 m_log.Info("[WIND]: Removing " + AgentId + ". Agent logged out.");
203 } 171 }
204 } 172 }
205 } 173 }
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
index 6ce82ad..cf1900b 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
122 122
123 string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); 123 string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString();
124 regionimage = regionimage.Replace("-", ""); 124 regionimage = regionimage.Replace("-", "");
125 m_log.Warn("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); 125 m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage);
126 126
127 m_scene.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage); 127 m_scene.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
128 m_scene.CommsManager.HttpServer.AddLLSDHandler( 128 m_scene.CommsManager.HttpServer.AddLLSDHandler(
@@ -137,7 +137,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
137 137
138 public void OnRegisterCaps(UUID agentID, Caps caps) 138 public void OnRegisterCaps(UUID agentID, Caps caps)
139 { 139 {
140 m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps); 140 //m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
141 string capsBase = "/CAPS/" + caps.CapsObjectPath; 141 string capsBase = "/CAPS/" + caps.CapsObjectPath;
142 caps.RegisterHandler("MapLayer", 142 caps.RegisterHandler("MapLayer",
143 new RestStreamHandler("POST", capsBase + m_mapLayerPath, 143 new RestStreamHandler("POST", capsBase + m_mapLayerPath,
@@ -286,7 +286,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
286 { 286 {
287 if (threadrunning) return; 287 if (threadrunning) return;
288 threadrunning = true; 288 threadrunning = true;
289 m_log.Warn("[WORLD MAP]: Starting remote MapItem request thread"); 289 m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
290 mapItemReqThread = new Thread(new ThreadStart(process)); 290 mapItemReqThread = new Thread(new ThreadStart(process));
291 mapItemReqThread.IsBackground = true; 291 mapItemReqThread.IsBackground = true;
292 mapItemReqThread.Name = "MapItemRequestThread"; 292 mapItemReqThread.Name = "MapItemRequestThread";
@@ -419,7 +419,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
419 } 419 }
420 420
421 threadrunning = false; 421 threadrunning = false;
422 m_log.Debug("[WORLD MAP]: Remote request thread exiting");
423 } 422 }
424 423
425 /// <summary> 424 /// <summary>
@@ -557,7 +556,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
557 if (!m_blacklistedregions.ContainsKey(regionhandle)) 556 if (!m_blacklistedregions.ContainsKey(regionhandle))
558 m_blacklistedregions.Add(regionhandle, System.Environment.TickCount); 557 m_blacklistedregions.Add(regionhandle, System.Environment.TickCount);
559 } 558 }
560 m_log.WarnFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString()); 559 m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString());
561 } 560 }
562 } 561 }
563 562
@@ -606,7 +605,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
606 } 605 }
607 catch (WebException ex) 606 catch (WebException ex)
608 { 607 {
609 m_log.InfoFormat("[WORLD MAP]: Bad send on GetMapItems {0}", ex.Message); 608 m_log.WarnFormat("[WORLD MAP]: Bad send on GetMapItems {0}", ex.Message);
610 responseMap["connect"] = OSD.FromBoolean(false); 609 responseMap["connect"] = OSD.FromBoolean(false);
611 lock (m_blacklistedurls) 610 lock (m_blacklistedurls)
612 { 611 {
@@ -716,7 +715,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
716 715
717 public Hashtable OnHTTPGetMapImage(Hashtable keysvals) 716 public Hashtable OnHTTPGetMapImage(Hashtable keysvals)
718 { 717 {
719 m_log.Info("[WORLD MAP]: Sending map image jpeg"); 718 m_log.Debug("[WORLD MAP]: Sending map image jpeg");
720 Hashtable reply = new Hashtable(); 719 Hashtable reply = new Hashtable();
721 int statuscode = 200; 720 int statuscode = 200;
722 byte[] jpeg = new byte[0]; 721 byte[] jpeg = new byte[0];
@@ -857,8 +856,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
857 // You may ask, why this is in a threadpool to start with.. 856 // You may ask, why this is in a threadpool to start with..
858 // The reason is so we don't cause the thread to freeze waiting 857 // The reason is so we don't cause the thread to freeze waiting
859 // for the 1 second it costs to start a thread manually. 858 // for the 1 second it costs to start a thread manually.
860
861 m_log.Warn("[WORLD MAP]: MakeRootAgent Works!");
862 if (!threadrunning) 859 if (!threadrunning)
863 ThreadPool.QueueUserWorkItem(new WaitCallback(this.StartThread)); 860 ThreadPool.QueueUserWorkItem(new WaitCallback(this.StartThread));
864 861