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

* Refactor: Move last commit's refactor back to AgentAssetTransactionsManager

Browse Source 
* Push asset update (invoked when clothing is altered) down into AgentAssetTransactions from Scene.Inventory.cs to join others
* I've tested that clothing creation and update still works, but please let me know if it suddently breaks for you.
* Add/correct comments
This commit is contained in:
Justin Clarke Casey
2008-02-13 00:30:51 +00:00
parent 2018cf312b
commit 365cf8e455
4 changed files with 138 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@@ -253,6 +253,7 @@ namespace OpenSim.Region.Environment.Scenes
if (userInfo != null && userInfo.RootFolder != null)
{
InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
if (item != null)
{
if (LLUUID.Zero == transactionID)
@@ -265,34 +266,8 @@ namespace OpenSim.Region.Environment.Scenes
}
else
{
AgentAssetTransactions transactions
= CommsManager.TransactionsManager.GetUserTransactions(remoteClient.AgentId);
if (transactions != null)
{
LLUUID assetID = LLUUID.Combine(transactionID, remoteClient.SecureSessionId);
AssetBase asset
= AssetCache.GetAsset(
assetID, (item.assetType == (int) AssetType.Texture ? true : false));
if (asset == null)
{
asset = transactions.GetTransactionAsset(transactionID);
}
if (asset != null && asset.FullID == assetID)
{
asset.Name = item.inventoryName;
asset.Description = item.inventoryDescription;
asset.InvType = (sbyte) item.invType;
asset.Type = (sbyte) item.assetType;
item.assetID = asset.FullID;
AssetCache.AddAsset(asset);
}
userInfo.UpdateItem(remoteClient.AgentId, item);
}
CommsManager.TransactionsManager.HandleItemUpdateFromTransaction(
remoteClient, transactionID, item);
}
}
else
@@ -484,21 +459,9 @@ namespace OpenSim.Region.Environment.Scenes
}
else
{
AgentAssetTransactions transactions
= CommsManager.TransactionsManager.GetUserTransactions(remoteClient.AgentId);
if (transactions != null)
{
transactions.RequestCreateInventoryItem(
remoteClient, transactionID, folderID, callbackID, description,
name, invType, assetType, wearableType, nextOwnerMask);
}
else
{
m_log.ErrorFormat(
"Agent asset transactions for agent {0} uuid {1} in transaction uuid {2} unexpectedly null!",
remoteClient.Name, remoteClient.AgentId, transactionID);
}
CommsManager.TransactionsManager.HandleItemCreationFromTransaction(
remoteClient, transactionID, folderID, callbackID, description,
name, invType, assetType, wearableType, nextOwnerMask);
}
}

1
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -1311,7 +1311,6 @@ namespace OpenSim.Region.Environment.Scenes
m_LandManager.sendParcelOverlay(client);
CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
CommsManager.TransactionsManager.AddUser(client.AgentId);
}
protected virtual void SubscribeToClientEvents(IClientAPI client)