diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
3 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 9b65d8d..7f3db9c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -428,7 +428,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
428 | } | 428 | } |
429 | 429 | ||
430 | public string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, | 430 | public string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, |
431 | bool blend, int timer, int alpha, int face) | 431 | bool blend, int disp, int timer, int alpha, int face) |
432 | { | 432 | { |
433 | CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureURLBlendFace"); | 433 | CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureURLBlendFace"); |
434 | 434 | ||
@@ -438,7 +438,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
438 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 438 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
439 | UUID createdTexture = | 439 | UUID createdTexture = |
440 | textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, | 440 | textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, |
441 | extraParams, timer, blend, (byte) alpha, face); | 441 | extraParams, timer, blend, disp, (byte) alpha, face); |
442 | return createdTexture.ToString(); | 442 | return createdTexture.ToString(); |
443 | } | 443 | } |
444 | else | 444 | else |
@@ -508,7 +508,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
508 | } | 508 | } |
509 | 509 | ||
510 | public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, | 510 | public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, |
511 | bool blend, int timer, int alpha, int face) | 511 | bool blend, int disp, int timer, int alpha, int face) |
512 | { | 512 | { |
513 | CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureDataBlendFace"); | 513 | CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureDataBlendFace"); |
514 | 514 | ||
@@ -524,7 +524,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
524 | } | 524 | } |
525 | UUID createdTexture = | 525 | UUID createdTexture = |
526 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 526 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
527 | extraParams, timer, blend, (byte) alpha, face); | 527 | extraParams, timer, blend, disp, (byte) alpha, face); |
528 | return createdTexture.ToString(); | 528 | return createdTexture.ToString(); |
529 | } | 529 | } |
530 | } | 530 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index e337c6b..debbad6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -59,12 +59,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
59 | string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, | 59 | string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, |
60 | int timer, int alpha); | 60 | int timer, int alpha); |
61 | string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, | 61 | string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, |
62 | bool blend, int timer, int alpha, int face); | 62 | bool blend, int disp, int timer, int alpha, int face); |
63 | string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer); | 63 | string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer); |
64 | string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, | 64 | string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, |
65 | int timer, int alpha); | 65 | int timer, int alpha); |
66 | string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, | 66 | string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, |
67 | bool blend, int timer, int alpha, int face); | 67 | bool blend, int disp, int timer, int alpha, int face); |
68 | 68 | ||
69 | LSL_Float osTerrainGetHeight(int x, int y); | 69 | LSL_Float osTerrainGetHeight(int x, int y); |
70 | LSL_Integer osTerrainSetHeight(int x, int y, double val); | 70 | LSL_Integer osTerrainSetHeight(int x, int y, double val); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 5df2d6e..193e2e0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -135,17 +135,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
135 | } | 135 | } |
136 | 136 | ||
137 | public string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, | 137 | public string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, |
138 | bool blend, int timer, int alpha, int face) | 138 | bool blend, int disp, int timer, int alpha, int face) |
139 | { | 139 | { |
140 | return m_OSSL_Functions.osSetDynamicTextureURLBlendFace(dynamicID, contentType, url, extraParams, | 140 | return m_OSSL_Functions.osSetDynamicTextureURLBlendFace(dynamicID, contentType, url, extraParams, |
141 | blend, timer, alpha, face); | 141 | blend, disp, timer, alpha, face); |
142 | } | 142 | } |
143 | 143 | ||
144 | public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, | 144 | public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, |
145 | bool blend, int timer, int alpha, int face) | 145 | bool blend, int disp, int timer, int alpha, int face) |
146 | { | 146 | { |
147 | return m_OSSL_Functions.osSetDynamicTextureDataBlendFace(dynamicID, contentType, data, extraParams, | 147 | return m_OSSL_Functions.osSetDynamicTextureDataBlendFace(dynamicID, contentType, data, extraParams, |
148 | blend, timer, alpha, face); | 148 | blend, disp, timer, alpha, face); |
149 | } | 149 | } |
150 | 150 | ||
151 | public LSL_Float osTerrainGetHeight(int x, int y) | 151 | public LSL_Float osTerrainGetHeight(int x, int y) |