ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:07:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify updating of agent inventory assets. Make newly created asset IDs

Browse Source 
random rather than using IDs known by the client ahead of time.
This commit is contained in:
Melanie
2010-12-04 05:01:44 +01:00
parent 89fec4ff5b
commit 4ca108f85e
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
View File

@@ -149,10 +149,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
if (asset != null)
{
m_log.DebugFormat(
"[ASSET TRANSACTIONS]: Updating task item {0} in {1} with asset in transaction {2}",
item.Name, part.Name, transactionID);
asset.FullID = UUID.Random();
asset.Name = item.Name;
asset.Description = item.Description;
asset.Type = (sbyte)item.Type;
@@ -170,20 +167,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
{
if (XferUploaders.ContainsKey(transactionID))
{
UUID assetID = UUID.Combine(transactionID,
remoteClient.SecureSessionId);
AssetBase asset = GetTransactionAsset(transactionID);
AssetBase asset = m_Scene.AssetService.Get(
assetID.ToString());
if (asset == null)
if (asset != null)
{
asset = GetTransactionAsset(transactionID);
}
if (asset != null && asset.FullID == assetID)
{
// Assets never get updated, new ones get created
asset.FullID = UUID.Random();
asset.Name = item.Name;
asset.Description = item.Description;
@@ -191,10 +178,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
item.AssetID = asset.FullID;
m_Scene.AssetService.Store(asset);
}
IInventoryService invService = m_Scene.InventoryService;
invService.UpdateItem(item);
IInventoryService invService = m_Scene.InventoryService;
invService.UpdateItem(item);
}
}
}
}