diff options
| author | Melanie | 2011-12-10 15:19:31 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-10 15:19:31 +0000 |
| commit | 6b080d57cb77463586af5a08d8137a553852de8a (patch) | |
| tree | d735c92552f510088abefc60208cd5db3d4bfea0 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Implement handler for TeleportCancel inbound packet (diff) | |
| download | opensim-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')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 1 |
2 files changed, 2 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; |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 1b31663..6c7a683 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -184,6 +184,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 184 | public event RequestMapName OnMapNameRequest; | 184 | public event RequestMapName OnMapNameRequest; |
| 185 | public event TeleportLocationRequest OnTeleportLocationRequest; | 185 | public event TeleportLocationRequest OnTeleportLocationRequest; |
| 186 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; | 186 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; |
| 187 | public event TeleportCancel OnTeleportCancel; | ||
| 187 | public event DisconnectUser OnDisconnectUser; | 188 | public event DisconnectUser OnDisconnectUser; |
| 188 | public event RequestAvatarProperties OnRequestAvatarProperties; | 189 | public event RequestAvatarProperties OnRequestAvatarProperties; |
| 189 | public event SetAlwaysRun OnSetAlwaysRun; | 190 | public event SetAlwaysRun OnSetAlwaysRun; |