aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
authorCharles Krinke2008-07-03 15:34:05 +0000
committerCharles Krinke2008-07-03 15:34:05 +0000
commit103093cf114bfb64715f21b0f239b3ffe78fd873 (patch)
tree21cf245a5c22ab8e4f4dc508cb6e96714a3cabb0 /OpenSim/Region/ScriptEngine/Common
parentMantis#1653. Thank you kindly, Vytek for a patch that: (diff)
downloadopensim-SC_OLD-103093cf114bfb64715f21b0f239b3ffe78fd873.zip
opensim-SC_OLD-103093cf114bfb64715f21b0f239b3ffe78fd873.tar.gz
opensim-SC_OLD-103093cf114bfb64715f21b0f239b3ffe78fd873.tar.bz2
opensim-SC_OLD-103093cf114bfb64715f21b0f239b3ffe78fd873.tar.xz
Mantis#1654. Thank you kindly, Matth for a patch that:
Updates llGetPrimitiveParams() and associated files.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs32
2 files changed, 17 insertions, 16 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 90eb8c7..2d9fd09 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -2289,6 +2289,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2289 public const int PRIM_TEXGEN = 22; 2289 public const int PRIM_TEXGEN = 22;
2290 public const int PRIM_CAST_SHADOWS = 24; // Not implemented, here for completeness sake 2290 public const int PRIM_CAST_SHADOWS = 24; // Not implemented, here for completeness sake
2291 public const int PRIM_POINT_LIGHT = 23; // Huh? 2291 public const int PRIM_POINT_LIGHT = 23; // Huh?
2292 public const int PRIM_GLOW = 25;
2292 public const int PRIM_TEXGEN_DEFAULT = 0; 2293 public const int PRIM_TEXGEN_DEFAULT = 0;
2293 public const int PRIM_TEXGEN_PLANAR = 1; 2294 public const int PRIM_TEXGEN_PLANAR = 1;
2294 2295
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index aa4fb13..5016cd5 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -5626,56 +5626,56 @@ namespace OpenSim.Region.ScriptEngine.Common
5626 5626
5627 switch (code) 5627 switch (code)
5628 { 5628 {
5629 case 2: // PRIM_MATERIAL 5629 case (int)BuiltIn_Commands_BaseClass.PRIM_MATERIAL:
5630 res.Add(new LSL_Types.LSLInteger(m_host.Material)); 5630 res.Add(new LSL_Types.LSLInteger(m_host.Material));
5631 break; 5631 break;
5632 5632
5633 case 3: // PRIM_PHYSICS 5633 case (int)BuiltIn_Commands_BaseClass.PRIM_PHYSICS:
5634 if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) != 0) 5634 if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) != 0)
5635 res.Add(new LSL_Types.LSLInteger(1)); 5635 res.Add(new LSL_Types.LSLInteger(1));
5636 else 5636 else
5637 res.Add(new LSL_Types.LSLInteger(0)); 5637 res.Add(new LSL_Types.LSLInteger(0));
5638 break; 5638 break;
5639 5639
5640 case 4: // PRIM_TEMP_ON_REZ 5640 case (int)BuiltIn_Commands_BaseClass.PRIM_TEMP_ON_REZ:
5641 if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) != 0) 5641 if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) != 0)
5642 res.Add(new LSL_Types.LSLInteger(1)); 5642 res.Add(new LSL_Types.LSLInteger(1));
5643 else 5643 else
5644 res.Add(new LSL_Types.LSLInteger(0)); 5644 res.Add(new LSL_Types.LSLInteger(0));
5645 break; 5645 break;
5646 5646
5647 case 5: // PRIM_PHANTOM 5647 case (int)BuiltIn_Commands_BaseClass.PRIM_PHANTOM:
5648 if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Phantom) != 0) 5648 if ((m_host.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Phantom) != 0)
5649 res.Add(new LSL_Types.LSLInteger(1)); 5649 res.Add(new LSL_Types.LSLInteger(1));
5650 else 5650 else
5651 res.Add(new LSL_Types.LSLInteger(0)); 5651 res.Add(new LSL_Types.LSLInteger(0));
5652 break; 5652 break;
5653 5653
5654 case 6: // PRIM_POSITION 5654 case (int)BuiltIn_Commands_BaseClass.PRIM_POSITION:
5655 res.Add(new LSL_Types.Vector3(m_host.AbsolutePosition.X, 5655 res.Add(new LSL_Types.Vector3(m_host.AbsolutePosition.X,
5656 m_host.AbsolutePosition.Y, 5656 m_host.AbsolutePosition.Y,
5657 m_host.AbsolutePosition.Z)); 5657 m_host.AbsolutePosition.Z));
5658 break; 5658 break;
5659 5659
5660 case 7: // PRIM_SIZE 5660 case (int)BuiltIn_Commands_BaseClass.PRIM_SIZE:
5661 res.Add(new LSL_Types.Vector3(m_host.Scale.X, 5661 res.Add(new LSL_Types.Vector3(m_host.Scale.X,
5662 m_host.Scale.Y, 5662 m_host.Scale.Y,
5663 m_host.Scale.Z)); 5663 m_host.Scale.Z));
5664 break; 5664 break;
5665 5665
5666 case 8: // PRIM_ROTATION 5666 case (int)BuiltIn_Commands_BaseClass.PRIM_ROTATION:
5667 res.Add(new LSL_Types.Quaternion(m_host.RotationOffset.X, 5667 res.Add(new LSL_Types.Quaternion(m_host.RotationOffset.X,
5668 m_host.RotationOffset.Y, 5668 m_host.RotationOffset.Y,
5669 m_host.RotationOffset.Z, 5669 m_host.RotationOffset.Z,
5670 m_host.RotationOffset.W)); 5670 m_host.RotationOffset.W));
5671 break; 5671 break;
5672 5672
5673 case 9: // PRIM_TYPE 5673 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE:
5674 // TODO-------------- 5674 // TODO--------------
5675 res.Add(new LSL_Types.LSLInteger(0)); 5675 res.Add(new LSL_Types.LSLInteger(0));
5676 break; 5676 break;
5677 5677
5678 case 17: // PRIM_TEXTURE 5678 case (int)BuiltIn_Commands_BaseClass.PRIM_TEXTURE:
5679 if (remain < 1) 5679 if (remain < 1)
5680 return res; 5680 return res;
5681 5681
@@ -5696,7 +5696,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5696 res.Add(new LSL_Types.LSLFloat(texface.Rotation)); 5696 res.Add(new LSL_Types.LSLFloat(texface.Rotation));
5697 break; 5697 break;
5698 5698
5699 case 18: // PRIM_COLOR 5699 case (int)BuiltIn_Commands_BaseClass.PRIM_COLOR:
5700 if (remain < 1) 5700 if (remain < 1)
5701 return res; 5701 return res;
5702 5702
@@ -5714,7 +5714,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5714 res.Add(new LSL_Types.LSLFloat((texcolor.A * 255) / 255)); 5714 res.Add(new LSL_Types.LSLFloat((texcolor.A * 255) / 255));
5715 break; 5715 break;
5716 5716
5717 case 19: // PRIM_BUMP_SHINY 5717 case (int)BuiltIn_Commands_BaseClass.PRIM_BUMP_SHINY:
5718 // TODO-------------- 5718 // TODO--------------
5719 if (remain < 1) 5719 if (remain < 1)
5720 return res; 5720 return res;
@@ -5725,7 +5725,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5725 res.Add(new LSL_Types.LSLInteger(0)); 5725 res.Add(new LSL_Types.LSLInteger(0));
5726 break; 5726 break;
5727 5727
5728 case 20: // PRIM_FULLBRIGHT 5728 case (int)BuiltIn_Commands_BaseClass.PRIM_FULLBRIGHT:
5729 // TODO-------------- 5729 // TODO--------------
5730 if (remain < 1) 5730 if (remain < 1)
5731 return res; 5731 return res;
@@ -5735,7 +5735,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5735 res.Add(new LSL_Types.LSLInteger(0)); 5735 res.Add(new LSL_Types.LSLInteger(0));
5736 break; 5736 break;
5737 5737
5738 case 21: // PRIM_FLEXIBLE 5738 case (int)BuiltIn_Commands_BaseClass.PRIM_FLEXIBLE:
5739 PrimitiveBaseShape shape = m_host.Shape; 5739 PrimitiveBaseShape shape = m_host.Shape;
5740 5740
5741 if (shape.FlexiEntry) 5741 if (shape.FlexiEntry)
@@ -5752,7 +5752,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5752 shape.FlexiForceZ)); 5752 shape.FlexiForceZ));
5753 break; 5753 break;
5754 5754
5755 case 22: // PRIM_TEXGEN 5755 case (int)BuiltIn_Commands_BaseClass.PRIM_TEXGEN:
5756 // TODO-------------- 5756 // TODO--------------
5757 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR) 5757 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
5758 if (remain < 1) 5758 if (remain < 1)
@@ -5763,7 +5763,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5763 res.Add(new LSL_Types.LSLInteger(0)); 5763 res.Add(new LSL_Types.LSLInteger(0));
5764 break; 5764 break;
5765 5765
5766 case 23: // PRIM_POINT_LIGHT: 5766 case (int)BuiltIn_Commands_BaseClass.PRIM_POINT_LIGHT:
5767 shape = m_host.Shape; 5767 shape = m_host.Shape;
5768 5768
5769 if (shape.LightEntry) 5769 if (shape.LightEntry)
@@ -5778,7 +5778,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5778 res.Add(new LSL_Types.LSLFloat(shape.LightFalloff)); // falloff 5778 res.Add(new LSL_Types.LSLFloat(shape.LightFalloff)); // falloff
5779 break; 5779 break;
5780 5780
5781 case 24: // PRIM_GLOW 5781 case (int)BuiltIn_Commands_BaseClass.PRIM_GLOW:
5782 // TODO-------------- 5782 // TODO--------------
5783 if (remain < 1) 5783 if (remain < 1)
5784 return res; 5784 return res;