ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +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

16
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -1414,8 +1414,7 @@ if (m_shape != null) {
{
if (dupe.m_shape.SculptEntry && dupe.m_shape.SculptTexture != UUID.Zero)
{
m_parentGroup.Scene.CommsManager.AssetCache.GetAsset(
dupe.m_shape.SculptTexture, dupe.SculptTextureCallback, true);
m_parentGroup.Scene.AssetService.Get(dupe.m_shape.SculptTexture.ToString(), dupe, AssetReceived);
}
bool UsePhysics = ((dupe.ObjectFlags & (uint)PrimFlags.Physics) != 0);
@@ -1425,6 +1424,16 @@ if (m_shape != null) {
return dupe;
}
protected void AssetReceived(string id, Object sender, AssetBase asset)
{
if (asset != null)
{
SceneObjectPart sop = (SceneObjectPart)sender;
if (sop != null)
sop.SculptTextureCallback(asset.FullID, asset);
}
}
public static SceneObjectPart Create()
{
SceneObjectPart part = new SceneObjectPart();
@@ -3147,8 +3156,7 @@ if (m_shape != null) {
{
if (m_shape.SculptEntry && m_shape.SculptTexture != UUID.Zero)
{
m_parentGroup.Scene.CommsManager.AssetCache.GetAsset(
m_shape.SculptTexture, SculptTextureCallback, true);
m_parentGroup.Scene.AssetService.Get(m_shape.SculptTexture.ToString(), this, AssetReceived);
}
}