aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-06-24 04:23:13 +0100
committerUbitUmarov2017-06-24 04:23:13 +0100
commitae4266916cc3b75e1e897c9250b47390340eab72 (patch)
tree29be24c5fb782a5c8e9d4955071fbfe60ededd4b
parentosDrawFilledEllipse or string comand FillEllipse identical do Ellipse one (diff)
downloadopensim-SC-ae4266916cc3b75e1e897c9250b47390340eab72.zip
opensim-SC-ae4266916cc3b75e1e897c9250b47390340eab72.tar.gz
opensim-SC-ae4266916cc3b75e1e897c9250b47390340eab72.tar.bz2
opensim-SC-ae4266916cc3b75e1e897c9250b47390340eab72.tar.xz
add string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams, int timer, int face) to easy only setting a prim face
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs9
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs6
3 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 37f8970..d782ee6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -736,6 +736,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
736 public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, 736 public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams,
737 int timer) 737 int timer)
738 { 738 {
739 return osSetDynamicTextureDataFace(dynamicID, contentType, data, extraParams, timer, -1);
740 }
741
742 public string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams,
743 int timer, int face)
744 {
739 CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureData"); 745 CheckThreatLevel(ThreatLevel.VeryLow, "osSetDynamicTextureData");
740 746
741 m_host.AddScriptLPS(1); 747 m_host.AddScriptLPS(1);
@@ -750,7 +756,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
750 } 756 }
751 UUID createdTexture = 757 UUID createdTexture =
752 textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, 758 textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
753 extraParams, timer); 759 extraParams, timer, false, 3, 255, face);
760
754 return createdTexture.ToString(); 761 return createdTexture.ToString();
755 } 762 }
756 } 763 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index da3d6de..c12490c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -123,6 +123,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
123 string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, 123 string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams,
124 bool blend, int disp, int timer, int alpha, int face); 124 bool blend, int disp, int timer, int alpha, int face);
125 string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer); 125 string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer);
126 string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams, int timer, int face);
126 string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, 127 string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams,
127 int timer, int alpha); 128 int timer, int alpha);
128 string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, 129 string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams,
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 1451efc..9bc3159 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -153,6 +153,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
153 return m_OSSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer); 153 return m_OSSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer);
154 } 154 }
155 155
156 public string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams,
157 int timer, int face)
158 {
159 return m_OSSL_Functions.osSetDynamicTextureDataFace(dynamicID, contentType, data, extraParams, timer, face);
160 }
161
156 public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, 162 public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,
157 int timer, int alpha) 163 int timer, int alpha)
158 { 164 {