diff options
Diffstat (limited to '')
4 files changed, 28 insertions, 40 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 | } |