aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-02-26 20:11:55 +0000
committerMelanie Thielker2009-02-26 20:11:55 +0000
commited2de7ac821544751280b1310a49c2f4ba70b4c3 (patch)
treea8c72b7b3574512f51e799fdfcd131505b3c5dc3
parentChanged the type of the ApplicationRegistry member from RegistryCore to IRegi... (diff)
downloadopensim-SC_OLD-ed2de7ac821544751280b1310a49c2f4ba70b4c3.zip
opensim-SC_OLD-ed2de7ac821544751280b1310a49c2f4ba70b4c3.tar.gz
opensim-SC_OLD-ed2de7ac821544751280b1310a49c2f4ba70b4c3.tar.bz2
opensim-SC_OLD-ed2de7ac821544751280b1310a49c2f4ba70b4c3.tar.xz
Plumb in the RetrieveInstantMessages event that is sent by the viewer
when it is ready to receive offline IM
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs10
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
6 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 289b38c..3d734ad 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1082,6 +1082,8 @@ namespace OpenSim.Client.MXP.ClientStack
1082 public event Action<IClientAPI> OnLogout; 1082 public event Action<IClientAPI> OnLogout;
1083 public event Action<IClientAPI> OnConnectionClosed; 1083 public event Action<IClientAPI> OnConnectionClosed;
1084 1084
1085 public event RetrieveInstantMessages OnRetrieveInstantMessages;
1086
1085 1087
1086 public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message) 1088 public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
1087 { 1089 {
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index bfc70a4..4b95726 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -426,6 +426,7 @@ namespace OpenSim.Framework
426 426
427 public delegate void UserInfoRequest(IClientAPI client); 427 public delegate void UserInfoRequest(IClientAPI client);
428 public delegate void UpdateUserInfo(bool imViaEmail, bool visible, IClientAPI client); 428 public delegate void UpdateUserInfo(bool imViaEmail, bool visible, IClientAPI client);
429 public delegate void RetrieveInstantMessages(IClientAPI client);
429 430
430 #endregion 431 #endregion
431 432
@@ -752,6 +753,8 @@ namespace OpenSim.Framework
752 753
753 event UserInfoRequest OnUserInfoRequest; 754 event UserInfoRequest OnUserInfoRequest;
754 event UpdateUserInfo OnUpdateUserInfo; 755 event UpdateUserInfo OnUpdateUserInfo;
756
757 event RetrieveInstantMessages OnRetrieveInstantMessages;
755 758
756 /// <summary> 759 /// <summary>
757 /// Set the debug level at which packet output should be printed to console. 760 /// Set the debug level at which packet output should be printed to console.
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 02e6b82..935f804 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -292,6 +292,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
292 private UserInfoRequest handlerUserInfoRequest; 292 private UserInfoRequest handlerUserInfoRequest;
293 private UpdateUserInfo handlerUpdateUserInfo; 293 private UpdateUserInfo handlerUpdateUserInfo;
294 294
295 private RetrieveInstantMessages handlerRetrieveInstantMessages;
296
295 private readonly IGroupsModule m_GroupsModule; 297 private readonly IGroupsModule m_GroupsModule;
296 298
297 //private TerrainUnacked handlerUnackedTerrain = null; 299 //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1075,6 +1077,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1075 public event UserInfoRequest OnUserInfoRequest; 1077 public event UserInfoRequest OnUserInfoRequest;
1076 public event UpdateUserInfo OnUpdateUserInfo; 1078 public event UpdateUserInfo OnUpdateUserInfo;
1077 1079
1080 public event RetrieveInstantMessages OnRetrieveInstantMessages;
1081
1078 public void ActivateGesture(UUID assetId, UUID gestureId) 1082 public void ActivateGesture(UUID assetId, UUID gestureId)
1079 { 1083 {
1080 } 1084 }
@@ -7433,6 +7437,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7433 eventNotificationRemove.EventData.EventID, this); 7437 eventNotificationRemove.EventData.EventID, this);
7434 break; 7438 break;
7435 7439
7440 case PacketType.RetrieveInstantMessages:
7441 handlerRetrieveInstantMessages = OnRetrieveInstantMessages;
7442 if (handlerRetrieveInstantMessages != null)
7443 handlerRetrieveInstantMessages(this);
7444 break;
7445
7436 default: 7446 default:
7437 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 7447 m_log.Warn("[CLIENT]: unhandled packet " + Pack);
7438 break; 7448 break;
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 3d461e7..9828d68 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -253,6 +253,8 @@ namespace OpenSim.Region.Examples.SimpleModule
253 public event UserInfoRequest OnUserInfoRequest; 253 public event UserInfoRequest OnUserInfoRequest;
254 public event UpdateUserInfo OnUpdateUserInfo; 254 public event UpdateUserInfo OnUpdateUserInfo;
255 255
256 public event RetrieveInstantMessages OnRetrieveInstantMessages;
257
256#pragma warning restore 67 258#pragma warning restore 67
257 259
258 private UUID myID = UUID.Random(); 260 private UUID myID = UUID.Random();
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 871a581..da2d781 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -359,6 +359,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
359 public event UserInfoRequest OnUserInfoRequest; 359 public event UserInfoRequest OnUserInfoRequest;
360 public event UpdateUserInfo OnUpdateUserInfo; 360 public event UpdateUserInfo OnUpdateUserInfo;
361 361
362 public event RetrieveInstantMessages OnRetrieveInstantMessages;
363
362#pragma warning restore 67 364#pragma warning restore 67
363 365
364 #endregion 366 #endregion
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index ee4aaa8..16c55ae 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -264,6 +264,8 @@ namespace OpenSim.Tests.Common.Mock
264 public event UserInfoRequest OnUserInfoRequest; 264 public event UserInfoRequest OnUserInfoRequest;
265 public event UpdateUserInfo OnUpdateUserInfo; 265 public event UpdateUserInfo OnUpdateUserInfo;
266 266
267 public event RetrieveInstantMessages OnRetrieveInstantMessages;
268
267#pragma warning restore 67 269#pragma warning restore 67
268 270
269 /// <value> 271 /// <value>