diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs index b1cbdcc..e6e27be 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using log4net; | 32 | using log4net; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
40 | { | 40 | { |
41 | public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions | 41 | public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions |
42 | { | 42 | { |
43 | private readonly Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>(); | 43 | private readonly Dictionary<UUID, Scene> RegisteredScenes = new Dictionary<UUID, Scene>(); |
44 | private bool m_dumpAssetsToFile = false; | 44 | private bool m_dumpAssetsToFile = false; |
45 | private Scene m_scene = null; | 45 | private Scene m_scene = null; |
46 | 46 | ||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
53 | 53 | ||
54 | #region IAgentAssetTransactions Members | 54 | #region IAgentAssetTransactions Members |
55 | 55 | ||
56 | public void HandleItemCreationFromTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID, | 56 | public void HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID, |
57 | uint callbackID, string description, string name, sbyte invType, | 57 | uint callbackID, string description, string name, sbyte invType, |
58 | sbyte type, byte wearableType, uint nextOwnerMask) | 58 | sbyte type, byte wearableType, uint nextOwnerMask) |
59 | { | 59 | { |
@@ -61,13 +61,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
61 | wearableType, nextOwnerMask); | 61 | wearableType, nextOwnerMask); |
62 | } | 62 | } |
63 | 63 | ||
64 | public void HandleItemUpdateFromTransaction(IClientAPI remoteClient, LLUUID transactionID, | 64 | public void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID, |
65 | InventoryItemBase item) | 65 | InventoryItemBase item) |
66 | { | 66 | { |
67 | m_transactionManager.HandleItemUpdateFromTransaction(remoteClient, transactionID, item); | 67 | m_transactionManager.HandleItemUpdateFromTransaction(remoteClient, transactionID, item); |
68 | } | 68 | } |
69 | 69 | ||
70 | public void RemoveAgentAssetTransactions(LLUUID userID) | 70 | public void RemoveAgentAssetTransactions(UUID userID) |
71 | { | 71 | { |
72 | m_transactionManager.RemoveAgentAssetTransactions(userID); | 72 | m_transactionManager.RemoveAgentAssetTransactions(userID); |
73 | } | 73 | } |
@@ -146,8 +146,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
146 | /// <summary> | 146 | /// <summary> |
147 | /// Each agent has its own singleton collection of transactions | 147 | /// Each agent has its own singleton collection of transactions |
148 | /// </summary> | 148 | /// </summary> |
149 | private Dictionary<LLUUID, AgentAssetTransactions> AgentTransactions = | 149 | private Dictionary<UUID, AgentAssetTransactions> AgentTransactions = |
150 | new Dictionary<LLUUID, AgentAssetTransactions>(); | 150 | new Dictionary<UUID, AgentAssetTransactions>(); |
151 | 151 | ||
152 | /// <summary> | 152 | /// <summary> |
153 | /// Should we dump uploaded assets to the filesystem? | 153 | /// Should we dump uploaded assets to the filesystem? |
@@ -168,7 +168,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
168 | /// </summary> | 168 | /// </summary> |
169 | /// <param name="userID"></param> | 169 | /// <param name="userID"></param> |
170 | /// <returns></returns> | 170 | /// <returns></returns> |
171 | private AgentAssetTransactions GetUserTransactions(LLUUID userID) | 171 | private AgentAssetTransactions GetUserTransactions(UUID userID) |
172 | { | 172 | { |
173 | lock (AgentTransactions) | 173 | lock (AgentTransactions) |
174 | { | 174 | { |
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
188 | /// from a scene (and hence won't be making any more transactions here). | 188 | /// from a scene (and hence won't be making any more transactions here). |
189 | /// </summary> | 189 | /// </summary> |
190 | /// <param name="userID"></param> | 190 | /// <param name="userID"></param> |
191 | public void RemoveAgentAssetTransactions(LLUUID userID) | 191 | public void RemoveAgentAssetTransactions(UUID userID) |
192 | { | 192 | { |
193 | // m_log.DebugFormat("Removing agent asset transactions structure for agent {0}", userID); | 193 | // m_log.DebugFormat("Removing agent asset transactions structure for agent {0}", userID); |
194 | 194 | ||
@@ -214,7 +214,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
214 | /// <param name="type"></param> | 214 | /// <param name="type"></param> |
215 | /// <param name="wearableType"></param> | 215 | /// <param name="wearableType"></param> |
216 | /// <param name="nextOwnerMask"></param> | 216 | /// <param name="nextOwnerMask"></param> |
217 | public void HandleItemCreationFromTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID, | 217 | public void HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID, |
218 | uint callbackID, string description, string name, sbyte invType, | 218 | uint callbackID, string description, string name, sbyte invType, |
219 | sbyte type, byte wearableType, uint nextOwnerMask) | 219 | sbyte type, byte wearableType, uint nextOwnerMask) |
220 | { | 220 | { |
@@ -237,7 +237,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
237 | /// <param name="remoteClient"></param> | 237 | /// <param name="remoteClient"></param> |
238 | /// <param name="transactionID"></param> | 238 | /// <param name="transactionID"></param> |
239 | /// <param name="item"></param> | 239 | /// <param name="item"></param> |
240 | public void HandleItemUpdateFromTransaction(IClientAPI remoteClient, LLUUID transactionID, | 240 | public void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID, |
241 | InventoryItemBase item) | 241 | InventoryItemBase item) |
242 | { | 242 | { |
243 | m_log.DebugFormat( | 243 | m_log.DebugFormat( |
@@ -259,7 +259,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
259 | /// <param name="type"></param> | 259 | /// <param name="type"></param> |
260 | /// <param name="data"></param></param> | 260 | /// <param name="data"></param></param> |
261 | /// <param name="tempFile"></param> | 261 | /// <param name="tempFile"></param> |
262 | public void HandleUDPUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, | 262 | public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, |
263 | byte[] data, bool storeLocal, bool tempFile) | 263 | byte[] data, bool storeLocal, bool tempFile) |
264 | { | 264 | { |
265 | if (((AssetType)type == AssetType.Texture || | 265 | if (((AssetType)type == AssetType.Texture || |