diff options
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index a8e5ae3..6044949 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
153 | } | 153 | } |
154 | else if (m_storeLocal) | 154 | else if (m_storeLocal) |
155 | { | 155 | { |
156 | m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(m_asset); | 156 | m_userTransactions.Manager.MyScene.AssetService.Store(m_asset); |
157 | } | 157 | } |
158 | 158 | ||
159 | m_log.DebugFormat("[ASSET TRANSACTIONS]: Uploaded asset data for transaction {0}", TransactionID); | 159 | m_log.DebugFormat("[ASSET TRANSACTIONS]: Uploaded asset data for transaction {0}", TransactionID); |
@@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
213 | 213 | ||
214 | private void DoCreateItem(uint callbackID) | 214 | private void DoCreateItem(uint callbackID) |
215 | { | 215 | { |
216 | m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(m_asset); | 216 | m_userTransactions.Manager.MyScene.AssetService.Store(m_asset); |
217 | CachedUserInfo userInfo = | 217 | CachedUserInfo userInfo = |
218 | m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails( | 218 | m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails( |
219 | ourClient.AgentId); | 219 | ourClient.AgentId); |