diff options
author | Melanie Thielker | 2016-03-09 02:45:11 +0100 |
---|---|---|
committer | Melanie Thielker | 2016-03-09 02:45:11 +0100 |
commit | 43ca32150c1856f7b3768172fec2d06b8f5e5bef (patch) | |
tree | 33a1b0df4860d769157beb19c60c5c97d305367d /OpenSim/Region | |
parent | Make mesh upload respect the same parts maximum as what is set for the (diff) | |
download | opensim-SC-43ca32150c1856f7b3768172fec2d06b8f5e5bef.zip opensim-SC-43ca32150c1856f7b3768172fec2d06b8f5e5bef.tar.gz opensim-SC-43ca32150c1856f7b3768172fec2d06b8f5e5bef.tar.bz2 opensim-SC-43ca32150c1856f7b3768172fec2d06b8f5e5bef.tar.xz |
Plumb RezRestoreToWorld from the client (part done)
Diffstat (limited to 'OpenSim/Region')
3 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 5374fa5..36d16eb 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -80,6 +80,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
80 | public event ChatMessage OnChatFromClient; | 80 | public event ChatMessage OnChatFromClient; |
81 | public event RezObject OnRezObject; | 81 | public event RezObject OnRezObject; |
82 | public event DeRezObject OnDeRezObject; | 82 | public event DeRezObject OnDeRezObject; |
83 | public event RezRestoreToWorld OnRezRestoreToWorld; | ||
83 | public event ModifyTerrain OnModifyTerrain; | 84 | public event ModifyTerrain OnModifyTerrain; |
84 | public event Action<IClientAPI> OnRegionHandShakeReply; | 85 | public event Action<IClientAPI> OnRegionHandShakeReply; |
85 | public event GenericCall1 OnRequestWearables; | 86 | public event GenericCall1 OnRequestWearables; |
@@ -5662,6 +5663,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5662 | AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFriendship); | 5663 | AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFriendship); |
5663 | AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject); | 5664 | AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject); |
5664 | AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject); | 5665 | AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject); |
5666 | AddLocalPacketHandler(PacketType.RezRestoreToWorld, HandlerRezRestoreToWorld); | ||
5665 | AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand); | 5667 | AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand); |
5666 | AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false); | 5668 | AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false); |
5667 | AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest); | 5669 | AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest); |
@@ -6584,6 +6586,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6584 | return true; | 6586 | return true; |
6585 | } | 6587 | } |
6586 | 6588 | ||
6589 | private bool HandlerRezRestoreToWorld(IClientAPI sender, Packet Pack) | ||
6590 | { | ||
6591 | return false; | ||
6592 | } | ||
6593 | |||
6587 | private bool HandlerModifyLand(IClientAPI sender, Packet Pack) | 6594 | private bool HandlerModifyLand(IClientAPI sender, Packet Pack) |
6588 | { | 6595 | { |
6589 | ModifyLandPacket modify = (ModifyLandPacket)Pack; | 6596 | ModifyLandPacket modify = (ModifyLandPacket)Pack; |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 6611744..f19cd47 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -687,6 +687,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
687 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; | 687 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; |
688 | public event TeleportCancel OnTeleportCancel; | 688 | public event TeleportCancel OnTeleportCancel; |
689 | public event DeRezObject OnDeRezObject; | 689 | public event DeRezObject OnDeRezObject; |
690 | public event RezRestoreToWorld OnRezRestoreToWorld; | ||
690 | public event Action<IClientAPI> OnRegionHandShakeReply; | 691 | public event Action<IClientAPI> OnRegionHandShakeReply; |
691 | public event GenericCall1 OnRequestWearables; | 692 | public event GenericCall1 OnRequestWearables; |
692 | public event Action<IClientAPI, bool> OnCompleteMovementToRegion; | 693 | public event Action<IClientAPI, bool> OnCompleteMovementToRegion; |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index d966fe5..95cf73c 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -294,6 +294,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
294 | public event SetAlwaysRun OnSetAlwaysRun; | 294 | public event SetAlwaysRun OnSetAlwaysRun; |
295 | 295 | ||
296 | public event DeRezObject OnDeRezObject; | 296 | public event DeRezObject OnDeRezObject; |
297 | public event RezRestoreToWorld OnRezRestoreToWorld; | ||
297 | public event Action<IClientAPI> OnRegionHandShakeReply; | 298 | public event Action<IClientAPI> OnRegionHandShakeReply; |
298 | public event GenericCall1 OnRequestWearables; | 299 | public event GenericCall1 OnRequestWearables; |
299 | public event Action<IClientAPI, bool> OnCompleteMovementToRegion; | 300 | public event Action<IClientAPI, bool> OnCompleteMovementToRegion; |