aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs14
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
3 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index f4b46d5..f23f4e0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -502,8 +502,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
502 // This event won't be raised unless we have that agent, 502 // This event won't be raised unless we have that agent,
503 // so we can depend on the above not trying to send 503 // so we can depend on the above not trying to send
504 // via grid again 504 // via grid again
505 m_log.DebugFormat("[FRIEND]: Got GridIM from {0}, to {1}, imSession {2}, message {3}, dialog {4}", 505 //m_log.DebugFormat("[FRIEND]: Got GridIM from {0}, to {1}, imSession {2}, message {3}, dialog {4}",
506 msg.fromAgentID, msg.toAgentID, msg.imSessionID, msg.message, msg.dialog); 506 // msg.fromAgentID, msg.toAgentID, msg.imSessionID, msg.message, msg.dialog);
507 507
508 if (msg.dialog == (byte)InstantMessageDialog.FriendshipOffered || 508 if (msg.dialog == (byte)InstantMessageDialog.FriendshipOffered ||
509 msg.dialog == (byte)InstantMessageDialog.FriendshipAccepted || 509 msg.dialog == (byte)InstantMessageDialog.FriendshipAccepted ||
@@ -512,7 +512,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
512 // this should succeed as we *know* the root agent is here. 512 // this should succeed as we *know* the root agent is here.
513 m_TransferModule.SendInstantMessage(msg, 513 m_TransferModule.SendInstantMessage(msg,
514 delegate(bool success) { 514 delegate(bool success) {
515 m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); 515 //m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
516 } 516 }
517 ); 517 );
518 } 518 }
@@ -894,7 +894,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
894 ScenePresence agent = GetAnyPresenceFromAgentID(uuid); 894 ScenePresence agent = GetAnyPresenceFromAgentID(uuid);
895 if (agent != null) 895 if (agent != null)
896 { 896 {
897 m_log.DebugFormat("[FRIEND]: Found local agent {0}", agent.Name); 897 //m_log.DebugFormat("[FRIEND]: Found local agent {0}", agent.Name);
898 898
899 // friend is online and on this server... 899 // friend is online and on this server...
900 if (iAmOnline) agent.ControllingClient.SendAgentOnline(agentArr); 900 if (iAmOnline) agent.ControllingClient.SendAgentOnline(agentArr);
@@ -906,7 +906,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
906 } 906 }
907 else 907 else
908 { 908 {
909 m_log.DebugFormat("[FRIEND]: Friend {0} ({1}) is offline; not sending.", uuid, i); 909 //m_log.DebugFormat("[FRIEND]: Friend {0} ({1}) is offline; not sending.", uuid, i);
910 910
911 // friend is offline => no need to try sending 911 // friend is offline => no need to try sending
912 friendIDsToSendTo.RemoveAt(i); 912 friendIDsToSendTo.RemoveAt(i);
@@ -939,8 +939,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
939 // send bulk updates to the region 939 // send bulk updates to the region
940 foreach (KeyValuePair<ulong, List<UUID>> pair in friendsInRegion) 940 foreach (KeyValuePair<ulong, List<UUID>> pair in friendsInRegion)
941 { 941 {
942 m_log.DebugFormat("[FRIEND]: Inform {0} friends in region {1} that user {2} is {3}line", 942 //m_log.DebugFormat("[FRIEND]: Inform {0} friends in region {1} that user {2} is {3}line",
943 pair.Value.Count, pair.Key, client.Name, iAmOnline ? "on" : "off"); 943 // pair.Value.Count, pair.Key, client.Name, iAmOnline ? "on" : "off");
944 944
945 friendIDsToSendTo.AddRange(m_initialScene.InformFriendsInOtherRegion(client.AgentId, pair.Key, pair.Value, iAmOnline)); 945 friendIDsToSendTo.AddRange(m_initialScene.InformFriendsInOtherRegion(client.AgentId, pair.Key, pair.Value, iAmOnline));
946 } 946 }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index b38c5bb..38d2d21 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -526,7 +526,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
526 SendGridInstantMessageViaXMLRPCAsync(im, result, 526 SendGridInstantMessageViaXMLRPCAsync(im, result,
527 upd.Handle); 527 upd.Handle);
528 } 528 }
529
530 } 529 }
531 else 530 else
532 { 531 {
@@ -544,7 +543,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
544 m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find user {0}", toAgentID); 543 m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find user {0}", toAgentID);
545 result(false); 544 result(false);
546 } 545 }
547
548 } 546 }
549 547
550 /// <summary> 548 /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9cf181b..18e729f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1816,7 +1816,6 @@ namespace OpenSim.Region.Framework.Scenes
1816 } 1816 }
1817 } 1817 }
1818 1818
1819
1820 SubscribeToClientEvents(client); 1819 SubscribeToClientEvents(client);
1821 ScenePresence presence; 1820 ScenePresence presence;
1822 1821