diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 188ce4b..a835e43 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -205,6 +205,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
205 | private ParcelAbandonRequest handlerParcelAbandonRequest; | 205 | private ParcelAbandonRequest handlerParcelAbandonRequest; |
206 | private ParcelGodForceOwner handlerParcelGodForceOwner; | 206 | private ParcelGodForceOwner handlerParcelGodForceOwner; |
207 | private ParcelReclaim handlerParcelReclaim; | 207 | private ParcelReclaim handlerParcelReclaim; |
208 | private RequestTerrain handlerRequestTerrain; | ||
208 | private ParcelReturnObjectsRequest handlerParcelReturnObjectsRequest; | 209 | private ParcelReturnObjectsRequest handlerParcelReturnObjectsRequest; |
209 | private RegionInfoRequest handlerRegionInfoRequest; //OnRegionInfoRequest; | 210 | private RegionInfoRequest handlerRegionInfoRequest; //OnRegionInfoRequest; |
210 | private EstateCovenantRequest handlerEstateCovenantRequest; //OnEstateCovenantRequest; | 211 | private EstateCovenantRequest handlerEstateCovenantRequest; //OnEstateCovenantRequest; |
@@ -895,6 +896,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
895 | public event XferReceive OnXferReceive; | 896 | public event XferReceive OnXferReceive; |
896 | public event RequestXfer OnRequestXfer; | 897 | public event RequestXfer OnRequestXfer; |
897 | public event ConfirmXfer OnConfirmXfer; | 898 | public event ConfirmXfer OnConfirmXfer; |
899 | public event RequestTerrain OnRequestTerrain; | ||
898 | public event RezScript OnRezScript; | 900 | public event RezScript OnRezScript; |
899 | public event UpdateTaskInventory OnUpdateTaskInventory; | 901 | public event UpdateTaskInventory OnUpdateTaskInventory; |
900 | public event MoveTaskInventory OnMoveTaskItem; | 902 | public event MoveTaskInventory OnMoveTaskItem; |
@@ -2527,7 +2529,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2527 | newPack.Header.Zerocoded = true; | 2529 | newPack.Header.Zerocoded = true; |
2528 | OutPacket(newPack, ThrottleOutPacketType.Asset); | 2530 | OutPacket(newPack, ThrottleOutPacketType.Asset); |
2529 | } | 2531 | } |
2530 | 2532 | public void SendInitiateDownload(string simFileName, string clientFileName) | |
2533 | { | ||
2534 | InitiateDownloadPacket newPack = new InitiateDownloadPacket(); | ||
2535 | newPack.AgentData.AgentID = AgentId; | ||
2536 | newPack.FileData.SimFilename = Utils.StringToBytes(simFileName); | ||
2537 | newPack.FileData.ViewerFilename = Utils.StringToBytes(clientFileName); | ||
2538 | OutPacket(newPack, ThrottleOutPacketType.Asset); | ||
2539 | } | ||
2531 | public void SendImageFirstPart( | 2540 | public void SendImageFirstPart( |
2532 | ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) | 2541 | ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) |
2533 | { | 2542 | { |
@@ -5756,7 +5765,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5756 | 5765 | ||
5757 | case PacketType.EstateOwnerMessage: | 5766 | case PacketType.EstateOwnerMessage: |
5758 | EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack; | 5767 | EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack; |
5759 | 5768 | ||
5760 | switch (Utils.BytesToString(messagePacket.MethodData.Method)) | 5769 | switch (Utils.BytesToString(messagePacket.MethodData.Method)) |
5761 | { | 5770 | { |
5762 | case "getinfo": | 5771 | case "getinfo": |
@@ -5975,11 +5984,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5975 | case "terrain": | 5984 | case "terrain": |
5976 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5985 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) |
5977 | { | 5986 | { |
5978 | handlerBakeTerrain = OnBakeTerrain; | 5987 | if (messagePacket.ParamList.Length > 0) |
5979 | if (handlerBakeTerrain != null) | ||
5980 | { | 5988 | { |
5981 | handlerBakeTerrain(this); | 5989 | if (Utils.BytesToString(messagePacket.ParamList[0].Parameter) == "bake") |
5990 | { | ||
5991 | handlerBakeTerrain = OnBakeTerrain; | ||
5992 | if (handlerBakeTerrain != null) | ||
5993 | { | ||
5994 | handlerBakeTerrain(this); | ||
5995 | } | ||
5996 | } | ||
5997 | if (Utils.BytesToString(messagePacket.ParamList[0].Parameter) == "download filename") | ||
5998 | { | ||
5999 | if (messagePacket.ParamList.Length > 1) | ||
6000 | { | ||
6001 | handlerRequestTerrain = OnRequestTerrain; | ||
6002 | if (handlerRequestTerrain != null) | ||
6003 | { | ||
6004 | handlerRequestTerrain(this, Utils.BytesToString(messagePacket.ParamList[1].Parameter)); | ||
6005 | } | ||
6006 | } | ||
6007 | } | ||
5982 | } | 6008 | } |
6009 | |||
6010 | |||
5983 | } | 6011 | } |
5984 | break; | 6012 | break; |
5985 | 6013 | ||