diff options
author | Jeff Ames | 2008-07-06 14:02:22 +0000 |
---|---|---|
committer | Jeff Ames | 2008-07-06 14:02:22 +0000 |
commit | d470d30c09fde202f708a9c8af763f5d16e18bfb (patch) | |
tree | 6a86572d268dda911a5208bf5be1a1f2c19adc3c /OpenSim/Region/ScriptEngine/Common | |
parent | Remove scripts that don't really belong in OpenSim SVN. (diff) | |
download | opensim-SC_OLD-d470d30c09fde202f708a9c8af763f5d16e18bfb.zip opensim-SC_OLD-d470d30c09fde202f708a9c8af763f5d16e18bfb.tar.gz opensim-SC_OLD-d470d30c09fde202f708a9c8af763f5d16e18bfb.tar.bz2 opensim-SC_OLD-d470d30c09fde202f708a9c8af763f5d16e18bfb.tar.xz |
Copyright notices and formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 84 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 4 |
2 files changed, 44 insertions, 44 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 8da164c..3a866db 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -3211,7 +3211,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
3211 | { | 3211 | { |
3212 | m_host.AddScriptLPS(1); | 3212 | m_host.AddScriptLPS(1); |
3213 | 3213 | ||
3214 | if(add != 0) | 3214 | if (add != 0) |
3215 | m_host.ParentGroup.RootPart.AllowedDrop = true; | 3215 | m_host.ParentGroup.RootPart.AllowedDrop = true; |
3216 | else | 3216 | else |
3217 | m_host.ParentGroup.RootPart.AllowedDrop = false; | 3217 | m_host.ParentGroup.RootPart.AllowedDrop = false; |
@@ -4408,7 +4408,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4408 | { | 4408 | { |
4409 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) | 4409 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) |
4410 | { | 4410 | { |
4411 | if(inv.Value.Name == name) | 4411 | if (inv.Value.Name == name) |
4412 | return inv.Key; | 4412 | return inv.Key; |
4413 | } | 4413 | } |
4414 | return LLUUID.Zero; | 4414 | return LLUUID.Zero; |
@@ -4419,7 +4419,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4419 | m_host.AddScriptLPS(1); | 4419 | m_host.AddScriptLPS(1); |
4420 | 4420 | ||
4421 | LLUUID destID; | 4421 | LLUUID destID; |
4422 | if(!LLUUID.TryParse(destination, out destID)) | 4422 | if (!LLUUID.TryParse(destination, out destID)) |
4423 | return; | 4423 | return; |
4424 | 4424 | ||
4425 | List<LLUUID> itemList = new List<LLUUID>(); | 4425 | List<LLUUID> itemList = new List<LLUUID>(); |
@@ -4427,19 +4427,19 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4427 | foreach (Object item in inventory.Data) | 4427 | foreach (Object item in inventory.Data) |
4428 | { | 4428 | { |
4429 | LLUUID itemID; | 4429 | LLUUID itemID; |
4430 | if(LLUUID.TryParse(item.ToString(), out itemID)) | 4430 | if (LLUUID.TryParse(item.ToString(), out itemID)) |
4431 | { | 4431 | { |
4432 | itemList.Add(itemID); | 4432 | itemList.Add(itemID); |
4433 | } | 4433 | } |
4434 | else | 4434 | else |
4435 | { | 4435 | { |
4436 | itemID = GetTaskInventoryItem(item.ToString()); | 4436 | itemID = GetTaskInventoryItem(item.ToString()); |
4437 | if(itemID != LLUUID.Zero) | 4437 | if (itemID != LLUUID.Zero) |
4438 | itemList.Add(itemID); | 4438 | itemList.Add(itemID); |
4439 | } | 4439 | } |
4440 | } | 4440 | } |
4441 | 4441 | ||
4442 | if(itemList.Count == 0) | 4442 | if (itemList.Count == 0) |
4443 | return; | 4443 | return; |
4444 | 4444 | ||
4445 | m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList); | 4445 | m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList); |
@@ -4686,7 +4686,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4686 | { | 4686 | { |
4687 | m_host.AddScriptLPS(1); | 4687 | m_host.AddScriptLPS(1); |
4688 | 4688 | ||
4689 | m_host.ScriptAccessPin = pin; | 4689 | m_host.ScriptAccessPin = pin; |
4690 | } | 4690 | } |
4691 | 4691 | ||
4692 | public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param) | 4692 | public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param) |
@@ -4701,38 +4701,38 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4701 | llSay(0, "Could not parse key " + target); | 4701 | llSay(0, "Could not parse key " + target); |
4702 | return; | 4702 | return; |
4703 | } | 4703 | } |
4704 | 4704 | ||
4705 | // target must be a different prim than the one containing the script | 4705 | // target must be a different prim than the one containing the script |
4706 | if (m_host.UUID == destId) | 4706 | if (m_host.UUID == destId) |
4707 | { | 4707 | { |
4708 | return; | 4708 | return; |
4709 | } | 4709 | } |
4710 | 4710 | ||
4711 | // copy the first script found with this inventory name | 4711 | // copy the first script found with this inventory name |
4712 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) | 4712 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) |
4713 | { | 4713 | { |
4714 | if (inv.Value.Name == name) | 4714 | if (inv.Value.Name == name) |
4715 | { | 4715 | { |
4716 | // make sure the object is a script | 4716 | // make sure the object is a script |
4717 | if(10 == inv.Value.Type) | 4717 | if (10 == inv.Value.Type) |
4718 | { | 4718 | { |
4719 | found = true; | 4719 | found = true; |
4720 | srcId = inv.Key; | 4720 | srcId = inv.Key; |
4721 | break; | 4721 | break; |
4722 | } | 4722 | } |
4723 | } | 4723 | } |
4724 | } | 4724 | } |
4725 | 4725 | ||
4726 | if (!found) | 4726 | if (!found) |
4727 | { | 4727 | { |
4728 | llSay(0, "Could not find script " + name); | 4728 | llSay(0, "Could not find script " + name); |
4729 | return; | 4729 | return; |
4730 | } | 4730 | } |
4731 | 4731 | ||
4732 | // the rest of the permission checks are done in RezScript, so check the pin there as well | 4732 | // the rest of the permission checks are done in RezScript, so check the pin there as well |
4733 | World.RezScript(srcId, m_host, destId, pin, running, start_param); | 4733 | World.RezScript(srcId, m_host, destId, pin, running, start_param); |
4734 | // this will cause the delay even if the script pin or permissions were wrong - seems ok | 4734 | // this will cause the delay even if the script pin or permissions were wrong - seems ok |
4735 | System.Threading.Thread.Sleep(3000); | 4735 | System.Threading.Thread.Sleep(3000); |
4736 | } | 4736 | } |
4737 | 4737 | ||
4738 | // remote_data(integer type, key channel, key message_id, string sender, integer ival, string sval) | 4738 | // remote_data(integer type, key channel, key message_id, string sender, integer ival, string sval) |
@@ -5072,15 +5072,15 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5072 | shapeBlock.ObjectLocalID = m_host.LocalId; | 5072 | shapeBlock.ObjectLocalID = m_host.LocalId; |
5073 | shapeBlock.PathScaleX = 100; | 5073 | shapeBlock.PathScaleX = 100; |
5074 | shapeBlock.PathScaleY = 150; | 5074 | shapeBlock.PathScaleY = 150; |
5075 | 5075 | ||
5076 | if (type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_CYLINDER && | 5076 | if (type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_CYLINDER && |
5077 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_PLANE && | 5077 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_PLANE && |
5078 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE && | 5078 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE && |
5079 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_TORUS) | 5079 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_TORUS) |
5080 | { | 5080 | { |
5081 | // default | 5081 | // default |
5082 | type = (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE; | 5082 | type = (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE; |
5083 | } | 5083 | } |
5084 | 5084 | ||
5085 | // retain pathcurve | 5085 | // retain pathcurve |
5086 | shapeBlock.PathCurve = m_host.Shape.PathCurve; | 5086 | shapeBlock.PathCurve = m_host.Shape.PathCurve; |
@@ -5157,7 +5157,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5157 | SetRot(part, q); | 5157 | SetRot(part, q); |
5158 | 5158 | ||
5159 | break; | 5159 | break; |
5160 | 5160 | ||
5161 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE: | 5161 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE: |
5162 | if (remain < 3) | 5162 | if (remain < 3) |
5163 | return; | 5163 | return; |
@@ -5175,7 +5175,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5175 | LSL_Types.Vector3 holesize; | 5175 | LSL_Types.Vector3 holesize; |
5176 | LSL_Types.Vector3 profilecut; | 5176 | LSL_Types.Vector3 profilecut; |
5177 | 5177 | ||
5178 | switch(code) | 5178 | switch (code) |
5179 | { | 5179 | { |
5180 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX: | 5180 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX: |
5181 | if (remain < 6) | 5181 | if (remain < 6) |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index bfdc686..1e2e573 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
@@ -1295,7 +1295,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1295 | 1295 | ||
1296 | public override bool Equals(Object o) | 1296 | public override bool Equals(Object o) |
1297 | { | 1297 | { |
1298 | if(!(o is LSLInteger)) | 1298 | if (!(o is LSLInteger)) |
1299 | return false; | 1299 | return false; |
1300 | return value == ((LSLInteger)o).value; | 1300 | return value == ((LSLInteger)o).value; |
1301 | } | 1301 | } |
@@ -1452,7 +1452,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1452 | 1452 | ||
1453 | public override bool Equals(Object o) | 1453 | public override bool Equals(Object o) |
1454 | { | 1454 | { |
1455 | if(!(o is LSLFloat)) | 1455 | if (!(o is LSLFloat)) |
1456 | return false; | 1456 | return false; |
1457 | return value == ((LSLFloat)o).value; | 1457 | return value == ((LSLFloat)o).value; |
1458 | } | 1458 | } |