aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP
diff options
context:
space:
mode:
authorCharles Krinke2009-03-01 19:33:12 +0000
committerCharles Krinke2009-03-01 19:33:12 +0000
commitdc314ee50cfe2a4499bcf86b822f8eb9ede21df8 (patch)
tree76767508ce313fba4e55a40a339c2ab07949ba2d /OpenSim/Client/MXP
parentThanks tommil for mantis #3248 - a patch that adds support for avatar movemen... (diff)
downloadopensim-SC_OLD-dc314ee50cfe2a4499bcf86b822f8eb9ede21df8.zip
opensim-SC_OLD-dc314ee50cfe2a4499bcf86b822f8eb9ede21df8.tar.gz
opensim-SC_OLD-dc314ee50cfe2a4499bcf86b822f8eb9ede21df8.tar.bz2
opensim-SC_OLD-dc314ee50cfe2a4499bcf86b822f8eb9ede21df8.tar.xz
Mantis#3249. Thank you kindly, Tlaukkan (Tommil) for a patch that:
* Removed compiler warnings * Updated protobuf-net and MXP license files.
Diffstat (limited to 'OpenSim/Client/MXP')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 8075d1b..6f82478 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -504,6 +504,7 @@ namespace OpenSim.Client.MXP.ClientStack
504 504
505 #region OpenSim Event Handlers 505 #region OpenSim Event Handlers
506 506
507 #pragma warning disable 67
507 public event GenericMessage OnGenericMessage; 508 public event GenericMessage OnGenericMessage;
508 public event ImprovedInstantMessage OnInstantMessage; 509 public event ImprovedInstantMessage OnInstantMessage;
509 public event ChatMessage OnChatFromClient; 510 public event ChatMessage OnChatFromClient;
@@ -681,6 +682,11 @@ namespace OpenSim.Client.MXP.ClientStack
681 public event ParcelDwellRequest OnParcelDwellRequest; 682 public event ParcelDwellRequest OnParcelDwellRequest;
682 public event UserInfoRequest OnUserInfoRequest; 683 public event UserInfoRequest OnUserInfoRequest;
683 public event UpdateUserInfo OnUpdateUserInfo; 684 public event UpdateUserInfo OnUpdateUserInfo;
685 public event ViewerEffectEventHandler OnViewerEffect;
686 public event Action<IClientAPI> OnLogout;
687 public event Action<IClientAPI> OnConnectionClosed;
688 public event RetrieveInstantMessages OnRetrieveInstantMessages;
689 #pragma warning restore 67
684 690
685 #endregion 691 #endregion
686 692
@@ -1330,13 +1336,6 @@ namespace OpenSim.Client.MXP.ClientStack
1330 return throttles; 1336 return throttles;
1331 } 1337 }
1332 1338
1333 public event ViewerEffectEventHandler OnViewerEffect;
1334 public event Action<IClientAPI> OnLogout;
1335 public event Action<IClientAPI> OnConnectionClosed;
1336
1337 public event RetrieveInstantMessages OnRetrieveInstantMessages;
1338
1339
1340 public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message) 1339 public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
1341 { 1340 {
1342 SendChatMessage(Message, 0, Vector3.Zero, FromAvatarName, UUID.Zero, 0, 0); 1341 SendChatMessage(Message, 0, Vector3.Zero, FromAvatarName, UUID.Zero, 0, 0);