diff options
author | Teravus Ovares | 2008-11-14 14:42:00 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-11-14 14:42:00 +0000 |
commit | 3e4b094921dddfe10f6ee5f73eb1b917381c2c30 (patch) | |
tree | 7cdce613258028725b555e43ad0125081a2fc305 /OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs | |
parent | reverting #7295, as it still fails a test case (as pointed out very (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs | 9 |
1 files changed, 8 insertions, 1 deletions
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 | { |