aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-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
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs10
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs4
-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
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs18
21 files changed, 92 insertions, 181 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 {
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index cca5be2..a4c8065 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -277,7 +277,7 @@ namespace OpenSim.Grid.UserServer
277 private void AddActiveGestures(LoginResponse response, UserProfileData theUser) 277 private void AddActiveGestures(LoginResponse response, UserProfileData theUser)
278 { 278 {
279 List<InventoryItemBase> gestures = m_inventoryService.GetActiveGestures(theUser.ID); 279 List<InventoryItemBase> gestures = m_inventoryService.GetActiveGestures(theUser.ID);
280 m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count); 280 //m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count);
281 ArrayList list = new ArrayList(); 281 ArrayList list = new ArrayList();
282 if (gestures != null) 282 if (gestures != null)
283 { 283 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 38450ed..6742948 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -534,8 +534,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
534 m_clientPingTimer.Enabled = false; 534 m_clientPingTimer.Enabled = false;
535 535
536 m_log.DebugFormat( 536 m_log.DebugFormat(
537 "[CLIENT]: Close has been called with shutdownCircuit = {0} on scene {1}", 537 "[CLIENT]: Close has been called with shutdownCircuit = {0} for {1} attached to scene {2}",
538 shutdownCircuit, m_scene.RegionInfo.RegionName); 538 shutdownCircuit, Name, m_scene.RegionInfo.RegionName);
539 539
540 m_PacketHandler.Flush(); 540 m_PacketHandler.Flush();
541 541
@@ -724,7 +724,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
724 protected virtual void ClientLoop() 724 protected virtual void ClientLoop()
725 { 725 {
726 m_log.DebugFormat( 726 m_log.DebugFormat(
727 "[CLIENT]: Entered main packet processing loop for {0} {1}", FirstName, LastName); 727 "[CLIENT]: Entered main packet processing loop for {0} in {1}", Name, Scene.RegionInfo.RegionName);
728 728
729 while (IsActive) 729 while (IsActive)
730 { 730 {
@@ -3807,7 +3807,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3807 /// <returns></returns> 3807 /// <returns></returns>
3808 protected virtual bool Logout(IClientAPI client) 3808 protected virtual bool Logout(IClientAPI client)
3809 { 3809 {
3810 m_log.Info("[CLIENT]: Got a logout request"); 3810 m_log.InfoFormat("[CLIENT]: Got a logout request for {0} in {1}", Name, Scene.RegionInfo.RegionName);
3811 3811
3812 handlerLogout = OnLogout; 3812 handlerLogout = OnLogout;
3813 3813
@@ -4419,8 +4419,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4419 4419
4420 if (handlerRequestWearables != null) 4420 if (handlerRequestWearables != null)
4421 { 4421 {
4422 m_log.DebugFormat("[APPEARANCE]: Wearables requested by {0}", Name);
4423
4424 handlerRequestWearables(); 4422 handlerRequestWearables();
4425 } 4423 }
4426 4424
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 365c35f..17c3f97 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -258,7 +258,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
258 258
259 public void WipeClean() 259 public void WipeClean()
260 { 260 {
261 m_log.Info("[PACKETQUEUE] Wiping Packet Queues Clean");
262 lock (this) 261 lock (this)
263 { 262 {
264 ResendOutgoingPacketQueue.Clear(); 263 ResendOutgoingPacketQueue.Clear();
@@ -275,7 +274,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
275 274
276 public void Close() 275 public void Close()
277 { 276 {
278 m_log.Info("[PACKETQUEUE] Close called");
279 Flush(); 277 Flush();
280 WipeClean(); // I'm sure there's a dirty joke in here somewhere. -AFrisby 278 WipeClean(); // I'm sure there's a dirty joke in here somewhere. -AFrisby
281 279
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 2daf425..f1a3c7f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -407,9 +407,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
407 /// <param name="epSender"></param> 407 /// <param name="epSender"></param>
408 /// <param name="epProxy"></param> 408 /// <param name="epProxy"></param>
409 protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy) 409 protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy)
410 { 410 {
411 m_log.Debug("[CONNECTION DEBUGGING] AddNewClient Called");
412
413 //Slave regions don't accept new clients 411 //Slave regions don't accept new clients
414 if (m_localScene.Region_Status != RegionStatus.SlaveScene) 412 if (m_localScene.Region_Status != RegionStatus.SlaveScene)
415 { 413 {
@@ -426,7 +424,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
426 } 424 }
427 else 425 else
428 { 426 {
429 m_log.Info("[CLIENT]: Got authenticated connection from " + epSender); 427 m_log.Debug("[CLIENT]: Got authenticated connection from " + epSender);
430 } 428 }
431 429
432 lock (clientCircuits) 430 lock (clientCircuits)
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 9ee10e8..c572b3b 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -266,7 +266,7 @@ namespace OpenSim.Region.Communications.Local
266 private void AddActiveGestures(LoginResponse response, UserProfileData theUser) 266 private void AddActiveGestures(LoginResponse response, UserProfileData theUser)
267 { 267 {
268 List<InventoryItemBase> gestures = m_interServiceInventoryService.GetActiveGestures(theUser.ID); 268 List<InventoryItemBase> gestures = m_interServiceInventoryService.GetActiveGestures(theUser.ID);
269 m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count); 269 //m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count);
270 ArrayList list = new ArrayList(); 270 ArrayList list = new ArrayList();
271 if (gestures != null) 271 if (gestures != null)
272 { 272 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index fe69408..64e184d 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -622,12 +622,12 @@ namespace OpenSim.Region.Communications.OGS1
622 622
623 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1")) 623 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
624 { 624 {
625 m_log.Debug("[CLIENT]: Child agent detected"); 625 //m_log.Debug("[CLIENT]: Child agent detected");
626 agentData.child = true; 626 agentData.child = true;
627 } 627 }
628 else 628 else
629 { 629 {
630 m_log.Debug("[CLIENT]: Main agent detected"); 630 //m_log.Debug("[CLIENT]: Main agent detected");
631 agentData.startpos = 631 agentData.startpos =
632 new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]), 632 new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
633 (float)Convert.ToDecimal((string)requestData["startpos_y"]), 633 (float)Convert.ToDecimal((string)requestData["startpos_y"]),
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
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 18afb86..3bf6cef 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2576,7 +2576,6 @@ namespace OpenSim.Region.Environment.Scenes
2576 2576
2577 if (avatar.Scene.NeedSceneCacheClear(avatar.UUID)) 2577 if (avatar.Scene.NeedSceneCacheClear(avatar.UUID))
2578 { 2578 {
2579 m_log.InfoFormat("[SCENE]: User {0} is going to another region, profile cache removed in {1}", avatar.UUID, RegionInfo.RegionName);
2580 CommsManager.UserProfileCacheService.RemoveUser(agentID); 2579 CommsManager.UserProfileCacheService.RemoveUser(agentID);
2581 } 2580 }
2582 2581
@@ -2860,10 +2859,6 @@ namespace OpenSim.Region.Environment.Scenes
2860 2859
2861 String capsObjectPath = GetCapsPath(agentId); 2860 String capsObjectPath = GetCapsPath(agentId);
2862 2861
2863 m_log.DebugFormat(
2864 "[CAPS]: Setting up CAPS handler for agent {0} in {1}",
2865 agentId, RegionInfo.RegionName);
2866
2867 Caps cap = null; 2862 Caps cap = null;
2868 if (m_capsHandlers.TryGetValue(agentId, out cap)) 2863 if (m_capsHandlers.TryGetValue(agentId, out cap))
2869 { 2864 {
@@ -2908,7 +2903,6 @@ namespace OpenSim.Region.Environment.Scenes
2908 { 2903 {
2909 if (childrenSeeds.ContainsKey(agentId)) 2904 if (childrenSeeds.ContainsKey(agentId))
2910 { 2905 {
2911 //Console.WriteLine(" !!! Removing seeds for {0} in {1}", agentId, RegionInfo.RegionName);
2912 childrenSeeds.Remove(agentId); 2906 childrenSeeds.Remove(agentId);
2913 } 2907 }
2914 2908
@@ -2916,10 +2910,6 @@ namespace OpenSim.Region.Environment.Scenes
2916 { 2910 {
2917 if (m_capsHandlers.ContainsKey(agentId)) 2911 if (m_capsHandlers.ContainsKey(agentId))
2918 { 2912 {
2919 m_log.DebugFormat(
2920 "[CAPS]: Removing CAPS handler for root agent {0} in {1}",
2921 agentId, RegionInfo.RegionName);
2922
2923 m_capsHandlers[agentId].DeregisterHandlers(); 2913 m_capsHandlers[agentId].DeregisterHandlers();
2924 EventManager.TriggerOnDeregisterCaps(agentId, m_capsHandlers[agentId]); 2914 EventManager.TriggerOnDeregisterCaps(agentId, m_capsHandlers[agentId]);
2925 2915
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index ba8080c..7997fba 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -355,8 +355,6 @@ namespace OpenSim.Region.Environment.Scenes
355 neighbours = 355 neighbours =
356 m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); 356 m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
357 357
358 m_log.Debug("[SCM]: EnableChildAgents from " + avatar.Scene.RegionInfo.RegionName);
359
360 /// We need to find the difference between the new regions where there are no child agents 358 /// We need to find the difference between the new regions where there are no child agents
361 /// and the regions where there are already child agents. We only send notification to the former. 359 /// and the regions where there are already child agents. We only send notification to the former.
362 List<ulong> neighbourHandles = NeighbourHandles(neighbours); // on this region 360 List<ulong> neighbourHandles = NeighbourHandles(neighbours); // on this region
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 073457b..78e3a83 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -505,7 +505,6 @@ namespace OpenSim.Region.Environment.Scenes
505 get { return m_knownChildRegions; } 505 get { return m_knownChildRegions; }
506 set 506 set
507 { 507 {
508 //Console.WriteLine(" !! Setting known regions in {0} to {1}", Scene.RegionInfo.RegionName, value.Count);
509 m_knownChildRegions = value; 508 m_knownChildRegions = value;
510 } 509 }
511 } 510 }
@@ -587,8 +586,6 @@ namespace OpenSim.Region.Environment.Scenes
587 CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); 586 CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid);
588 if (userInfo != null) 587 if (userInfo != null)
589 userInfo.OnItemReceived += ItemReceived; 588 userInfo.OnItemReceived += ItemReceived;
590
591 m_log.Info("[AVATAR]: New ScenePresence in " + Scene.RegionInfo.RegionName);
592 } 589 }
593 590
594 public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams, 591 public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams,
@@ -803,7 +800,7 @@ namespace OpenSim.Region.Environment.Scenes
803 "[SCENE]: Upgrading child to root agent for {0} in {1}", 800 "[SCENE]: Upgrading child to root agent for {0} in {1}",
804 Name, m_scene.RegionInfo.RegionName); 801 Name, m_scene.RegionInfo.RegionName);
805 802
806 m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count); 803 //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
807 804
808 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); 805 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
809 if (gm != null) 806 if (gm != null)
@@ -2172,9 +2169,7 @@ namespace OpenSim.Region.Environment.Scenes
2172 /// </summary> 2169 /// </summary>
2173 /// <param name="client"></param> 2170 /// <param name="client"></param>
2174 public void SendWearables() 2171 public void SendWearables()
2175 { 2172 {
2176 m_log.DebugFormat("[APPEARANCE]: Sending wearables to {0}", Name);
2177
2178 ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); 2173 ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
2179 } 2174 }
2180 2175
@@ -2183,8 +2178,6 @@ namespace OpenSim.Region.Environment.Scenes
2183 /// </summary> 2178 /// </summary>
2184 public void SendAppearanceToAllOtherAgents() 2179 public void SendAppearanceToAllOtherAgents()
2185 { 2180 {
2186 m_log.DebugFormat("[APPEARANCE]: Sending appearance to all other agents for {0}", Name);
2187
2188 m_perfMonMS = System.Environment.TickCount; 2181 m_perfMonMS = System.Environment.TickCount;
2189 2182
2190 m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) 2183 m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
@@ -2215,8 +2208,6 @@ namespace OpenSim.Region.Environment.Scenes
2215 /// <param name="visualParam"></param> 2208 /// <param name="visualParam"></param>
2216 public void SetAppearance(byte[] texture, List<byte> visualParam) 2209 public void SetAppearance(byte[] texture, List<byte> visualParam)
2217 { 2210 {
2218 m_log.DebugFormat("[APPEARANCE]: Receiving appearance for {0}", Name);
2219
2220 m_appearance.SetAppearance(texture, visualParam); 2211 m_appearance.SetAppearance(texture, visualParam);
2221 SetHeight(m_appearance.AvatarHeight); 2212 SetHeight(m_appearance.AvatarHeight);
2222 m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); 2213 m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance);
@@ -2232,8 +2223,6 @@ namespace OpenSim.Region.Environment.Scenes
2232 2223
2233 public void SetWearable(int wearableId, AvatarWearable wearable) 2224 public void SetWearable(int wearableId, AvatarWearable wearable)
2234 { 2225 {
2235 m_log.DebugFormat("[APPEARANCE]: Setting wearable for {0}", Name);
2236
2237 m_appearance.SetWearable(wearableId, wearable); 2226 m_appearance.SetWearable(wearableId, wearable);
2238 m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); 2227 m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance);
2239 m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); 2228 m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
@@ -2466,8 +2455,7 @@ namespace OpenSim.Region.Environment.Scenes
2466 2455
2467 IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>(); 2456 IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>();
2468 if (eq != null) 2457 if (eq != null)
2469 { 2458 {
2470
2471 OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, 2459 OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
2472 capsPath, UUID, ControllingClient.SessionId); 2460 capsPath, UUID, ControllingClient.SessionId);
2473 eq.Enqueue(Item, UUID); 2461 eq.Enqueue(Item, UUID);