diff options
author | MW | 2007-04-25 13:03:48 +0000 |
---|---|---|
committer | MW | 2007-04-25 13:03:48 +0000 |
commit | f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0 (patch) | |
tree | b9f8f1dac346906f1333aa3fc8da704466eda005 /OpenSim.RegionServer/Assets | |
parent | * Added try{}catch{} to RunTerrainCmd (diff) | |
download | opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.zip opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.gz opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.bz2 opensim-SC-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.xz |
Small clean up of files and directories
Diffstat (limited to 'OpenSim.RegionServer/Assets')
-rw-r--r-- | OpenSim.RegionServer/Assets/AssetCache.cs | 2 | ||||
-rw-r--r-- | OpenSim.RegionServer/Assets/InventoryCache.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs index 573e5fd..e217d78 100644 --- a/OpenSim.RegionServer/Assets/AssetCache.cs +++ b/OpenSim.RegionServer/Assets/AssetCache.cs | |||
@@ -32,7 +32,7 @@ using libsecondlife; | |||
32 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
33 | using OpenSim; | 33 | using OpenSim; |
34 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
35 | using OpenSim.Framework.Assets; | 35 | using OpenSim.Framework.Types; |
36 | using OpenSim.Framework.Utilities; | 36 | using OpenSim.Framework.Utilities; |
37 | 37 | ||
38 | namespace OpenSim.Assets | 38 | namespace OpenSim.Assets |
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs index a50bb2b..136ae53 100644 --- a/OpenSim.RegionServer/Assets/InventoryCache.cs +++ b/OpenSim.RegionServer/Assets/InventoryCache.cs | |||
@@ -32,7 +32,7 @@ using OpenSim; | |||
32 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
33 | //using OpenSim.GridServers; | 33 | //using OpenSim.GridServers; |
34 | using OpenSim.Framework.Inventory; | 34 | using OpenSim.Framework.Inventory; |
35 | using OpenSim.Framework.Assets; | 35 | using OpenSim.Framework.Types; |
36 | using OpenSim.Framework.Interfaces; | 36 | using OpenSim.Framework.Interfaces; |
37 | 37 | ||
38 | namespace OpenSim.Assets | 38 | namespace OpenSim.Assets |
@@ -125,7 +125,7 @@ namespace OpenSim.Assets | |||
125 | return res; | 125 | return res; |
126 | } | 126 | } |
127 | 127 | ||
128 | public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Assets.AssetBase asset) | 128 | public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset) |
129 | { | 129 | { |
130 | LLUUID newItem = null; | 130 | LLUUID newItem = null; |
131 | if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) | 131 | if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) |
@@ -161,7 +161,7 @@ namespace OpenSim.Assets | |||
161 | return res; | 161 | return res; |
162 | } | 162 | } |
163 | 163 | ||
164 | public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset) | 164 | public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset) |
165 | { | 165 | { |
166 | if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) | 166 | if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) |
167 | { | 167 | { |