aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs46
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs11
2 files changed, 29 insertions, 28 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 3f48080..ecfac6f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7382,7 +7382,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7382 // retain pathcurve 7382 // retain pathcurve
7383 shapeBlock.PathCurve = part.Shape.PathCurve; 7383 shapeBlock.PathCurve = part.Shape.PathCurve;
7384 7384
7385 part.Shape.SetSculptData((byte)type, sculptId); 7385 part.Shape.SetSculptProperties((byte)type, sculptId);
7386 part.Shape.SculptEntry = true; 7386 part.Shape.SculptEntry = true;
7387 part.UpdateShape(shapeBlock); 7387 part.UpdateShape(shapeBlock);
7388 } 7388 }
@@ -7945,7 +7945,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7945 UUID[] anims; 7945 UUID[] anims;
7946 anims = av.Animator.GetAnimationArray(); 7946 anims = av.Animator.GetAnimationArray();
7947 foreach (UUID foo in anims) 7947 foreach (UUID foo in anims)
7948 l.Add(foo.ToString()); 7948 l.Add(new LSL_Key(foo.ToString()));
7949 return l; 7949 return l;
7950 } 7950 }
7951 7951
@@ -8551,17 +8551,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8551 break; 8551 break;
8552 case (int)ScriptBaseClass.PRIM_TEXT: 8552 case (int)ScriptBaseClass.PRIM_TEXT:
8553 Color4 textColor = part.GetTextColor(); 8553 Color4 textColor = part.GetTextColor();
8554 res.Add(part.Text); 8554 res.Add(new LSL_String(part.Text));
8555 res.Add(new LSL_Vector(textColor.R, 8555 res.Add(new LSL_Vector(textColor.R,
8556 textColor.G, 8556 textColor.G,
8557 textColor.B)); 8557 textColor.B));
8558 res.Add(new LSL_Float(textColor.A)); 8558 res.Add(new LSL_Float(textColor.A));
8559 break; 8559 break;
8560 case (int)ScriptBaseClass.PRIM_NAME: 8560 case (int)ScriptBaseClass.PRIM_NAME:
8561 res.Add(part.Name); 8561 res.Add(new LSL_String(part.Name));
8562 break; 8562 break;
8563 case (int)ScriptBaseClass.PRIM_DESC: 8563 case (int)ScriptBaseClass.PRIM_DESC:
8564 res.Add(part.Description); 8564 res.Add(new LSL_String(part.Description));
8565 break; 8565 break;
8566 case (int)ScriptBaseClass.PRIM_ROT_LOCAL: 8566 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
8567 res.Add(new LSL_Rotation(part.RotationOffset.X, part.RotationOffset.Y, part.RotationOffset.Z, part.RotationOffset.W)); 8567 res.Add(new LSL_Rotation(part.RotationOffset.X, part.RotationOffset.Y, part.RotationOffset.Z, part.RotationOffset.W));
@@ -10579,7 +10579,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10579 foreach (KeyValuePair<UUID, int> detectedParams in land.GetLandObjectOwners()) 10579 foreach (KeyValuePair<UUID, int> detectedParams in land.GetLandObjectOwners())
10580 { 10580 {
10581 ret.Add(new LSL_String(detectedParams.Key.ToString())); 10581 ret.Add(new LSL_String(detectedParams.Key.ToString()));
10582 ret.Add(detectedParams.Value); 10582 ret.Add(new LSL_Integer(detectedParams.Value));
10583 } 10583 }
10584 } 10584 }
10585 ScriptSleep(2000); 10585 ScriptSleep(2000);
@@ -10629,25 +10629,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10629 switch (o.ToString()) 10629 switch (o.ToString())
10630 { 10630 {
10631 case "0": 10631 case "0":
10632 ret = ret + new LSL_List(land.Name); 10632 ret.Add(new LSL_String(land.Name));
10633 break; 10633 break;
10634 case "1": 10634 case "1":
10635 ret = ret + new LSL_List(land.Description); 10635 ret.Add(new LSL_String(land.Description));
10636 break; 10636 break;
10637 case "2": 10637 case "2":
10638 ret = ret + new LSL_List(land.OwnerID.ToString()); 10638 ret.Add(new LSL_Key(land.OwnerID.ToString()));
10639 break; 10639 break;
10640 case "3": 10640 case "3":
10641 ret = ret + new LSL_List(land.GroupID.ToString()); 10641 ret.Add(new LSL_Key(land.GroupID.ToString()));
10642 break; 10642 break;
10643 case "4": 10643 case "4":
10644 ret = ret + new LSL_List(land.Area); 10644 ret.Add(new LSL_Integer(land.Area));
10645 break; 10645 break;
10646 case "5": 10646 case "5":
10647 ret = ret + new LSL_List(land.GlobalID); 10647 ret.Add(new LSL_Key(land.GlobalID.ToString()));
10648 break; 10648 break;
10649 default: 10649 default:
10650 ret = ret + new LSL_List(0); 10650 ret.Add(new LSL_Integer(0));
10651 break; 10651 break;
10652 } 10652 }
10653 } 10653 }
@@ -10679,10 +10679,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10679 switch (o.ToString()) 10679 switch (o.ToString())
10680 { 10680 {
10681 case "1": 10681 case "1":
10682 ret.Add(av.Firstname + " " + av.Lastname); 10682 ret.Add(new LSL_String(av.Firstname + " " + av.Lastname));
10683 break; 10683 break;
10684 case "2": 10684 case "2":
10685 ret.Add(""); 10685 ret.Add(new LSL_String(""));
10686 break; 10686 break;
10687 case "3": 10687 case "3":
10688 ret.Add(new LSL_Vector((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z)); 10688 ret.Add(new LSL_Vector((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z));
@@ -10694,13 +10694,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10694 ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z)); 10694 ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z));
10695 break; 10695 break;
10696 case "6": 10696 case "6":
10697 ret.Add(id); 10697 ret.Add(new LSL_String(id));
10698 break; 10698 break;
10699 case "7": 10699 case "7":
10700 ret.Add(UUID.Zero.ToString()); 10700 ret.Add(new LSL_String(UUID.Zero.ToString()));
10701 break; 10701 break;
10702 case "8": 10702 case "8":
10703 ret.Add(UUID.Zero.ToString()); 10703 ret.Add(new LSL_String(UUID.Zero.ToString()));
10704 break; 10704 break;
10705 } 10705 }
10706 } 10706 }
@@ -10714,10 +10714,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10714 switch (o.ToString()) 10714 switch (o.ToString())
10715 { 10715 {
10716 case "1": 10716 case "1":
10717 ret.Add(obj.Name); 10717 ret.Add(new LSL_String(obj.Name));
10718 break; 10718 break;
10719 case "2": 10719 case "2":
10720 ret.Add(obj.Description); 10720 ret.Add(new LSL_String(obj.Description));
10721 break; 10721 break;
10722 case "3": 10722 case "3":
10723 ret.Add(new LSL_Vector(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z)); 10723 ret.Add(new LSL_Vector(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z));
@@ -10729,13 +10729,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10729 ret.Add(new LSL_Vector(obj.Velocity.X, obj.Velocity.Y, obj.Velocity.Z)); 10729 ret.Add(new LSL_Vector(obj.Velocity.X, obj.Velocity.Y, obj.Velocity.Z));
10730 break; 10730 break;
10731 case "6": 10731 case "6":
10732 ret.Add(obj.OwnerID.ToString()); 10732 ret.Add(new LSL_String(obj.OwnerID.ToString()));
10733 break; 10733 break;
10734 case "7": 10734 case "7":
10735 ret.Add(obj.GroupID.ToString()); 10735 ret.Add(new LSL_String(obj.GroupID.ToString()));
10736 break; 10736 break;
10737 case "8": 10737 case "8":
10738 ret.Add(obj.CreatorID.ToString()); 10738 ret.Add(new LSL_String(obj.CreatorID.ToString()));
10739 break; 10739 break;
10740 } 10740 }
10741 } 10741 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 31222ff..6d2efce 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -820,7 +820,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
820 World.ForEachScenePresence(delegate(ScenePresence sp) 820 World.ForEachScenePresence(delegate(ScenePresence sp)
821 { 821 {
822 if (!sp.IsChildAgent) 822 if (!sp.IsChildAgent)
823 result.Add(sp.Name); 823 result.Add(new LSL_String(sp.Name));
824 }); 824 });
825 return result; 825 return result;
826 } 826 }
@@ -2043,8 +2043,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2043 { 2043 {
2044 if (g.Success) 2044 if (g.Success)
2045 { 2045 {
2046 result.Add(g.Value); 2046 result.Add(new LSL_String(g.Value));
2047 result.Add(g.Index); 2047 result.Add(new LSL_Integer(g.Index));
2048 } 2048 }
2049 } 2049 }
2050 } 2050 }
@@ -2378,8 +2378,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2378 { 2378 {
2379 if (avatar.IsChildAgent == false) 2379 if (avatar.IsChildAgent == false)
2380 { 2380 {
2381 result.Add(new LSL_Key(avatar.UUID.ToString())); 2381 result.Add(new LSL_String(avatar.UUID.ToString()));
2382 result.Add(new LSL_Vector(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z)); 2382 OpenMetaverse.Vector3 ap = avatar.AbsolutePosition;
2383 result.Add(new LSL_Vector(ap.X, ap.Y, ap.Z));
2383 result.Add(new LSL_String(avatar.Name)); 2384 result.Add(new LSL_String(avatar.Name));
2384 } 2385 }
2385 } 2386 }
generated by cgit v1.1 at 2024-11-17 01:06:04 +0000