aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTalun2015-04-30 21:39:11 +0100
committerMichael Cerquoni2015-05-04 13:18:52 -0400
commit382e05df143a2434a855d097c764fb7cbac16ceb (patch)
tree038ced9d1ae6633bbffe4b1855f362aebef162d3 /OpenSim/Region
parentImplement llGetGeometricCenter correctly. (diff)
downloadopensim-SC-382e05df143a2434a855d097c764fb7cbac16ceb.zip
opensim-SC-382e05df143a2434a855d097c764fb7cbac16ceb.tar.gz
opensim-SC-382e05df143a2434a855d097c764fb7cbac16ceb.tar.bz2
opensim-SC-382e05df143a2434a855d097c764fb7cbac16ceb.tar.xz
Missing constants for llGetObjectDetails
OBJECT_BODY_SHAPE_TYPE OBJECT_HOVER_HEIGHT OBJECT_LAST_OWNER_ID OBJECT_RENDER_WEIGHT Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs29
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs4
2 files changed, 33 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2fcfcbe..25f1958 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -13051,6 +13051,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13051 case ScriptBaseClass.OBJECT_TEMP_ON_REZ: 13051 case ScriptBaseClass.OBJECT_TEMP_ON_REZ:
13052 ret.Add(new LSL_Integer(0)); 13052 ret.Add(new LSL_Integer(0));
13053 break; 13053 break;
13054 case ScriptBaseClass.OBJECT_RENDER_WEIGHT:
13055 ret.Add(new LSL_Integer(-1));
13056 break;
13057 case ScriptBaseClass.OBJECT_HOVER_HEIGHT:
13058 ret.Add(new LSL_Float(0));
13059 break;
13060 case ScriptBaseClass.OBJECT_BODY_SHAPE_TYPE:
13061 LSL_Float shapeType;
13062 if (av.Appearance.VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MALE] != 0)
13063 shapeType = new LSL_Float(1);
13064 else
13065 shapeType = new LSL_Float(0);
13066 ret.Add(shapeType);
13067 break;
13068 case ScriptBaseClass.OBJECT_LAST_OWNER_ID:
13069 ret.Add(new LSL_Key(ScriptBaseClass.NULL_KEY));
13070 break;
13054 default: 13071 default:
13055 // Invalid or unhandled constant. 13072 // Invalid or unhandled constant.
13056 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); 13073 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL));
@@ -13215,6 +13232,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13215 case ScriptBaseClass.OBJECT_TEMP_ON_REZ: 13232 case ScriptBaseClass.OBJECT_TEMP_ON_REZ:
13216 ret.Add(new LSL_Integer(obj.ParentGroup.IsTemporary ? 1 : 0)); 13233 ret.Add(new LSL_Integer(obj.ParentGroup.IsTemporary ? 1 : 0));
13217 break; 13234 break;
13235 case ScriptBaseClass.OBJECT_RENDER_WEIGHT:
13236 ret.Add(new LSL_Integer(0));
13237 break;
13238 case ScriptBaseClass.OBJECT_HOVER_HEIGHT:
13239 ret.Add(new LSL_Float(0));
13240 break;
13241 case ScriptBaseClass.OBJECT_BODY_SHAPE_TYPE:
13242 ret.Add(new LSL_Float(-1));
13243 break;
13244 case ScriptBaseClass.OBJECT_LAST_OWNER_ID:
13245 ret.Add(new LSL_Key(obj.ParentGroup.LastOwnerID.ToString()));
13246 break;
13218 default: 13247 default:
13219 // Invalid or unhandled constant. 13248 // Invalid or unhandled constant.
13220 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); 13249 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL));
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index a96cd16..e37d3af 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -596,6 +596,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
596 public const int OBJECT_PHYSICS = 21; 596 public const int OBJECT_PHYSICS = 21;
597 public const int OBJECT_PHANTOM = 22; 597 public const int OBJECT_PHANTOM = 22;
598 public const int OBJECT_TEMP_ON_REZ = 23; 598 public const int OBJECT_TEMP_ON_REZ = 23;
599 public const int OBJECT_RENDER_WEIGHT = 24;
600 public const int OBJECT_HOVER_HEIGHT = 25;
601 public const int OBJECT_BODY_SHAPE_TYPE = 26;
602 public const int OBJECT_LAST_OWNER_ID = 27;
599 603
600 // Pathfinding types 604 // Pathfinding types
601 public const int OPT_OTHER = -1; 605 public const int OPT_OTHER = -1;