aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
diff options
context:
space:
mode:
authorMelanie2011-12-10 15:19:31 +0000
committerMelanie2011-12-10 15:19:31 +0000
commit6b080d57cb77463586af5a08d8137a553852de8a (patch)
treed735c92552f510088abefc60208cd5db3d4bfea0 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
parentMerge branch 'master' into careminster (diff)
parentImplement handler for TeleportCancel inbound packet (diff)
downloadopensim-SC-6b080d57cb77463586af5a08d8137a553852de8a.zip
opensim-SC-6b080d57cb77463586af5a08d8137a553852de8a.tar.gz
opensim-SC-6b080d57cb77463586af5a08d8137a553852de8a.tar.bz2
opensim-SC-6b080d57cb77463586af5a08d8137a553852de8a.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index e62e30f..3164969 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -677,6 +677,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
677 public event RequestAvatarProperties OnRequestAvatarProperties; 677 public event RequestAvatarProperties OnRequestAvatarProperties;
678 public event SetAlwaysRun OnSetAlwaysRun; 678 public event SetAlwaysRun OnSetAlwaysRun;
679 public event TeleportLandmarkRequest OnTeleportLandmarkRequest; 679 public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
680 public event TeleportCancel OnTeleportCancel;
680 public event DeRezObject OnDeRezObject; 681 public event DeRezObject OnDeRezObject;
681 public event Action<IClientAPI> OnRegionHandShakeReply; 682 public event Action<IClientAPI> OnRegionHandShakeReply;
682 public event GenericCall1 OnRequestWearables; 683 public event GenericCall1 OnRequestWearables;