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

revert the thread level change; remove unused dynamic texture timer from internal code; let blend alpha work if < 255; let blend work with the selected face; etc

Browse Source
This commit is contained in:
UbitUmarov
2017-06-24 09:24:56 +01:00
parent 8d1dd44edb
commit 1a8a77c41e
6 changed files with 72 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -678,7 +678,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
UUID createdTexture =
textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
extraParams, timer);
extraParams);
return createdTexture.ToString();
}
else
@@ -700,7 +700,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
UUID createdTexture =
textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
extraParams, timer, true, (byte) alpha);
extraParams, true, (byte) alpha);
return createdTexture.ToString();
}
else
@@ -722,7 +722,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
UUID createdTexture =
textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
extraParams, timer, blend, disp, (byte) alpha, face);
extraParams, blend, disp, (byte) alpha, face);
return createdTexture.ToString();
}
else
@@ -756,7 +756,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
UUID createdTexture =
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
extraParams, timer, false, 3, 255, face);
extraParams, false, 3, 255, face);
return createdTexture.ToString();
}
@@ -786,7 +786,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
UUID createdTexture =
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
extraParams, timer, true, (byte) alpha);
extraParams, true, (byte) alpha);
return createdTexture.ToString();
}
}
@@ -801,7 +801,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams,
bool blend, int disp, int timer, int alpha, int face)
{
CheckThreatLevel(ThreatLevel.VeryHigh , "osSetDynamicTextureDataBlendFace");
CheckThreatLevel(ThreatLevel.VeryLow , "osSetDynamicTextureDataBlendFace");
m_host.AddScriptLPS(1);
if (dynamicID == String.Empty)
@@ -815,7 +815,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
UUID createdTexture =
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
extraParams, timer, blend, disp, (byte) alpha, face);
extraParams, blend, disp, (byte) alpha, face);
return createdTexture.ToString();
}
}