aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs18
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs66
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs5
3 files changed, 89 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 922b301..79a106b 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -1849,6 +1849,24 @@ namespace OpenSim.Region.ScriptEngine.Common
1849 return m_LSL_Functions.osSetDynamicTextureURL(dynamicID, contentType, url, extraParams, timer); 1849 return m_LSL_Functions.osSetDynamicTextureURL(dynamicID, contentType, url, extraParams, timer);
1850 } 1850 }
1851 1851
1852 public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams,
1853 int timer)
1854 {
1855 return m_LSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer);
1856 }
1857
1858 public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,
1859 int timer, int alpha)
1860 {
1861 return m_LSL_Functions.osSetDynamicTextureURLBlend(dynamicID, contentType, url, extraParams, timer, alpha);
1862 }
1863
1864 public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams,
1865 int timer, int alpha)
1866 {
1867 return m_LSL_Functions.osSetDynamicTextureDataBlend(dynamicID, contentType, data, extraParams, timer, alpha);
1868 }
1869
1852 public double osTerrainGetHeight(int x, int y) 1870 public double osTerrainGetHeight(int x, int y)
1853 { 1871 {
1854 return m_LSL_Functions.osTerrainGetHeight(x, y); 1872 return m_LSL_Functions.osTerrainGetHeight(x, y);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 7da47d4..93de3b4 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4265,6 +4265,72 @@ namespace OpenSim.Region.ScriptEngine.Common
4265 return LLUUID.Zero.ToString(); 4265 return LLUUID.Zero.ToString();
4266 } 4266 }
4267 4267
4268 public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,
4269 int timer, int alpha)
4270 {
4271 m_host.AddScriptLPS(1);
4272 if (dynamicID == String.Empty)
4273 {
4274 IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
4275 LLUUID createdTexture =
4276 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
4277 extraParams, timer, true, (byte) alpha );
4278 return createdTexture.ToString();
4279 }
4280 else
4281 {
4282 //TODO update existing dynamic textures
4283 }
4284
4285 return LLUUID.Zero.ToString();
4286 }
4287
4288 public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams,
4289 int timer)
4290 {
4291 m_host.AddScriptLPS(1);
4292 if (dynamicID == String.Empty)
4293 {
4294 IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
4295 if (textureManager != null)
4296 {
4297 LLUUID createdTexture =
4298 textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
4299 extraParams, timer);
4300 return createdTexture.ToString();
4301 }
4302 }
4303 else
4304 {
4305 //TODO update existing dynamic textures
4306 }
4307
4308 return LLUUID.Zero.ToString();
4309 }
4310
4311 public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams,
4312 int timer, int alpha)
4313 {
4314 m_host.AddScriptLPS(1);
4315 if (dynamicID == String.Empty)
4316 {
4317 IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
4318 if (textureManager != null)
4319 {
4320 LLUUID createdTexture =
4321 textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
4322 extraParams, timer, true, (byte) alpha);
4323 return createdTexture.ToString();
4324 }
4325 }
4326 else
4327 {
4328 //TODO update existing dynamic textures
4329 }
4330
4331 return LLUUID.Zero.ToString();
4332 }
4333
4268 public bool osConsoleCommand(string command) 4334 public bool osConsoleCommand(string command)
4269 { 4335 {
4270 m_host.AddScriptLPS(1); 4336 m_host.AddScriptLPS(1);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index c1e178b..c6d683c 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -637,6 +637,11 @@ namespace OpenSim.Region.ScriptEngine.Common
637 string llStringTrim(string src, int type); 637 string llStringTrim(string src, int type);
638 //OpenSim functions 638 //OpenSim functions
639 string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer); 639 string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer);
640 string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,
641 int timer, int alpha);
642 string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer);
643 string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams,
644 int timer, int alpha);
640 double osTerrainGetHeight(int x, int y); 645 double osTerrainGetHeight(int x, int y);
641 int osTerrainSetHeight(int x, int y, double val); 646 int osTerrainSetHeight(int x, int y, double val);
642 int osRegionRestart(double seconds); 647 int osRegionRestart(double seconds);