aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-10-24 18:19:48 +0200
committerMelanie2010-10-24 18:19:48 +0200
commit61137eac22b222720a24fa248f22b58c439c0560 (patch)
treed3cedf2f2d5d68f15db5fff98f94be90dfeb12bf
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-61137eac22b222720a24fa248f22b58c439c0560.zip
opensim-SC_OLD-61137eac22b222720a24fa248f22b58c439c0560.tar.gz
opensim-SC_OLD-61137eac22b222720a24fa248f22b58c439c0560.tar.bz2
opensim-SC_OLD-61137eac22b222720a24fa248f22b58c439c0560.tar.xz
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs27
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs3
2 files changed, 30 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 db124f7..1b11f2c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7691,6 +7691,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7691 part.SetText(primText, av3, Util.Clip((float)primTextAlpha, 0.0f, 1.0f)); 7691 part.SetText(primText, av3, Util.Clip((float)primTextAlpha, 0.0f, 1.0f));
7692 7692
7693 break; 7693 break;
7694 case (int)ScriptBaseClass.PRIM_NAME:
7695 if (remain < 1)
7696 return;
7697 string primName = rules.GetLSLStringItem(idx++);
7698 part.Name = primName;
7699 break;
7700 case (int)ScriptBaseClass.PRIM_DESC:
7701 if (remain < 1)
7702 return;
7703 string primDesc = rules.GetLSLStringItem(idx++);
7704 part.Description = primDesc;
7705 break;
7706 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
7707 if (remain < 1)
7708 return;
7709 LSL_Rotation lr = rules.GetQuaternionItem(idx++);
7710 SetRot(part, Rot2Quaternion(lr));
7711 break;
7694 } 7712 }
7695 } 7713 }
7696 } 7714 }
@@ -8373,6 +8391,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8373 textColor.B)); 8391 textColor.B));
8374 res.Add(new LSL_Float(textColor.A)); 8392 res.Add(new LSL_Float(textColor.A));
8375 break; 8393 break;
8394 case (int)ScriptBaseClass.PRIM_NAME:
8395 res.Add(part.Name);
8396 break;
8397 case (int)ScriptBaseClass.PRIM_DESC:
8398 res.Add(part.Description);
8399 break;
8400 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
8401 res.Add(new LSL_Rotation(part.RotationOffset.X, part.RotationOffset.Y, part.RotationOffset.Z, part.RotationOffset.W));
8402 break;
8376 } 8403 }
8377 } 8404 }
8378 return res; 8405 return res;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 6e8435d..0342283 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -317,6 +317,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
317 public const int PRIM_POINT_LIGHT = 23; // Huh? 317 public const int PRIM_POINT_LIGHT = 23; // Huh?
318 public const int PRIM_GLOW = 25; 318 public const int PRIM_GLOW = 25;
319 public const int PRIM_TEXT = 26; 319 public const int PRIM_TEXT = 26;
320 public const int PRIM_NAME = 27;
321 public const int PRIM_DESC = 28;
322 public const int PRIM_ROT_LOCAL = 29;
320 public const int PRIM_TEXGEN_DEFAULT = 0; 323 public const int PRIM_TEXGEN_DEFAULT = 0;
321 public const int PRIM_TEXGEN_PLANAR = 1; 324 public const int PRIM_TEXGEN_PLANAR = 1;
322 325