aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-02 15:29:09 +0000
committerJustin Clarke Casey2008-05-02 15:29:09 +0000
commit8cf2630dc9058078b82814ea28fd4e5150351466 (patch)
tree1e0cc1ed20a9034838dc23ac725a3acf46fad7a4
parentminor refactoring. Change getName and GetVersion methods (yes the had differ... (diff)
downloadopensim-SC_OLD-8cf2630dc9058078b82814ea28fd4e5150351466.zip
opensim-SC_OLD-8cf2630dc9058078b82814ea28fd4e5150351466.tar.gz
opensim-SC_OLD-8cf2630dc9058078b82814ea28fd4e5150351466.tar.bz2
opensim-SC_OLD-8cf2630dc9058078b82814ea28fd4e5150351466.tar.xz
From: Kurt Taylor <krtaylor@us.ibm.com>
Adds "not implemented" stubs for llSetVehicleFloatParam() and llSetLinkTexture() Some cleanup of LSO script enums
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs5
4 files changed, 34 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 9b541c5..f7cd697 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -1368,6 +1368,11 @@ namespace OpenSim.Region.ScriptEngine.Common
1368 m_LSL_Functions.llSetVehicledoubleParam(param, value); 1368 m_LSL_Functions.llSetVehicledoubleParam(param, value);
1369 } 1369 }
1370 1370
1371 public void llSetVehicleFloatParam(int param, float value)
1372 {
1373 m_LSL_Functions.llSetVehicleFloatParam(param, value);
1374 }
1375
1371 public void llSetVehicleVectorParam(int param, vector vec) 1376 public void llSetVehicleVectorParam(int param, vector vec)
1372 { 1377 {
1373 m_LSL_Functions.llSetVehicleVectorParam(param, vec); 1378 m_LSL_Functions.llSetVehicleVectorParam(param, vec);
@@ -1854,6 +1859,11 @@ namespace OpenSim.Region.ScriptEngine.Common
1854 return m_LSL_Functions.llGetParcelDetails(pos, param); 1859 return m_LSL_Functions.llGetParcelDetails(pos, param);
1855 } 1860 }
1856 1861
1862 public void llSetLinkTexture(int linknumber, string texture, int face)
1863 {
1864 m_LSL_Functions.llSetLinkTexture(linknumber, texture, face);
1865 }
1866
1857 public string llStringTrim(string src, int type) 1867 public string llStringTrim(string src, int type)
1858 { 1868 {
1859 return m_LSL_Functions.llStringTrim(src, type); 1869 return m_LSL_Functions.llStringTrim(src, type);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index ec6d0ad..ee5d52c 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4089,6 +4089,12 @@ namespace OpenSim.Region.ScriptEngine.Common
4089 NotImplemented("llSetVehicledoubleParam"); 4089 NotImplemented("llSetVehicledoubleParam");
4090 } 4090 }
4091 4091
4092 public void llSetVehicleFloatParam(int param, float value)
4093 {
4094 m_host.AddScriptLPS(1);
4095 NotImplemented("llSetVehicleFloatParam");
4096 }
4097
4092 public void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec) 4098 public void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec)
4093 { 4099 {
4094 m_host.AddScriptLPS(1); 4100 m_host.AddScriptLPS(1);
@@ -5876,6 +5882,12 @@ namespace OpenSim.Region.ScriptEngine.Common
5876 return ret; 5882 return ret;
5877 } 5883 }
5878 5884
5885 public void llSetLinkTexture(int linknumber, string texture, int face)
5886 {
5887 m_host.AddScriptLPS(1);
5888 NotImplemented("llSetLinkTexture");
5889 }
5890
5879 public string llStringTrim(string src, int type) 5891 public string llStringTrim(string src, int type)
5880 { 5892 {
5881 m_host.AddScriptLPS(1); 5893 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 ab9f463..6742ed5 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -450,6 +450,8 @@ namespace OpenSim.Region.ScriptEngine.Common
450 void llSetVehicleType(int type); 450 void llSetVehicleType(int type);
451 //wiki: llSetVehicledoubleParam(integer param, double value) 451 //wiki: llSetVehicledoubleParam(integer param, double value)
452 void llSetVehicledoubleParam(int param, double value); 452 void llSetVehicledoubleParam(int param, double value);
453 // wiki: llSetVehicleFloatParam(integer param, float value)
454 void llSetVehicleFloatParam(int param, float value);
453 //wiki: llSetVehicleVectorParam(integer param, vector vec) 455 //wiki: llSetVehicleVectorParam(integer param, vector vec)
454 void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec); 456 void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec);
455 //wiki: llSetVehicleRotationParam(integer param, rotation rot) 457 //wiki: llSetVehicleRotationParam(integer param, rotation rot)
@@ -628,7 +630,7 @@ namespace OpenSim.Region.ScriptEngine.Common
628 void llResetLandBanList(); 630 void llResetLandBanList();
629 //wiki: llResetLandPassList() 631 //wiki: llResetLandPassList()
630 void llResetLandPassList(); 632 void llResetLandPassList();
631 //wiki integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide) 633 //wiki: integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
632 int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide); 634 int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide);
633 //wiki: list llGetParcelPrimOwners( vector pos ) 635 //wiki: list llGetParcelPrimOwners( vector pos )
634 LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos); 636 LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos);
@@ -636,9 +638,13 @@ namespace OpenSim.Region.ScriptEngine.Common
636 int llGetObjectPrimCount(string object_id); 638 int llGetObjectPrimCount(string object_id);
637 //wiki: integer llGetParcelMaxPrims( vector pos, integer sim_wide ) 639 //wiki: integer llGetParcelMaxPrims( vector pos, integer sim_wide )
638 int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide); 640 int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide);
639 //wiki list llGetParcelDetails(vector pos, list params) 641 //wiki: llGetParcelDetails(vector pos, list params)
640 LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param); 642 LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param);
643 //wiki: llSetLinkTexture(integer linknumber, string texture, integer face )
644 void llSetLinkTexture(int linknumber, string texture, int face);
645 //wiki: string llStringTrim(string src, int type)
641 string llStringTrim(string src, int type); 646 string llStringTrim(string src, int type);
647 //wiki: LSL_Types.list llGetObjectDetails(string id, LSL_Types.list args)
642 LSL_Types.list llGetObjectDetails(string id, LSL_Types.list args); 648 LSL_Types.list llGetObjectDetails(string id, LSL_Types.list args);
643 649
644 void osSetRegionWaterHeight(double height); 650 void osSetRegionWaterHeight(double height);
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
index 0a76039..7b4a1af 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
@@ -554,7 +554,10 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
554 llGetParcelPrimOwners = 324, 554 llGetParcelPrimOwners = 324,
555 llGetObjectPrimCount = 325, 555 llGetObjectPrimCount = 325,
556 llGetParcelMaxPrims = 326, 556 llGetParcelMaxPrims = 326,
557 llGetParcelDetails = 327 557 llGetParcelDetails = 327,
558 llSetLinkTexture = 328,
559 llStringTrim = 329,
560 llGetObjectDetails = 330
558 } 561 }
559 } 562 }
560} 563}