aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorTeravus Ovares2008-11-14 14:42:00 +0000
committerTeravus Ovares2008-11-14 14:42:00 +0000
commit3e4b094921dddfe10f6ee5f73eb1b917381c2c30 (patch)
tree7cdce613258028725b555e43ad0125081a2fc305 /OpenSim/Region/ClientStack
parentreverting #7295, as it still fails a test case (as pointed out very (diff)
downloadopensim-SC_OLD-3e4b094921dddfe10f6ee5f73eb1b917381c2c30.zip
opensim-SC_OLD-3e4b094921dddfe10f6ee5f73eb1b917381c2c30.tar.gz
opensim-SC_OLD-3e4b094921dddfe10f6ee5f73eb1b917381c2c30.tar.bz2
opensim-SC_OLD-3e4b094921dddfe10f6ee5f73eb1b917381c2c30.tar.xz
* Implements terrain raw upload. You can now upload your .raw terrain files using the Estate Tools.
* Could this be extended in the future to support .oar uploads too? Only time will tell!
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs31
1 files changed, 29 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 09e4160..bb43750 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -172,6 +172,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
172 private RequestXfer handlerRequestXfer; //OnRequestXfer; 172 private RequestXfer handlerRequestXfer; //OnRequestXfer;
173 private XferReceive handlerXferReceive; //OnXferReceive; 173 private XferReceive handlerXferReceive; //OnXferReceive;
174 private ConfirmXfer handlerConfirmXfer; //OnConfirmXfer; 174 private ConfirmXfer handlerConfirmXfer; //OnConfirmXfer;
175 private AbortXfer handlerAbortXfer;
175 private CreateInventoryFolder handlerCreateInventoryFolder; //OnCreateNewInventoryFolder; 176 private CreateInventoryFolder handlerCreateInventoryFolder; //OnCreateNewInventoryFolder;
176 private UpdateInventoryFolder handlerUpdateInventoryFolder; 177 private UpdateInventoryFolder handlerUpdateInventoryFolder;
177 private MoveInventoryFolder handlerMoveInventoryFolder; 178 private MoveInventoryFolder handlerMoveInventoryFolder;
@@ -206,6 +207,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
206 private ParcelGodForceOwner handlerParcelGodForceOwner; 207 private ParcelGodForceOwner handlerParcelGodForceOwner;
207 private ParcelReclaim handlerParcelReclaim; 208 private ParcelReclaim handlerParcelReclaim;
208 private RequestTerrain handlerRequestTerrain; 209 private RequestTerrain handlerRequestTerrain;
210 private RequestTerrain handlerUploadTerrain;
209 private ParcelReturnObjectsRequest handlerParcelReturnObjectsRequest; 211 private ParcelReturnObjectsRequest handlerParcelReturnObjectsRequest;
210 private RegionInfoRequest handlerRegionInfoRequest; //OnRegionInfoRequest; 212 private RegionInfoRequest handlerRegionInfoRequest; //OnRegionInfoRequest;
211 private EstateCovenantRequest handlerEstateCovenantRequest; //OnEstateCovenantRequest; 213 private EstateCovenantRequest handlerEstateCovenantRequest; //OnEstateCovenantRequest;
@@ -894,6 +896,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
894 public event XferReceive OnXferReceive; 896 public event XferReceive OnXferReceive;
895 public event RequestXfer OnRequestXfer; 897 public event RequestXfer OnRequestXfer;
896 public event ConfirmXfer OnConfirmXfer; 898 public event ConfirmXfer OnConfirmXfer;
899 public event AbortXfer OnAbortXfer;
897 public event RequestTerrain OnRequestTerrain; 900 public event RequestTerrain OnRequestTerrain;
898 public event RezScript OnRezScript; 901 public event RezScript OnRezScript;
899 public event UpdateTaskInventory OnUpdateTaskInventory; 902 public event UpdateTaskInventory OnUpdateTaskInventory;
@@ -941,6 +944,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
941 public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest; 944 public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest;
942 public event SetRegionTerrainSettings OnSetRegionTerrainSettings; 945 public event SetRegionTerrainSettings OnSetRegionTerrainSettings;
943 public event BakeTerrain OnBakeTerrain; 946 public event BakeTerrain OnBakeTerrain;
947 public event RequestTerrain OnUploadTerrain;
944 public event EstateChangeInfo OnEstateChangeInfo; 948 public event EstateChangeInfo OnEstateChangeInfo;
945 public event EstateRestartSimRequest OnEstateRestartSimRequest; 949 public event EstateRestartSimRequest OnEstateRestartSimRequest;
946 public event EstateChangeCovenantRequest OnEstateChangeCovenantRequest; 950 public event EstateChangeCovenantRequest OnEstateChangeCovenantRequest;
@@ -4937,7 +4941,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4937 break; 4941 break;
4938 case PacketType.TransferRequest: 4942 case PacketType.TransferRequest:
4939 //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request"); 4943 //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
4944
4940 TransferRequestPacket transfer = (TransferRequestPacket)Pack; 4945 TransferRequestPacket transfer = (TransferRequestPacket)Pack;
4946 Console.WriteLine("Transfer Request: " + transfer.ToString());
4941 // Validate inventory transfers 4947 // Validate inventory transfers
4942 // Has to be done here, because AssetCache can't do it 4948 // Has to be done here, because AssetCache can't do it
4943 // 4949 //
@@ -5032,7 +5038,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5032 break; 5038 break;
5033 case PacketType.AssetUploadRequest: 5039 case PacketType.AssetUploadRequest:
5034 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; 5040 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
5035 // Console.WriteLine("upload request " + Pack.ToString()); 5041 // Console.WriteLine("upload request " + request.ToString());
5036 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString()); 5042 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString());
5037 UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId); 5043 UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);
5038 5044
@@ -5074,6 +5080,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5074 handlerConfirmXfer(this, confirmXfer.XferID.ID, confirmXfer.XferID.Packet); 5080 handlerConfirmXfer(this, confirmXfer.XferID.ID, confirmXfer.XferID.Packet);
5075 } 5081 }
5076 break; 5082 break;
5083 case PacketType.AbortXfer:
5084 AbortXferPacket abortXfer = (AbortXferPacket)Pack;
5085 handlerAbortXfer = OnAbortXfer;
5086 if (handlerAbortXfer != null)
5087 {
5088 handlerAbortXfer(this, abortXfer.XferID.ID);
5089 }
5090
5091 break;
5077 case PacketType.CreateInventoryFolder: 5092 case PacketType.CreateInventoryFolder:
5078 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; 5093 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
5079 5094
@@ -5738,7 +5753,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5738 5753
5739 case PacketType.EstateOwnerMessage: 5754 case PacketType.EstateOwnerMessage:
5740 EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack; 5755 EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
5741 5756 //System.Console.WriteLine(messagePacket.ToString());
5742 switch (Utils.BytesToString(messagePacket.MethodData.Method)) 5757 switch (Utils.BytesToString(messagePacket.MethodData.Method))
5743 { 5758 {
5744 case "getinfo": 5759 case "getinfo":
@@ -5978,6 +5993,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5978 } 5993 }
5979 } 5994 }
5980 } 5995 }
5996 if (Utils.BytesToString(messagePacket.ParamList[0].Parameter) == "upload filename")
5997 {
5998 if (messagePacket.ParamList.Length > 1)
5999 {
6000 handlerUploadTerrain = OnUploadTerrain;
6001 if (handlerUploadTerrain != null)
6002 {
6003 handlerUploadTerrain(this, Utils.BytesToString(messagePacket.ParamList[1].Parameter));
6004 }
6005 }
6006 }
6007
5981 } 6008 }
5982 6009
5983 6010