aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-09 22:45:40 +0000
committerJustin Clarke Casey2008-05-09 22:45:40 +0000
commit893d40639ceb9e141693ef25b10487b402a7feeb (patch)
treecee944514cbeb2563d438e21f2d51676f3701801
parent* Revert caps fetch inventory service back to UDP for now (diff)
downloadopensim-SC_OLD-893d40639ceb9e141693ef25b10487b402a7feeb.zip
opensim-SC_OLD-893d40639ceb9e141693ef25b10487b402a7feeb.tar.gz
opensim-SC_OLD-893d40639ceb9e141693ef25b10487b402a7feeb.tar.bz2
opensim-SC_OLD-893d40639ceb9e141693ef25b10487b402a7feeb.tar.xz
* Resolve mantis 1182. Doesn't actually implement llGiveInventoryList - merely corrects the signature so that "not implemented" message is displayed rather than a script
compile failure
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs3
3 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index aadad7b..afc3ff2 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -1353,9 +1353,9 @@ namespace OpenSim.Region.ScriptEngine.Common
1353 m_LSL_Functions.llGroundRepel(height, water, tau); 1353 m_LSL_Functions.llGroundRepel(height, water, tau);
1354 } 1354 }
1355 1355
1356 public void llGiveInventoryList() 1356 public void llGiveInventoryList(string destination, string category, LSL_Types.list inventory)
1357 { 1357 {
1358 m_LSL_Functions.llGiveInventoryList(); 1358 m_LSL_Functions.llGiveInventoryList(destination, category, inventory);
1359 } 1359 }
1360 1360
1361 public void llSetVehicleType(int type) 1361 public void llSetVehicleType(int type)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 8e56440..87c0450 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4172,7 +4172,7 @@ namespace OpenSim.Region.ScriptEngine.Common
4172 NotImplemented("llGroundRepel"); 4172 NotImplemented("llGroundRepel");
4173 } 4173 }
4174 4174
4175 public void llGiveInventoryList() 4175 public void llGiveInventoryList(string destination, string category, LSL_Types.list inventory)
4176 { 4176 {
4177 m_host.AddScriptLPS(1); 4177 m_host.AddScriptLPS(1);
4178 NotImplemented("llGiveInventoryList"); 4178 NotImplemented("llGiveInventoryList");
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index 57d0de1..369f6a7 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -445,7 +445,8 @@ namespace OpenSim.Region.ScriptEngine.Common
445 void llParticleSystem(LSL_Types.list rules); 445 void llParticleSystem(LSL_Types.list rules);
446 //wiki: llGroundRepel(double height, integer water, double tau) 446 //wiki: llGroundRepel(double height, integer water, double tau)
447 void llGroundRepel(double height, int water, double tau); 447 void llGroundRepel(double height, int water, double tau);
448 void llGiveInventoryList(); 448 //wiki: llGiveInventoryList(string destination, string category, LSL_Types.list inventory)
449 void llGiveInventoryList(string destination, string category, LSL_Types.list inventory);
449 //wiki: llSetVehicleType(integer type) 450 //wiki: llSetVehicleType(integer type)
450 void llSetVehicleType(int type); 451 void llSetVehicleType(int type);
451 //wiki: llSetVehicledoubleParam(integer param, double value) 452 //wiki: llSetVehicledoubleParam(integer param, double value)