ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.

Browse Source 
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
This commit is contained in:
diva
2009-05-15 05:00:25 +00:00
parent 14c1e991c6
commit 5e4fc6e91e
56 changed files with 716 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -193,7 +193,7 @@ namespace OpenSim.Region.Framework.Scenes
AssetBase asset =
CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
CommsManager.AssetCache.AddAsset(asset);
AssetService.Store(asset);
item.AssetID = asset.FullID;
userInfo.UpdateItem(item);
@@ -279,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes
}
AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data);
CommsManager.AssetCache.AddAsset(asset);
AssetService.Store(asset);
if (isScriptRunning)
{
@@ -688,9 +688,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
AssetBase asset
= CommsManager.AssetCache.GetAsset(
item.AssetID, (item.AssetType == (int)AssetType.Texture ? true : false));
AssetBase asset = AssetService.Get(item.AssetID.ToString());
if (asset != null)
{
@@ -911,7 +909,7 @@ namespace OpenSim.Region.Framework.Scenes
}
AssetBase asset = CreateAsset(name, description, assetType, data);
CommsManager.AssetCache.AddAsset(asset);
AssetService.Store(asset);
CreateNewInventoryItem(remoteClient, folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
}
@@ -1538,7 +1536,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"));
CommsManager.AssetCache.AddAsset(asset);
AssetService.Store(asset);
TaskInventoryItem taskItem = new TaskInventoryItem();
@@ -1959,7 +1957,7 @@ namespace OpenSim.Region.Framework.Scenes
objectGroup.GetPartDescription(objectGroup.RootPart.LocalId),
(sbyte)AssetType.Object,
Utils.StringToBytes(sceneObjectXml));
CommsManager.AssetCache.AddAsset(asset);
AssetService.Store(asset);
assetID = asset.FullID;
if (DeRezAction.SaveToExistingUserInventoryItem == action)
@@ -2085,7 +2083,7 @@ namespace OpenSim.Region.Framework.Scenes
objectGroup.GetPartDescription(objectGroup.LocalId),
(sbyte)AssetType.Object,
Utils.StringToBytes(sceneObjectXml));
CommsManager.AssetCache.AddAsset(asset);
AssetService.Store(asset);
item.AssetID = asset.FullID;
item.Description = asset.Description;
@@ -2123,7 +2121,7 @@ namespace OpenSim.Region.Framework.Scenes
grp.GetPartDescription(grp.LocalId),
(sbyte)AssetType.Object,
Utils.StringToBytes(sceneObjectXml));
CommsManager.AssetCache.AddAsset(asset);
AssetService.Store(asset);
InventoryItemBase item = new InventoryItemBase();
item.CreatorId = grp.RootPart.CreatorID.ToString();
@@ -2247,7 +2245,7 @@ namespace OpenSim.Region.Framework.Scenes
if (item != null)
{
AssetBase rezAsset = CommsManager.AssetCache.GetAsset(item.AssetID, false);
AssetBase rezAsset = AssetService.Get(item.AssetID.ToString());
if (rezAsset != null)
{
@@ -2416,7 +2414,7 @@ namespace OpenSim.Region.Framework.Scenes
{
UUID ownerID = item.OwnerID;
AssetBase rezAsset = CommsManager.AssetCache.GetAsset(item.AssetID, false);
AssetBase rezAsset = AssetService.Get(item.AssetID.ToString());
if (rezAsset != null)
{