aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Agent
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/Environment/Modules/Agent
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/Environment/Modules/Agent')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs9
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index be8aeea..010fcf7 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
@@ -180,6 +180,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
180 public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, 180 public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type,
181 byte[] data, bool storeLocal, bool tempFile) 181 byte[] data, bool storeLocal, bool tempFile)
182 { 182 {
183 //System.Console.WriteLine("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile);
183 if (((AssetType)type == AssetType.Texture || 184 if (((AssetType)type == AssetType.Texture ||
184 (AssetType)type == AssetType.Sound || 185 (AssetType)type == AssetType.Sound ||
185 (AssetType)type == AssetType.TextureTGA || 186 (AssetType)type == AssetType.TextureTGA ||
@@ -219,6 +220,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
219 /// <param name="data"></param> 220 /// <param name="data"></param>
220 public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) 221 public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data)
221 { 222 {
223 //System.Console.WriteLine("xferID: " + xferID + " packetID: " + packetID + " data!");
222 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); 224 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
223 225
224 transactions.HandleXfer(xferID, packetID, data); 226 transactions.HandleXfer(xferID, packetID, data);
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
index 09c9aef..19d7066 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -43,6 +43,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
43 private Scene m_scene = null; 43 private Scene m_scene = null;
44 44
45 private AgentAssetTransactionsManager m_transactionManager; 45 private AgentAssetTransactionsManager m_transactionManager;
46
46 47
47 public AssetTransactionModule() 48 public AssetTransactionModule()
48 { 49 {
@@ -68,7 +69,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
68 IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item) 69 IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item)
69 { 70 {
70 m_transactionManager.HandleTaskItemUpdateFromTransaction(remoteClient, part, transactionID, item); 71 m_transactionManager.HandleTaskItemUpdateFromTransaction(remoteClient, part, transactionID, item);
71 } 72 }
73
74 public void RequestXferFromClient(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type,
75 byte[] data, bool storeLocal, bool tempFile)
76 {
77 m_transactionManager.HandleUDPUploadRequest(remoteClient, assetID, transaction, type, data, storeLocal, tempFile);
78 }
72 79
73 public void RemoveAgentAssetTransactions(UUID userID) 80 public void RemoveAgentAssetTransactions(UUID userID)
74 { 81 {