aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs117
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3518
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs157
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs46
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs71
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs60
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Helpers.cs45
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs175
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs39
20 files changed, 3057 insertions, 1315 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 998f40b..1e19032 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -28,9 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using System.Threading; 31using System.Threading;
33using log4net;
34using OpenMetaverse; 32using OpenMetaverse;
35using OpenSim.Framework; 33using OpenSim.Framework;
36using OpenSim.Framework.Monitoring; 34using OpenSim.Framework.Monitoring;
@@ -39,6 +37,8 @@ using OpenSim.Region.ScriptEngine.Interfaces;
39using OpenSim.Region.ScriptEngine.Shared; 37using OpenSim.Region.ScriptEngine.Shared;
40using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 38using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
41using Timer=OpenSim.Region.ScriptEngine.Shared.Api.Plugins.Timer; 39using Timer=OpenSim.Region.ScriptEngine.Shared.Api.Plugins.Timer;
40using System.Reflection;
41using log4net;
42 42
43namespace OpenSim.Region.ScriptEngine.Shared.Api 43namespace OpenSim.Region.ScriptEngine.Shared.Api
44{ 44{
@@ -269,6 +269,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
269 /// <param name="itemID"></param> 269 /// <param name="itemID"></param>
270 public static void RemoveScript(IScriptEngine engine, uint localID, UUID itemID) 270 public static void RemoveScript(IScriptEngine engine, uint localID, UUID itemID)
271 { 271 {
272 // Remove a specific script
272// m_log.DebugFormat("[ASYNC COMMAND MANAGER]: Removing facilities for script {0}", itemID); 273// m_log.DebugFormat("[ASYNC COMMAND MANAGER]: Removing facilities for script {0}", itemID);
273 274
274 lock (staticLock) 275 lock (staticLock)
@@ -282,7 +283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
282 // Remove from: HttpRequest 283 // Remove from: HttpRequest
283 IHttpRequestModule iHttpReq = engine.World.RequestModuleInterface<IHttpRequestModule>(); 284 IHttpRequestModule iHttpReq = engine.World.RequestModuleInterface<IHttpRequestModule>();
284 if (iHttpReq != null) 285 if (iHttpReq != null)
285 iHttpReq.StopHttpRequestsForScript(itemID); 286 iHttpReq.StopHttpRequest(localID, itemID);
286 287
287 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>(); 288 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
288 if (comms != null) 289 if (comms != null)
@@ -364,6 +365,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
364 } 365 }
365 } 366 }
366 367
368 public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
369 {
370 // Remove a specific script
371
372 // Remove dataserver events
373 m_Dataserver[engine].RemoveEvents(localID, itemID);
374
375 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
376 if (comms != null)
377 comms.DeleteListener(itemID);
378
379 IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
380 if (xmlrpc != null)
381 {
382 xmlrpc.DeleteChannels(itemID);
383 xmlrpc.CancelSRDRequests(itemID);
384 }
385
386 // Remove Sensors
387 m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
388
389 }
390
367 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) 391 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
368 { 392 {
369 List<Object> data = new List<Object>(); 393 List<Object> data = new List<Object>();
@@ -439,4 +463,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
439 } 463 }
440 } 464 }
441 } 465 }
442} \ No newline at end of file 466}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
new file mode 100644
index 0000000..fce8ff8
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -0,0 +1,117 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Threading;
30using System.Reflection;
31using System.Collections;
32using System.Collections.Generic;
33using System.Runtime.Remoting.Lifetime;
34using OpenMetaverse;
35using Nini.Config;
36using OpenSim;
37using OpenSim.Framework;
38using OpenSim.Region.CoreModules.World.LightShare;
39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.ScriptEngine.Shared;
42using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
43using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
44using OpenSim.Region.ScriptEngine.Interfaces;
45using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
46using OpenSim.Services.Interfaces;
47
48using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
49using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
50using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
51using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
52using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
53using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
54using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
55
56namespace OpenSim.Region.ScriptEngine.Shared.Api
57{
58 [Serializable]
59 public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi
60 {
61 internal IScriptEngine m_ScriptEngine;
62 internal SceneObjectPart m_host;
63 internal TaskInventoryItem m_item;
64 internal bool m_CMFunctionsEnabled = false;
65
66 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
67 {
68 m_ScriptEngine = ScriptEngine;
69 m_host = host;
70 m_item = item;
71
72 if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
73 m_CMFunctionsEnabled = true;
74 }
75
76 public override Object InitializeLifetimeService()
77 {
78 ILease lease = (ILease)base.InitializeLifetimeService();
79
80 if (lease.CurrentState == LeaseState.Initial)
81 {
82 lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
83 // lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
84 // lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
85 }
86 return lease;
87 }
88
89 public Scene World
90 {
91 get { return m_ScriptEngine.World; }
92 }
93
94 public string cmDetectedCountry(int number)
95 {
96 m_host.AddScriptLPS(1);
97 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
98 if (detectedParams == null)
99 return String.Empty;
100 return detectedParams.Country;
101 }
102
103 public string cmGetAgentCountry(LSL_Key key)
104 {
105 if (!World.Permissions.IsGod(m_host.OwnerID))
106 return String.Empty;
107
108 UUID uuid;
109
110 if (!UUID.TryParse(key, out uuid))
111 return String.Empty;
112
113 UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
114 return account.UserCountry;
115 }
116 }
117}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e6ff75f..5cc66b9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -24,14 +24,16 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Diagnostics; //for [DebuggerNonUserCode]
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
34using System.Text.RegularExpressions; 35using System.Text.RegularExpressions;
36using System.Timers;
35using Nini.Config; 37using Nini.Config;
36using log4net; 38using log4net;
37using OpenMetaverse; 39using OpenMetaverse;
@@ -44,6 +46,7 @@ using OpenSim.Region.CoreModules.World.Land;
44using OpenSim.Region.CoreModules.World.Terrain; 46using OpenSim.Region.CoreModules.World.Terrain;
45using OpenSim.Region.Framework.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.Region.Framework.Scenes.Serialization;
47using OpenSim.Region.Framework.Scenes.Animation; 50using OpenSim.Region.Framework.Scenes.Animation;
48using OpenSim.Region.Framework.Scenes.Scripting; 51using OpenSim.Region.Framework.Scenes.Scripting;
49using OpenSim.Region.Physics.Manager; 52using OpenSim.Region.Physics.Manager;
@@ -67,6 +70,7 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
67using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; 70using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
68using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; 71using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
69using System.Reflection; 72using System.Reflection;
73using Timer = System.Timers.Timer;
70using System.Linq; 74using System.Linq;
71using PermissionMask = OpenSim.Framework.PermissionMask; 75using PermissionMask = OpenSim.Framework.PermissionMask;
72 76
@@ -115,11 +119,38 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
115 protected int m_notecardLineReadCharsMax = 255; 119 protected int m_notecardLineReadCharsMax = 255;
116 protected int m_scriptConsoleChannel = 0; 120 protected int m_scriptConsoleChannel = 0;
117 protected bool m_scriptConsoleChannelEnabled = false; 121 protected bool m_scriptConsoleChannelEnabled = false;
122 protected bool m_debuggerSafe = false;
118 protected IUrlModule m_UrlModule = null; 123 protected IUrlModule m_UrlModule = null;
119 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>(); 124 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
120 protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp. 125 new Dictionary<UUID, UserInfoCacheEntry>();
126 protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp.
121 protected ISoundModule m_SoundModule = null; 127 protected ISoundModule m_SoundModule = null;
122 128
129// protected Timer m_ShoutSayTimer;
130 protected int m_SayShoutCount = 0;
131 DateTime m_lastSayShoutCheck;
132
133 private Dictionary<string, string> MovementAnimationsForLSL =
134 new Dictionary<string, string> {
135 {"FLY", "Flying"},
136 {"FLYSLOW", "FlyingSlow"},
137 {"HOVER_UP", "Hovering Up"},
138 {"HOVER_DOWN", "Hovering Down"},
139 {"HOVER", "Hovering"},
140 {"LAND", "Landing"},
141 {"FALLDOWN", "Falling Down"},
142 {"PREJUMP", "PreJumping"},
143 {"JUMP", "Jumping"},
144 {"STANDUP", "Standing Up"},
145 {"SOFT_LAND", "Soft Landing"},
146 {"STAND", "Standing"},
147 {"CROUCHWALK", "CrouchWalking"},
148 {"RUN", "Running"},
149 {"WALK", "Walking"},
150 {"CROUCH", "Crouching"},
151 {"TURNLEFT", "Turning Left"},
152 {"TURNRIGHT", "Turning Right"}
153 };
123 //An array of HTTP/1.1 headers that are not allowed to be used 154 //An array of HTTP/1.1 headers that are not allowed to be used
124 //as custom headers by llHTTPRequest. 155 //as custom headers by llHTTPRequest.
125 private string[] HttpStandardHeaders = 156 private string[] HttpStandardHeaders =
@@ -140,9 +171,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
140 public void Initialize( 171 public void Initialize(
141 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle) 172 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
142 { 173 {
174 m_lastSayShoutCheck = DateTime.UtcNow;
175
143 m_ScriptEngine = scriptEngine; 176 m_ScriptEngine = scriptEngine;
144 m_host = host; 177 m_host = host;
145 m_item = item; 178 m_item = item;
179 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
146 m_coopSleepHandle = coopSleepHandle; 180 m_coopSleepHandle = coopSleepHandle;
147 181
148 LoadConfig(); 182 LoadConfig();
@@ -231,6 +265,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
231 get { return m_ScriptEngine.World; } 265 get { return m_ScriptEngine.World; }
232 } 266 }
233 267
268 [DebuggerNonUserCode]
234 public void state(string newState) 269 public void state(string newState)
235 { 270 {
236 m_ScriptEngine.SetState(m_item.ItemID, newState); 271 m_ScriptEngine.SetState(m_item.ItemID, newState);
@@ -240,6 +275,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
240 /// Reset the named script. The script must be present 275 /// Reset the named script. The script must be present
241 /// in the same prim. 276 /// in the same prim.
242 /// </summary> 277 /// </summary>
278 [DebuggerNonUserCode]
243 public void llResetScript() 279 public void llResetScript()
244 { 280 {
245 m_host.AddScriptLPS(1); 281 m_host.AddScriptLPS(1);
@@ -302,6 +338,57 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
302 } 338 }
303 } 339 }
304 340
341 public List<ScenePresence> GetLinkAvatars(int linkType)
342 {
343 List<ScenePresence> ret = new List<ScenePresence>();
344 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
345 return ret;
346
347 List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars();
348
349 switch (linkType)
350 {
351 case ScriptBaseClass.LINK_SET:
352 return avs;
353
354 case ScriptBaseClass.LINK_ROOT:
355 return ret;
356
357 case ScriptBaseClass.LINK_ALL_OTHERS:
358 return avs;
359
360 case ScriptBaseClass.LINK_ALL_CHILDREN:
361 return avs;
362
363 case ScriptBaseClass.LINK_THIS:
364 return ret;
365
366 default:
367 if (linkType < 0)
368 return ret;
369
370 int partCount = m_host.ParentGroup.GetPartCount();
371
372 if (linkType <= partCount)
373 {
374 return ret;
375 }
376 else
377 {
378 linkType = linkType - partCount;
379 if (linkType > avs.Count)
380 {
381 return ret;
382 }
383 else
384 {
385 ret.Add(avs[linkType-1]);
386 return ret;
387 }
388 }
389 }
390 }
391
305 /// <summary> 392 /// <summary>
306 /// Get a given link entity from a linkset (linked objects and any sitting avatars). 393 /// Get a given link entity from a linkset (linked objects and any sitting avatars).
307 /// </summary> 394 /// </summary>
@@ -384,6 +471,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
384 public static List<SceneObjectPart> GetLinkParts(SceneObjectPart part, int linkType) 471 public static List<SceneObjectPart> GetLinkParts(SceneObjectPart part, int linkType)
385 { 472 {
386 List<SceneObjectPart> ret = new List<SceneObjectPart>(); 473 List<SceneObjectPart> ret = new List<SceneObjectPart>();
474 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
475 return ret;
387 ret.Add(part); 476 ret.Add(part);
388 477
389 switch (linkType) 478 switch (linkType)
@@ -537,31 +626,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
537 626
538 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke 627 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
539 628
540 /// <summary> 629 // Utility function for llRot2Euler
541 /// Convert an LSL rotation to a Euler vector. 630
542 /// </summary> 631 // normalize an angle between -PI and PI (-180 to +180 degrees)
543 /// <remarks> 632 protected double NormalizeAngle(double angle)
544 /// Using algorithm based off http://www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToEuler/quat_2_euler_paper_ver2-1.pdf
545 /// to avoid issues with singularity and rounding with Y rotation of +/- PI/2
546 /// </remarks>
547 /// <param name="r"></param>
548 /// <returns></returns>
549 public LSL_Vector llRot2Euler(LSL_Rotation r)
550 { 633 {
551 m_host.AddScriptLPS(1); 634 if (angle > -Math.PI && angle < Math.PI)
635 return angle;
552 636
553 LSL_Vector v = new LSL_Vector(0.0, 0.0, 1.0) * r; // Z axis unit vector unaffected by Z rotation component of r. 637 int numPis = (int)(Math.PI / angle);
554 double m = LSL_Vector.Mag(v); // Just in case v isn't normalized, need magnitude for Asin() operation later. 638 double remainder = angle - Math.PI * numPis;
555 if (m == 0.0) return new LSL_Vector(); 639 if (numPis % 2 == 1)
556 double x = Math.Atan2(-v.y, v.z); 640 return Math.PI - angle;
557 double sin = v.x / m; 641 return remainder;
558 if (sin < -0.999999 || sin > 0.999999) x = 0.0; // Force X rotation to 0 at the singularities. 642 }
559 double y = Math.Asin(sin);
560 // Rotate X axis unit vector by r and unwind the X and Y rotations leaving only the Z rotation
561 v = new LSL_Vector(1.0, 0.0, 0.0) * ((r * new LSL_Rotation(Math.Sin(-x / 2.0), 0.0, 0.0, Math.Cos(-x / 2.0))) * new LSL_Rotation(0.0, Math.Sin(-y / 2.0), 0.0, Math.Cos(-y / 2.0)));
562 double z = Math.Atan2(v.y, v.x);
563 643
564 return new LSL_Vector(x, y, z); 644 public LSL_Vector llRot2Euler(LSL_Rotation q1)
645 {
646 m_host.AddScriptLPS(1);
647 LSL_Vector eul = new LSL_Vector();
648
649 double sqw = q1.s*q1.s;
650 double sqx = q1.x*q1.x;
651 double sqy = q1.z*q1.z;
652 double sqz = q1.y*q1.y;
653 double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
654 double test = q1.x*q1.z + q1.y*q1.s;
655 if (test > 0.4999*unit) { // singularity at north pole
656 eul.z = 2 * Math.Atan2(q1.x,q1.s);
657 eul.y = Math.PI/2;
658 eul.x = 0;
659 return eul;
660 }
661 if (test < -0.4999*unit) { // singularity at south pole
662 eul.z = -2 * Math.Atan2(q1.x,q1.s);
663 eul.y = -Math.PI/2;
664 eul.x = 0;
665 return eul;
666 }
667 eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw);
668 eul.y = Math.Asin(2*test/unit);
669 eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw);
670 return eul;
565 } 671 }
566 672
567 /* From wiki: 673 /* From wiki:
@@ -614,18 +720,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
614 m_host.AddScriptLPS(1); 720 m_host.AddScriptLPS(1);
615 721
616 double x,y,z,s; 722 double x,y,z,s;
617 723 v.x *= 0.5;
618 double c1 = Math.Cos(v.x * 0.5); 724 v.y *= 0.5;
619 double c2 = Math.Cos(v.y * 0.5); 725 v.z *= 0.5;
620 double c3 = Math.Cos(v.z * 0.5); 726 double c1 = Math.Cos(v.x);
621 double s1 = Math.Sin(v.x * 0.5); 727 double c2 = Math.Cos(v.y);
622 double s2 = Math.Sin(v.y * 0.5); 728 double c1c2 = c1 * c2;
623 double s3 = Math.Sin(v.z * 0.5); 729 double s1 = Math.Sin(v.x);
624 730 double s2 = Math.Sin(v.y);
625 x = s1 * c2 * c3 + c1 * s2 * s3; 731 double s1s2 = s1 * s2;
626 y = c1 * s2 * c3 - s1 * c2 * s3; 732 double c1s2 = c1 * s2;
627 z = s1 * s2 * c3 + c1 * c2 * s3; 733 double s1c2 = s1 * c2;
628 s = c1 * c2 * c3 - s1 * s2 * s3; 734 double c3 = Math.Cos(v.z);
735 double s3 = Math.Sin(v.z);
736
737 x = s1c2 * c3 + c1s2 * s3;
738 y = c1s2 * c3 - s1c2 * s3;
739 z = s1s2 * c3 + c1c2 * s3;
740 s = c1c2 * c3 - s1s2 * s3;
629 741
630 return new LSL_Rotation(x, y, z, s); 742 return new LSL_Rotation(x, y, z, s);
631 } 743 }
@@ -763,77 +875,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
763 { 875 {
764 //A and B should both be normalized 876 //A and B should both be normalized
765 m_host.AddScriptLPS(1); 877 m_host.AddScriptLPS(1);
766 LSL_Rotation rotBetween; 878 /* This method is more accurate than the SL one, and thus causes problems
767 // Check for zero vectors. If either is zero, return zero rotation. Otherwise, 879 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
768 // continue calculation. 880
769 if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f)) 881 double dotProduct = LSL_Vector.Dot(a, b);
770 { 882 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
771 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 883 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
772 } 884 double angle = Math.Acos(dotProduct / magProduct);
773 else 885 LSL_Vector axis = LSL_Vector.Norm(crossProduct);
774 { 886 double s = Math.Sin(angle / 2);
775 a = LSL_Vector.Norm(a); 887
776 b = LSL_Vector.Norm(b); 888 double x = axis.x * s;
777 double dotProduct = LSL_Vector.Dot(a, b); 889 double y = axis.y * s;
778 // There are two degenerate cases possible. These are for vectors 180 or 890 double z = axis.z * s;
779 // 0 degrees apart. These have to be detected and handled individually. 891 double w = Math.Cos(angle / 2);
780 // 892
781 // Check for vectors 180 degrees apart. 893 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
782 // A dot product of -1 would mean the angle between vectors is 180 degrees. 894 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
783 if (dotProduct < -0.9999999f) 895
784 { 896 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
785 // First assume X axis is orthogonal to the vectors. 897 */
786 LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f); 898
787 orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a)); 899 // This method mimics the 180 errors found in SL
788 // Check for near zero vector. A very small non-zero number here will create 900 // See www.euclideanspace.com... angleBetween
789 // a rotation in an undesired direction. 901 LSL_Vector vec_a = a;
790 if (LSL_Vector.Mag(orthoVector) > 0.0001) 902 LSL_Vector vec_b = b;
791 { 903
792 rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f); 904 // Eliminate zero length
793 } 905 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
794 // If the magnitude of the vector was near zero, then assume the X axis is not 906 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
795 // orthogonal and use the Z axis instead. 907 if (vec_a_mag < 0.00001 ||
796 else 908 vec_b_mag < 0.00001)
797 { 909 {
798 // Set 180 z rotation. 910 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
799 rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f); 911 }
800 } 912
801 } 913 // Normalize
802 // Check for parallel vectors. 914 vec_a = llVecNorm(vec_a);
803 // A dot product of 1 would mean the angle between vectors is 0 degrees. 915 vec_b = llVecNorm(vec_b);
804 else if (dotProduct > 0.9999999f) 916
805 { 917 // Calculate axis and rotation angle
806 // Set zero rotation. 918 LSL_Vector axis = vec_a % vec_b;
807 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 919 LSL_Float cos_theta = vec_a * vec_b;
808 } 920
809 else 921 // Check if parallel
810 { 922 if (cos_theta > 0.99999)
811 // All special checks have been performed so get the axis of rotation. 923 {
812 LSL_Vector crossProduct = LSL_Vector.Cross(a, b); 924 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
813 // Quarternion s value is the length of the unit vector + dot product. 925 }
814 double qs = 1.0 + dotProduct; 926
815 rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs); 927 // Check if anti-parallel
816 // Normalize the rotation. 928 else if (cos_theta < -0.99999)
817 double mag = LSL_Rotation.Mag(rotBetween); 929 {
818 // We shouldn't have to worry about a divide by zero here. The qs value will be 930 LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
819 // non-zero because we already know if we're here, then the dotProduct is not -1 so 931 if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
820 // qs will not be zero. Also, we've already handled the input vectors being zero so the 932 return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
821 // crossProduct vector should also not be zero. 933 }
822 rotBetween.x = rotBetween.x / mag; 934 else // other rotation
823 rotBetween.y = rotBetween.y / mag; 935 {
824 rotBetween.z = rotBetween.z / mag; 936 LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
825 rotBetween.s = rotBetween.s / mag; 937 axis = llVecNorm(axis);
826 // Check for undefined values and set zero rotation if any found. This code might not actually be required 938 double x, y, z, s, t;
827 // any longer since zero vectors are checked for at the top. 939 s = Math.Cos(theta);
828 if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s)) 940 t = Math.Sin(theta);
829 { 941 x = axis.x * t;
830 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 942 y = axis.y * t;
831 } 943 z = axis.z * t;
832 } 944 return new LSL_Rotation(x,y,z,s);
833 } 945 }
834 return rotBetween; 946 }
835 } 947
836
837 public void llWhisper(int channelID, string text) 948 public void llWhisper(int channelID, string text)
838 { 949 {
839 m_host.AddScriptLPS(1); 950 m_host.AddScriptLPS(1);
@@ -849,10 +960,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
849 wComm.DeliverMessage(ChatTypeEnum.Whisper, channelID, m_host.Name, m_host.UUID, text); 960 wComm.DeliverMessage(ChatTypeEnum.Whisper, channelID, m_host.Name, m_host.UUID, text);
850 } 961 }
851 962
963 private void CheckSayShoutTime()
964 {
965 DateTime now = DateTime.UtcNow;
966 if ((now - m_lastSayShoutCheck).Ticks > 10000000) // 1sec
967 {
968 m_lastSayShoutCheck = now;
969 m_SayShoutCount = 0;
970 }
971 else
972 m_SayShoutCount++;
973 }
974
852 public void llSay(int channelID, string text) 975 public void llSay(int channelID, string text)
853 { 976 {
854 m_host.AddScriptLPS(1); 977 m_host.AddScriptLPS(1);
855 978
979 if (channelID == 0)
980// m_SayShoutCount++;
981 CheckSayShoutTime();
982
983 if (m_SayShoutCount >= 11)
984 ScriptSleep(2000);
985
856 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel)) 986 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel))
857 { 987 {
858 Console.WriteLine(text); 988 Console.WriteLine(text);
@@ -875,6 +1005,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
875 { 1005 {
876 m_host.AddScriptLPS(1); 1006 m_host.AddScriptLPS(1);
877 1007
1008 if (channelID == 0)
1009// m_SayShoutCount++;
1010 CheckSayShoutTime();
1011
1012 if (m_SayShoutCount >= 11)
1013 ScriptSleep(2000);
1014
878 if (text.Length > 1023) 1015 if (text.Length > 1023)
879 text = text.Substring(0, 1023); 1016 text = text.Substring(0, 1023);
880 1017
@@ -906,22 +1043,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
906 1043
907 public void llRegionSayTo(string target, int channel, string msg) 1044 public void llRegionSayTo(string target, int channel, string msg)
908 { 1045 {
1046 string error = String.Empty;
1047
909 if (msg.Length > 1023) 1048 if (msg.Length > 1023)
910 msg = msg.Substring(0, 1023); 1049 msg = msg.Substring(0, 1023);
911 1050
912 m_host.AddScriptLPS(1); 1051 m_host.AddScriptLPS(1);
913 1052
914 if (channel == ScriptBaseClass.DEBUG_CHANNEL)
915 {
916 return;
917 }
918
919 UUID TargetID; 1053 UUID TargetID;
920 UUID.TryParse(target, out TargetID); 1054 UUID.TryParse(target, out TargetID);
921 1055
922 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 1056 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
923 if (wComm != null) 1057 if (wComm != null)
924 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg); 1058 if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error))
1059 LSLError(error);
925 } 1060 }
926 1061
927 public LSL_Integer llListen(int channelID, string name, string ID, string msg) 1062 public LSL_Integer llListen(int channelID, string name, string ID, string msg)
@@ -1177,10 +1312,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1177 return detectedParams.TouchUV; 1312 return detectedParams.TouchUV;
1178 } 1313 }
1179 1314
1315 [DebuggerNonUserCode]
1180 public virtual void llDie() 1316 public virtual void llDie()
1181 { 1317 {
1182 m_host.AddScriptLPS(1); 1318 m_host.AddScriptLPS(1);
1183 throw new SelfDeleteException(); 1319 if (!m_host.ParentGroup.IsAttachment) throw new SelfDeleteException();
1184 } 1320 }
1185 1321
1186 public LSL_Float llGround(LSL_Vector offset) 1322 public LSL_Float llGround(LSL_Vector offset)
@@ -1251,6 +1387,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1251 1387
1252 public void llSetStatus(int status, int value) 1388 public void llSetStatus(int status, int value)
1253 { 1389 {
1390 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
1391 return;
1254 m_host.AddScriptLPS(1); 1392 m_host.AddScriptLPS(1);
1255 1393
1256 int statusrotationaxis = 0; 1394 int statusrotationaxis = 0;
@@ -1274,6 +1412,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1274 if (!allow) 1412 if (!allow)
1275 return; 1413 return;
1276 1414
1415 if (m_host.ParentGroup.RootPart.PhysActor != null &&
1416 m_host.ParentGroup.RootPart.PhysActor.IsPhysical)
1417 return;
1418
1277 m_host.ScriptSetPhysicsStatus(true); 1419 m_host.ScriptSetPhysicsStatus(true);
1278 } 1420 }
1279 else 1421 else
@@ -1474,12 +1616,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1474 { 1616 {
1475 m_host.AddScriptLPS(1); 1617 m_host.AddScriptLPS(1);
1476 1618
1619 SetColor(m_host, color, face);
1620 }
1621
1622 protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
1623 {
1624 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1625 return;
1626
1627 Primitive.TextureEntry tex = part.Shape.Textures;
1628 Color4 texcolor;
1629 if (face >= 0 && face < GetNumberOfSides(part))
1630 {
1631 texcolor = tex.CreateFace((uint)face).RGBA;
1632 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1633 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1634 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1635 tex.FaceTextures[face].RGBA = texcolor;
1636 part.UpdateTextureEntry(tex.GetBytes());
1637 return;
1638 }
1639 else if (face == ScriptBaseClass.ALL_SIDES)
1640 {
1641 for (uint i = 0; i < GetNumberOfSides(part); i++)
1642 {
1643 if (tex.FaceTextures[i] != null)
1644 {
1645 texcolor = tex.FaceTextures[i].RGBA;
1646 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1647 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1648 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1649 tex.FaceTextures[i].RGBA = texcolor;
1650 }
1651 texcolor = tex.DefaultTexture.RGBA;
1652 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1653 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1654 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1655 tex.DefaultTexture.RGBA = texcolor;
1656 }
1657 part.UpdateTextureEntry(tex.GetBytes());
1658 return;
1659 }
1660
1477 if (face == ScriptBaseClass.ALL_SIDES) 1661 if (face == ScriptBaseClass.ALL_SIDES)
1478 face = SceneObjectPart.ALL_SIDES; 1662 face = SceneObjectPart.ALL_SIDES;
1479 1663
1480 m_host.SetFaceColorAlpha(face, color, null); 1664 m_host.SetFaceColorAlpha(face, color, null);
1481 } 1665 }
1482 1666
1667 /*
1483 public void llSetContentType(LSL_Key id, LSL_Integer type) 1668 public void llSetContentType(LSL_Key id, LSL_Integer type)
1484 { 1669 {
1485 m_host.AddScriptLPS(1); 1670 m_host.AddScriptLPS(1);
@@ -1546,9 +1731,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1546 break; 1731 break;
1547 } 1732 }
1548 } 1733 }
1734 */
1549 1735
1550 public void SetTexGen(SceneObjectPart part, int face,int style) 1736 public void SetTexGen(SceneObjectPart part, int face,int style)
1551 { 1737 {
1738 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1739 return;
1740
1552 Primitive.TextureEntry tex = part.Shape.Textures; 1741 Primitive.TextureEntry tex = part.Shape.Textures;
1553 MappingType textype; 1742 MappingType textype;
1554 textype = MappingType.Default; 1743 textype = MappingType.Default;
@@ -1579,6 +1768,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1579 1768
1580 public void SetGlow(SceneObjectPart part, int face, float glow) 1769 public void SetGlow(SceneObjectPart part, int face, float glow)
1581 { 1770 {
1771 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1772 return;
1773
1582 Primitive.TextureEntry tex = part.Shape.Textures; 1774 Primitive.TextureEntry tex = part.Shape.Textures;
1583 if (face >= 0 && face < GetNumberOfSides(part)) 1775 if (face >= 0 && face < GetNumberOfSides(part))
1584 { 1776 {
@@ -1604,6 +1796,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1604 1796
1605 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1797 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1606 { 1798 {
1799 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1800 return;
1607 1801
1608 Shininess sval = new Shininess(); 1802 Shininess sval = new Shininess();
1609 1803
@@ -1654,6 +1848,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1654 1848
1655 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1849 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1656 { 1850 {
1851 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1852 return;
1853
1657 Primitive.TextureEntry tex = part.Shape.Textures; 1854 Primitive.TextureEntry tex = part.Shape.Textures;
1658 if (face >= 0 && face < GetNumberOfSides(part)) 1855 if (face >= 0 && face < GetNumberOfSides(part))
1659 { 1856 {
@@ -1714,13 +1911,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1714 m_host.AddScriptLPS(1); 1911 m_host.AddScriptLPS(1);
1715 1912
1716 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1913 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1717 1914 if (parts.Count > 0)
1718 foreach (SceneObjectPart part in parts) 1915 {
1719 SetAlpha(part, alpha, face); 1916 try
1917 {
1918 foreach (SceneObjectPart part in parts)
1919 SetAlpha(part, alpha, face);
1920 }
1921 finally
1922 {
1923 }
1924 }
1720 } 1925 }
1721 1926
1722 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1927 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1723 { 1928 {
1929 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1930 return;
1931
1724 Primitive.TextureEntry tex = part.Shape.Textures; 1932 Primitive.TextureEntry tex = part.Shape.Textures;
1725 Color4 texcolor; 1933 Color4 texcolor;
1726 if (face >= 0 && face < GetNumberOfSides(part)) 1934 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1773,7 +1981,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1773 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1981 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1774 float wind, float tension, LSL_Vector Force) 1982 float wind, float tension, LSL_Vector Force)
1775 { 1983 {
1776 if (part == null) 1984 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1777 return; 1985 return;
1778 1986
1779 if (flexi) 1987 if (flexi)
@@ -1814,7 +2022,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1814 /// <param name="falloff"></param> 2022 /// <param name="falloff"></param>
1815 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 2023 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1816 { 2024 {
1817 if (part == null) 2025 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1818 return; 2026 return;
1819 2027
1820 if (light) 2028 if (light)
@@ -1847,11 +2055,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1847 Primitive.TextureEntry tex = part.Shape.Textures; 2055 Primitive.TextureEntry tex = part.Shape.Textures;
1848 Color4 texcolor; 2056 Color4 texcolor;
1849 LSL_Vector rgb = new LSL_Vector(); 2057 LSL_Vector rgb = new LSL_Vector();
2058 int nsides = GetNumberOfSides(part);
2059
1850 if (face == ScriptBaseClass.ALL_SIDES) 2060 if (face == ScriptBaseClass.ALL_SIDES)
1851 { 2061 {
1852 int i; 2062 int i;
1853 2063 for (i = 0; i < nsides; i++)
1854 for (i = 0 ; i < GetNumberOfSides(part); i++)
1855 { 2064 {
1856 texcolor = tex.GetFace((uint)i).RGBA; 2065 texcolor = tex.GetFace((uint)i).RGBA;
1857 rgb.x += texcolor.R; 2066 rgb.x += texcolor.R;
@@ -1859,14 +2068,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1859 rgb.z += texcolor.B; 2068 rgb.z += texcolor.B;
1860 } 2069 }
1861 2070
1862 rgb.x /= (float)GetNumberOfSides(part); 2071 float invnsides = 1.0f / (float)nsides;
1863 rgb.y /= (float)GetNumberOfSides(part); 2072
1864 rgb.z /= (float)GetNumberOfSides(part); 2073 rgb.x *= invnsides;
2074 rgb.y *= invnsides;
2075 rgb.z *= invnsides;
1865 2076
1866 return rgb; 2077 return rgb;
1867 } 2078 }
1868 2079 if (face >= 0 && face < nsides)
1869 if (face >= 0 && face < GetNumberOfSides(part))
1870 { 2080 {
1871 texcolor = tex.GetFace((uint)face).RGBA; 2081 texcolor = tex.GetFace((uint)face).RGBA;
1872 rgb.x = texcolor.R; 2082 rgb.x = texcolor.R;
@@ -1893,15 +2103,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1893 m_host.AddScriptLPS(1); 2103 m_host.AddScriptLPS(1);
1894 2104
1895 List<SceneObjectPart> parts = GetLinkParts(linknumber); 2105 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1896 2106 if (parts.Count > 0)
1897 foreach (SceneObjectPart part in parts) 2107 {
1898 SetTexture(part, texture, face); 2108 try
1899 2109 {
2110 foreach (SceneObjectPart part in parts)
2111 SetTexture(part, texture, face);
2112 }
2113 finally
2114 {
2115 }
2116 }
1900 ScriptSleep(200); 2117 ScriptSleep(200);
1901 } 2118 }
1902 2119
1903 protected void SetTexture(SceneObjectPart part, string texture, int face) 2120 protected void SetTexture(SceneObjectPart part, string texture, int face)
1904 { 2121 {
2122 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2123 return;
2124
1905 UUID textureID = new UUID(); 2125 UUID textureID = new UUID();
1906 2126
1907 textureID = ScriptUtils.GetAssetIdFromItemName(m_host, texture, (int)AssetType.Texture); 2127 textureID = ScriptUtils.GetAssetIdFromItemName(m_host, texture, (int)AssetType.Texture);
@@ -1946,6 +2166,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1946 2166
1947 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 2167 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1948 { 2168 {
2169 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2170 return;
2171
1949 Primitive.TextureEntry tex = part.Shape.Textures; 2172 Primitive.TextureEntry tex = part.Shape.Textures;
1950 if (face >= 0 && face < GetNumberOfSides(part)) 2173 if (face >= 0 && face < GetNumberOfSides(part))
1951 { 2174 {
@@ -1982,6 +2205,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1982 2205
1983 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 2206 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1984 { 2207 {
2208 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2209 return;
2210
1985 Primitive.TextureEntry tex = part.Shape.Textures; 2211 Primitive.TextureEntry tex = part.Shape.Textures;
1986 if (face >= 0 && face < GetNumberOfSides(part)) 2212 if (face >= 0 && face < GetNumberOfSides(part))
1987 { 2213 {
@@ -2018,6 +2244,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2018 2244
2019 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 2245 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
2020 { 2246 {
2247 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2248 return;
2249
2021 Primitive.TextureEntry tex = part.Shape.Textures; 2250 Primitive.TextureEntry tex = part.Shape.Textures;
2022 if (face >= 0 && face < GetNumberOfSides(part)) 2251 if (face >= 0 && face < GetNumberOfSides(part))
2023 { 2252 {
@@ -2159,7 +2388,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2159 return end; 2388 return end;
2160 } 2389 }
2161 2390
2162 protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos) 2391 protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos, bool adjust)
2163 { 2392 {
2164 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) 2393 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2165 return fromPos; 2394 return fromPos;
@@ -2175,9 +2404,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2175 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0) 2404 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
2176 targetPos.z = ground; 2405 targetPos.z = ground;
2177 } 2406 }
2178 LSL_Vector real_vec = SetPosAdjust(fromPos, targetPos); 2407 if (adjust)
2408 return SetPosAdjust(fromPos, targetPos);
2179 2409
2180 return real_vec; 2410 return targetPos;
2181 } 2411 }
2182 2412
2183 /// <summary> 2413 /// <summary>
@@ -2188,27 +2418,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2188 /// <param name="adjust">if TRUE, will cap the distance to 10m.</param> 2418 /// <param name="adjust">if TRUE, will cap the distance to 10m.</param>
2189 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos, bool adjust) 2419 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos, bool adjust)
2190 { 2420 {
2191 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2421 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2422 return;
2423
2192 LSL_Vector currentPos = GetPartLocalPos(part); 2424 LSL_Vector currentPos = GetPartLocalPos(part);
2425 LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos, adjust);
2193 2426
2194 float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y);
2195 bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true);
2196 2427
2197 if (part.ParentGroup.RootPart == part) 2428 if (part.ParentGroup.RootPart == part)
2198 { 2429 {
2199 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
2200 targetPos.z = ground;
2201 SceneObjectGroup parent = part.ParentGroup; 2430 SceneObjectGroup parent = part.ParentGroup;
2202 parent.UpdateGroupPosition(!adjust ? targetPos : 2431 if (!World.Permissions.CanObjectEntry(parent.UUID, false, (Vector3)toPos))
2203 SetPosAdjust(currentPos, targetPos)); 2432 return;
2433 Util.FireAndForget(delegate(object x) {
2434 parent.UpdateGroupPosition((Vector3)toPos);
2435 });
2204 } 2436 }
2205 else 2437 else
2206 { 2438 {
2207 part.OffsetPosition = !adjust ? targetPos : 2439 part.OffsetPosition = (Vector3)toPos;
2208 SetPosAdjust(currentPos, targetPos); 2440// SceneObjectGroup parent = part.ParentGroup;
2209 SceneObjectGroup parent = part.ParentGroup; 2441// parent.HasGroupChanged = true;
2210 parent.HasGroupChanged = true; 2442// parent.ScheduleGroupForTerseUpdate();
2211 parent.ScheduleGroupForTerseUpdate(); 2443 part.ScheduleTerseUpdate();
2212 } 2444 }
2213 } 2445 }
2214 2446
@@ -2237,13 +2469,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2237 else 2469 else
2238 { 2470 {
2239 if (part.ParentGroup.IsAttachment) 2471 if (part.ParentGroup.IsAttachment)
2240 {
2241 pos = part.AttachedPos; 2472 pos = part.AttachedPos;
2242 }
2243 else 2473 else
2244 {
2245 pos = part.AbsolutePosition; 2474 pos = part.AbsolutePosition;
2246 }
2247 } 2475 }
2248 2476
2249// m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos); 2477// m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos);
@@ -2255,8 +2483,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2255 { 2483 {
2256 m_host.AddScriptLPS(1); 2484 m_host.AddScriptLPS(1);
2257 2485
2486
2487 // Teravus: if (m_host.ParentID == 0) is bug code because the ParentID for the Avatar will cause this to be nonzero for root prim attachments
2488 // which is then treated like a child prim rotation and it's offset gets cumulatively multiplied against.
2489 // to fix the scripted rotations we also have to check to see if the root part localid is the same as the host's localid.
2490 // RootPart != null should shortcircuit
2491
2258 // try to let this work as in SL... 2492 // try to let this work as in SL...
2259 if (m_host.ParentID == 0) 2493 if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart))
2260 { 2494 {
2261 // special case: If we are root, rotate complete SOG to new rotation 2495 // special case: If we are root, rotate complete SOG to new rotation
2262 SetRot(m_host, rot); 2496 SetRot(m_host, rot);
@@ -2283,25 +2517,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2283 2517
2284 protected void SetRot(SceneObjectPart part, Quaternion rot) 2518 protected void SetRot(SceneObjectPart part, Quaternion rot)
2285 { 2519 {
2286 part.UpdateRotation(rot); 2520 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2287 // Update rotation does not move the object in the physics scene if it's a linkset. 2521 return;
2288 2522
2289//KF: Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type 2523 bool isroot = (part == part.ParentGroup.RootPart);
2290// part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; 2524 bool isphys;
2291 2525
2292 // So, after thinking about this for a bit, the issue with the part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition line
2293 // is it isn't compatible with vehicles because it causes the vehicle body to have to be broken down and rebuilt
2294 // It's perfectly okay when the object is not an active physical body though.
2295 // So, part.ParentGroup.ResetChildPrimPhysicsPositions(); does the thing that Kitto is warning against
2296 // but only if the object is not physial and active. This is important for rotating doors.
2297 // without the absoluteposition = absoluteposition happening, the doors do not move in the physics
2298 // scene
2299 PhysicsActor pa = part.PhysActor; 2526 PhysicsActor pa = part.PhysActor;
2300 2527
2301 if (pa != null && !pa.IsPhysical) 2528 // keep using physactor ideia of isphysical
2529 // it should be SOP ideia of that
2530 // not much of a issue with ubitODE
2531 if (pa != null && pa.IsPhysical)
2532 isphys = true;
2533 else
2534 isphys = false;
2535
2536 // SL doesn't let scripts rotate root of physical linksets
2537 if (isroot && isphys)
2538 return;
2539
2540 part.UpdateRotation(rot);
2541
2542 // Update rotation does not move the object in the physics engine if it's a non physical linkset
2543 // so do a nasty update of parts positions if is a root part rotation
2544 if (isroot && pa != null) // with if above implies non physical root part
2302 { 2545 {
2303 part.ParentGroup.ResetChildPrimPhysicsPositions(); 2546 part.ParentGroup.ResetChildPrimPhysicsPositions();
2304 } 2547 }
2548 else // fix sitting avatars. This is only needed bc of how we link avas to child parts, not root part
2549 {
2550 List<ScenePresence> sittingavas = part.ParentGroup.GetLinkedAvatars();
2551 if (sittingavas.Count > 0)
2552 {
2553 foreach (ScenePresence av in sittingavas)
2554 {
2555 if (isroot || part.LocalId == av.ParentID)
2556 av.SendTerseUpdateToAllClients();
2557 }
2558 }
2559 }
2305 } 2560 }
2306 2561
2307 /// <summary> 2562 /// <summary>
@@ -2318,6 +2573,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2318 2573
2319 m_host.AddScriptLPS(1); 2574 m_host.AddScriptLPS(1);
2320 Quaternion q = m_host.GetWorldRotation(); 2575 Quaternion q = m_host.GetWorldRotation();
2576
2577 if (m_host.ParentGroup != null && m_host.ParentGroup.AttachmentPoint != 0)
2578 {
2579 ScenePresence avatar = World.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
2580 if (avatar != null)
2581 {
2582 if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
2583 q = avatar.CameraRotation * q; // Mouselook
2584 else
2585 q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
2586 }
2587 }
2588
2321 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 2589 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2322 } 2590 }
2323 2591
@@ -2345,14 +2613,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2345 return new LSL_Rotation(q); 2613 return new LSL_Rotation(q);
2346 } 2614 }
2347 2615
2348 return new LSL_Rotation(part.GetWorldRotation()); 2616 q = part.GetWorldRotation();
2617 if (part.ParentGroup.AttachmentPoint != 0)
2618 {
2619 ScenePresence avatar = World.GetScenePresence(part.ParentGroup.AttachedAvatar);
2620 if (avatar != null)
2621 {
2622 if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
2623 q = avatar.CameraRotation * q; // Mouselook
2624 else
2625 q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
2626 }
2627 }
2628
2629 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2349 } 2630 }
2350 2631
2351 public LSL_Rotation llGetLocalRot() 2632 public LSL_Rotation llGetLocalRot()
2352 { 2633 {
2353 m_host.AddScriptLPS(1); 2634 return GetPartLocalRot(m_host);
2635 }
2354 2636
2355 return new LSL_Rotation(m_host.RotationOffset); 2637 private LSL_Rotation GetPartLocalRot(SceneObjectPart part)
2638 {
2639 m_host.AddScriptLPS(1);
2640 Quaternion rot = part.RotationOffset;
2641 return new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W);
2356 } 2642 }
2357 2643
2358 public void llSetForce(LSL_Vector force, int local) 2644 public void llSetForce(LSL_Vector force, int local)
@@ -2382,32 +2668,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2382 return force; 2668 return force;
2383 } 2669 }
2384 2670
2385 public void llSetVelocity(LSL_Vector velocity, int local)
2386 {
2387 m_host.AddScriptLPS(1);
2388
2389 if (!m_host.ParentGroup.IsDeleted)
2390 {
2391 if (local != 0)
2392 velocity *= llGetRot();
2393
2394 m_host.ParentGroup.RootPart.Velocity = velocity;
2395 }
2396 }
2397
2398 public void llSetAngularVelocity(LSL_Vector angularVelocity, int local)
2399 {
2400 m_host.AddScriptLPS(1);
2401
2402 if (!m_host.ParentGroup.IsDeleted)
2403 {
2404 if (local != 0)
2405 angularVelocity *= llGetRot();
2406
2407 m_host.ParentGroup.RootPart.AngularVelocity = angularVelocity;
2408 }
2409 }
2410
2411 public LSL_Integer llTarget(LSL_Vector position, double range) 2671 public LSL_Integer llTarget(LSL_Vector position, double range)
2412 { 2672 {
2413 m_host.AddScriptLPS(1); 2673 m_host.AddScriptLPS(1);
@@ -2458,16 +2718,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2458 m_host.ApplyImpulse(v, local != 0); 2718 m_host.ApplyImpulse(v, local != 0);
2459 } 2719 }
2460 2720
2721
2461 public void llApplyRotationalImpulse(LSL_Vector force, int local) 2722 public void llApplyRotationalImpulse(LSL_Vector force, int local)
2462 { 2723 {
2463 m_host.AddScriptLPS(1); 2724 m_host.AddScriptLPS(1);
2464 m_host.ApplyAngularImpulse(force, local != 0); 2725 m_host.ParentGroup.RootPart.ApplyAngularImpulse(force, local != 0);
2465 } 2726 }
2466 2727
2467 public void llSetTorque(LSL_Vector torque, int local) 2728 public void llSetTorque(LSL_Vector torque, int local)
2468 { 2729 {
2469 m_host.AddScriptLPS(1); 2730 m_host.AddScriptLPS(1);
2470 m_host.SetAngularImpulse(torque, local != 0); 2731 m_host.ParentGroup.RootPart.SetAngularImpulse(torque, local != 0);
2471 } 2732 }
2472 2733
2473 public LSL_Vector llGetTorque() 2734 public LSL_Vector llGetTorque()
@@ -2484,20 +2745,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2484 llSetTorque(torque, local); 2745 llSetTorque(torque, local);
2485 } 2746 }
2486 2747
2748 public void llSetVelocity(LSL_Vector vel, int local)
2749 {
2750 m_host.AddScriptLPS(1);
2751 m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0);
2752 }
2753
2487 public LSL_Vector llGetVel() 2754 public LSL_Vector llGetVel()
2488 { 2755 {
2489 m_host.AddScriptLPS(1); 2756 m_host.AddScriptLPS(1);
2490 2757
2491 Vector3 vel; 2758 Vector3 vel = Vector3.Zero;
2492 2759
2493 if (m_host.ParentGroup.IsAttachment) 2760 if (m_host.ParentGroup.IsAttachment)
2494 { 2761 {
2495 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar); 2762 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
2496 vel = avatar.Velocity; 2763 if (avatar != null)
2764 vel = avatar.Velocity;
2497 } 2765 }
2498 else 2766 else
2499 { 2767 {
2500 vel = m_host.Velocity; 2768 vel = m_host.ParentGroup.RootPart.Velocity;
2501 } 2769 }
2502 2770
2503 return new LSL_Vector(vel); 2771 return new LSL_Vector(vel);
@@ -2510,11 +2778,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2510 return new LSL_Vector(m_host.Acceleration); 2778 return new LSL_Vector(m_host.Acceleration);
2511 } 2779 }
2512 2780
2513 public LSL_Vector llGetOmega() 2781 public void llSetAngularVelocity(LSL_Vector avel, int local)
2514 { 2782 {
2515 m_host.AddScriptLPS(1); 2783 m_host.AddScriptLPS(1);
2784 m_host.SetAngularVelocity(new Vector3((float)avel.x, (float)avel.y, (float)avel.z), local != 0);
2785 }
2516 2786
2517 return new LSL_Vector(m_host.AngularVelocity); 2787 public LSL_Vector llGetOmega()
2788 {
2789 m_host.AddScriptLPS(1);
2790 Vector3 avel = m_host.AngularVelocity;
2791 return new LSL_Vector(avel.X, avel.Y, avel.Z);
2518 } 2792 }
2519 2793
2520 public LSL_Float llGetTimeOfDay() 2794 public LSL_Float llGetTimeOfDay()
@@ -2875,7 +3149,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2875 return src.ToLower(); 3149 return src.ToLower();
2876 } 3150 }
2877 3151
2878 public void llGiveMoney(string destination, int amount) 3152 public LSL_Integer llGiveMoney(string destination, int amount)
2879 { 3153 {
2880 Util.FireAndForget(x => 3154 Util.FireAndForget(x =>
2881 { 3155 {
@@ -2906,9 +3180,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2906 return; 3180 return;
2907 } 3181 }
2908 3182
3183 string reason;
2909 money.ObjectGiveMoney( 3184 money.ObjectGiveMoney(
2910 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); 3185 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero, out reason);
2911 }); 3186 });
3187
3188 return 0;
2912 } 3189 }
2913 3190
2914 public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) 3191 public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
@@ -3004,6 +3281,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3004 } 3281 }
3005 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) 3282 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
3006 } 3283 }
3284 return;
3007 }); 3285 });
3008 3286
3009 //ScriptSleep((int)((groupmass * velmag) / 10)); 3287 //ScriptSleep((int)((groupmass * velmag) / 10));
@@ -3018,35 +3296,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3018 public void llLookAt(LSL_Vector target, double strength, double damping) 3296 public void llLookAt(LSL_Vector target, double strength, double damping)
3019 { 3297 {
3020 m_host.AddScriptLPS(1); 3298 m_host.AddScriptLPS(1);
3021 // Determine where we are looking from
3022 LSL_Vector from = llGetPos();
3023
3024 // Work out the normalised vector from the source to the target
3025 LSL_Vector delta = llVecNorm(target - from);
3026 LSL_Vector angle = new LSL_Vector(0,0,0);
3027 3299
3028 // Calculate the yaw 3300 // Get the normalized vector to the target
3029 // subtracting PI_BY_TWO is required to compensate for the odd SL co-ordinate system 3301 LSL_Vector d1 = llVecNorm(target - llGetPos());
3030 angle.x = llAtan2(delta.z, delta.y) - ScriptBaseClass.PI_BY_TWO;
3031 3302
3032 // Calculate pitch 3303 // Get the bearing (yaw)
3033 angle.y = llAtan2(delta.x, llSqrt((delta.y * delta.y) + (delta.z * delta.z))); 3304 LSL_Vector a1 = new LSL_Vector(0,0,0);
3305 a1.z = llAtan2(d1.y, d1.x);
3034 3306
3035 // we need to convert from a vector describing 3307 // Get the elevation (pitch)
3036 // the angles of rotation in radians into rotation value 3308 LSL_Vector a2 = new LSL_Vector(0,0,0);
3037 LSL_Rotation rot = llEuler2Rot(angle); 3309 a2.y= -llAtan2(d1.z, llSqrt((d1.x * d1.x) + (d1.y * d1.y)));
3038 3310
3039 // Per discussion with Melanie, for non-physical objects llLookAt appears to simply 3311 LSL_Rotation r1 = llEuler2Rot(a1);
3040 // set the rotation of the object, copy that behavior 3312 LSL_Rotation r2 = llEuler2Rot(a2);
3041 PhysicsActor pa = m_host.PhysActor; 3313 LSL_Rotation r3 = new LSL_Rotation(0.000000, 0.707107, 0.000000, 0.707107);
3042 3314
3043 if (strength == 0 || pa == null || !pa.IsPhysical) 3315 if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
3044 { 3316 {
3045 llSetRot(rot); 3317 // Do nothing if either value is 0 (this has been checked in SL)
3318 if (strength <= 0.0 || damping <= 0.0)
3319 return;
3320
3321 llSetRot(r3 * r2 * r1);
3046 } 3322 }
3047 else 3323 else
3048 { 3324 {
3049 m_host.StartLookAt(rot, (float)strength, (float)damping); 3325 if (strength == 0)
3326 {
3327 llSetRot(r3 * r2 * r1);
3328 return;
3329 }
3330
3331 m_host.StartLookAt((Quaternion)(r3 * r2 * r1), (float)strength, (float)damping);
3050 } 3332 }
3051 } 3333 }
3052 3334
@@ -3093,17 +3375,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3093 } 3375 }
3094 else 3376 else
3095 { 3377 {
3096 if (m_host.IsRoot) 3378 // new SL always returns object mass
3097 { 3379// if (m_host.IsRoot)
3380// {
3098 return m_host.ParentGroup.GetMass(); 3381 return m_host.ParentGroup.GetMass();
3099 } 3382// }
3100 else 3383// else
3101 { 3384// {
3102 return m_host.GetMass(); 3385// return m_host.GetMass();
3103 } 3386// }
3104 } 3387 }
3105 } 3388 }
3106 3389
3390
3391 public LSL_Float llGetMassMKS()
3392 {
3393 return 100f * llGetMass();
3394 }
3395
3107 public void llCollisionFilter(string name, string id, int accept) 3396 public void llCollisionFilter(string name, string id, int accept)
3108 { 3397 {
3109 m_host.AddScriptLPS(1); 3398 m_host.AddScriptLPS(1);
@@ -3151,8 +3440,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3151 { 3440 {
3152 // Unregister controls from Presence 3441 // Unregister controls from Presence
3153 presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID); 3442 presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID);
3154 // Remove Take Control permission.
3155 m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
3156 } 3443 }
3157 } 3444 }
3158 } 3445 }
@@ -3180,7 +3467,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3180 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; 3467 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
3181 3468
3182 if (attachmentsModule != null) 3469 if (attachmentsModule != null)
3183 return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, true); 3470 return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, false, true);
3184 else 3471 else
3185 return false; 3472 return false;
3186 } 3473 }
@@ -3210,9 +3497,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3210 { 3497 {
3211 m_host.AddScriptLPS(1); 3498 m_host.AddScriptLPS(1);
3212 3499
3213// if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
3214// return;
3215
3216 if (m_item.PermsGranter != m_host.OwnerID) 3500 if (m_item.PermsGranter != m_host.OwnerID)
3217 return; 3501 return;
3218 3502
@@ -3255,6 +3539,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3255 3539
3256 public void llInstantMessage(string user, string message) 3540 public void llInstantMessage(string user, string message)
3257 { 3541 {
3542 UUID result;
3543 if (!UUID.TryParse(user, out result) || result == UUID.Zero)
3544 {
3545 ShoutError("An invalid key was passed to llInstantMessage");
3546 ScriptSleep(2000);
3547 return;
3548 }
3549
3550
3258 m_host.AddScriptLPS(1); 3551 m_host.AddScriptLPS(1);
3259 3552
3260 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3553 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -3269,14 +3562,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3269 UUID friendTransactionID = UUID.Random(); 3562 UUID friendTransactionID = UUID.Random();
3270 3563
3271 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3564 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3272 3565
3273 GridInstantMessage msg = new GridInstantMessage(); 3566 GridInstantMessage msg = new GridInstantMessage();
3274 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3567 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3275 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3568 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3276 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3569 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3277// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3570// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3278// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3571// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3279 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 3572// DateTime dt = DateTime.UtcNow;
3573//
3574// // Ticks from UtcNow, but make it look like local. Evil, huh?
3575// dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3576//
3577// try
3578// {
3579// // Convert that to the PST timezone
3580// TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3581// dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3582// }
3583// catch
3584// {
3585// // No logging here, as it could be VERY spammy
3586// }
3587//
3588// // And make it look local again to fool the unix time util
3589// dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3590
3591 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
3592
3280 //if (client != null) 3593 //if (client != null)
3281 //{ 3594 //{
3282 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3595 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3290,10 +3603,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3290 msg.message = message.Substring(0, 1024); 3603 msg.message = message.Substring(0, 1024);
3291 else 3604 else
3292 msg.message = message; 3605 msg.message = message;
3293 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3606 msg.dialog = (byte)19; // MessageFromObject
3294 msg.fromGroup = false;// fromGroup; 3607 msg.fromGroup = false;// fromGroup;
3295 msg.offline = (byte)0; //offline; 3608 msg.offline = (byte)0; //offline;
3296 msg.ParentEstateID = 0; //ParentEstateID; 3609 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3297 msg.Position = new Vector3(m_host.AbsolutePosition); 3610 msg.Position = new Vector3(m_host.AbsolutePosition);
3298 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3611 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
3299 3612
@@ -3571,7 +3884,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3571 implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 3884 implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
3572 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3885 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
3573 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3886 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
3887 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
3574 ScriptBaseClass.PERMISSION_ATTACH; 3888 ScriptBaseClass.PERMISSION_ATTACH;
3889
3575 } 3890 }
3576 else 3891 else
3577 { 3892 {
@@ -3588,15 +3903,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3588 if (World.GetExtraSetting("auto_grant_attach_perms") == "true") 3903 if (World.GetExtraSetting("auto_grant_attach_perms") == "true")
3589 implicitPerms = ScriptBaseClass.PERMISSION_ATTACH; 3904 implicitPerms = ScriptBaseClass.PERMISSION_ATTACH;
3590 } 3905 }
3906 if (World.GetExtraSetting("auto_grant_all_perms") == "true")
3907 {
3908 implicitPerms = perm;
3909 }
3591 } 3910 }
3592 3911
3593 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3912 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3594 { 3913 {
3595 lock (m_host.TaskInventory) 3914 m_host.TaskInventory.LockItemsForWrite(true);
3596 { 3915 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
3597 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; 3916 m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
3598 m_host.TaskInventory[m_item.ItemID].PermsMask = perm; 3917 m_host.TaskInventory.LockItemsForWrite(false);
3599 }
3600 3918
3601 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( 3919 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
3602 "run_time_permissions", new Object[] { 3920 "run_time_permissions", new Object[] {
@@ -3639,11 +3957,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3639 3957
3640 if (!m_waitingForScriptAnswer) 3958 if (!m_waitingForScriptAnswer)
3641 { 3959 {
3642 lock (m_host.TaskInventory) 3960 m_host.TaskInventory.LockItemsForWrite(true);
3643 { 3961 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
3644 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; 3962 m_host.TaskInventory[m_item.ItemID].PermsMask = 0;
3645 m_host.TaskInventory[m_item.ItemID].PermsMask = 0; 3963 m_host.TaskInventory.LockItemsForWrite(false);
3646 }
3647 3964
3648 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3965 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3649 m_waitingForScriptAnswer=true; 3966 m_waitingForScriptAnswer=true;
@@ -3672,14 +3989,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3672 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3989 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3673 llReleaseControls(); 3990 llReleaseControls();
3674 3991
3675 lock (m_host.TaskInventory) 3992 m_host.TaskInventory.LockItemsForWrite(true);
3676 { 3993 m_host.TaskInventory[m_item.ItemID].PermsMask = answer;
3677 m_host.TaskInventory[m_item.ItemID].PermsMask = answer; 3994 m_host.TaskInventory.LockItemsForWrite(false);
3678 } 3995
3679 3996 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
3680 m_ScriptEngine.PostScriptEvent( 3997 "run_time_permissions", new Object[] {
3681 m_item.ItemID, 3998 new LSL_Integer(answer) },
3682 new EventParams("run_time_permissions", new Object[] { new LSL_Integer(answer) }, new DetectParams[0])); 3999 new DetectParams[0]));
3683 } 4000 }
3684 4001
3685 public LSL_String llGetPermissionsKey() 4002 public LSL_String llGetPermissionsKey()
@@ -3718,14 +4035,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3718 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 4035 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3719 { 4036 {
3720 List<SceneObjectPart> parts = GetLinkParts(linknumber); 4037 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3721 4038 if (parts.Count > 0)
3722 foreach (SceneObjectPart part in parts) 4039 {
3723 part.SetFaceColorAlpha(face, color, null); 4040 try
4041 {
4042 foreach (SceneObjectPart part in parts)
4043 part.SetFaceColorAlpha(face, color, null);
4044 }
4045 finally
4046 {
4047 }
4048 }
3724 } 4049 }
3725 4050
3726 public void llCreateLink(string target, int parent) 4051 public void llCreateLink(string target, int parent)
3727 { 4052 {
3728 m_host.AddScriptLPS(1); 4053 m_host.AddScriptLPS(1);
4054
3729 UUID targetID; 4055 UUID targetID;
3730 4056
3731 if (!UUID.TryParse(target, out targetID)) 4057 if (!UUID.TryParse(target, out targetID))
@@ -3831,10 +4157,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3831 // Restructuring Multiple Prims. 4157 // Restructuring Multiple Prims.
3832 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); 4158 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
3833 parts.Remove(parentPrim.RootPart); 4159 parts.Remove(parentPrim.RootPart);
3834 foreach (SceneObjectPart part in parts) 4160 if (parts.Count > 0)
3835 { 4161 {
3836 parentPrim.DelinkFromGroup(part.LocalId, true); 4162 try
4163 {
4164 foreach (SceneObjectPart part in parts)
4165 {
4166 parentPrim.DelinkFromGroup(part.LocalId, true);
4167 }
4168 }
4169 finally
4170 {
4171 }
3837 } 4172 }
4173
3838 parentPrim.HasGroupChanged = true; 4174 parentPrim.HasGroupChanged = true;
3839 parentPrim.ScheduleGroupForFullUpdate(); 4175 parentPrim.ScheduleGroupForFullUpdate();
3840 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 4176 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3843,12 +4179,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3843 { 4179 {
3844 SceneObjectPart newRoot = parts[0]; 4180 SceneObjectPart newRoot = parts[0];
3845 parts.Remove(newRoot); 4181 parts.Remove(newRoot);
3846 foreach (SceneObjectPart part in parts) 4182
4183 try
3847 { 4184 {
3848 // Required for linking 4185 foreach (SceneObjectPart part in parts)
3849 part.ClearUpdateSchedule(); 4186 {
3850 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 4187 part.ClearUpdateSchedule();
4188 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
4189 }
3851 } 4190 }
4191 finally
4192 {
4193 }
4194
4195
3852 newRoot.ParentGroup.HasGroupChanged = true; 4196 newRoot.ParentGroup.HasGroupChanged = true;
3853 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 4197 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3854 } 4198 }
@@ -3868,6 +4212,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3868 public void llBreakAllLinks() 4212 public void llBreakAllLinks()
3869 { 4213 {
3870 m_host.AddScriptLPS(1); 4214 m_host.AddScriptLPS(1);
4215
4216 TaskInventoryItem item = m_item;
4217
4218 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
4219 && !m_automaticLinkPermission)
4220 {
4221 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
4222 return;
4223 }
4224
3871 SceneObjectGroup parentPrim = m_host.ParentGroup; 4225 SceneObjectGroup parentPrim = m_host.ParentGroup;
3872 if (parentPrim.AttachmentPoint != 0) 4226 if (parentPrim.AttachmentPoint != 0)
3873 return; // Fail silently if attached 4227 return; // Fail silently if attached
@@ -3887,13 +4241,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3887 public LSL_String llGetLinkKey(int linknum) 4241 public LSL_String llGetLinkKey(int linknum)
3888 { 4242 {
3889 m_host.AddScriptLPS(1); 4243 m_host.AddScriptLPS(1);
4244 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
4245 if (part != null)
4246 {
4247 return part.UUID.ToString();
4248 }
4249 else
4250 {
4251 if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1))
4252 {
4253 linknum -= (m_host.ParentGroup.PrimCount) + 1;
3890 4254
3891 ISceneEntity entity = GetLinkEntity(linknum); 4255 if (linknum < 0)
4256 return UUID.Zero.ToString();
3892 4257
3893 if (entity != null) 4258 List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
3894 return entity.UUID.ToString(); 4259 if (avatars.Count > linknum)
3895 else 4260 {
3896 return ScriptBaseClass.NULL_KEY; 4261 return avatars[linknum].UUID.ToString();
4262 }
4263 }
4264 return UUID.Zero.ToString();
4265 }
3897 } 4266 }
3898 4267
3899 /// <summary> 4268 /// <summary>
@@ -3952,17 +4321,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3952 m_host.AddScriptLPS(1); 4321 m_host.AddScriptLPS(1);
3953 int count = 0; 4322 int count = 0;
3954 4323
3955 lock (m_host.TaskInventory) 4324 m_host.TaskInventory.LockItemsForRead(true);
4325 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3956 { 4326 {
3957 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4327 if (inv.Value.Type == type || type == -1)
3958 { 4328 {
3959 if (inv.Value.Type == type || type == -1) 4329 count = count + 1;
3960 {
3961 count = count + 1;
3962 }
3963 } 4330 }
3964 } 4331 }
3965 4332
4333 m_host.TaskInventory.LockItemsForRead(false);
3966 return count; 4334 return count;
3967 } 4335 }
3968 4336
@@ -3971,16 +4339,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3971 m_host.AddScriptLPS(1); 4339 m_host.AddScriptLPS(1);
3972 ArrayList keys = new ArrayList(); 4340 ArrayList keys = new ArrayList();
3973 4341
3974 lock (m_host.TaskInventory) 4342 m_host.TaskInventory.LockItemsForRead(true);
4343 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3975 { 4344 {
3976 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4345 if (inv.Value.Type == type || type == -1)
3977 { 4346 {
3978 if (inv.Value.Type == type || type == -1) 4347 keys.Add(inv.Value.Name);
3979 {
3980 keys.Add(inv.Value.Name);
3981 }
3982 } 4348 }
3983 } 4349 }
4350 m_host.TaskInventory.LockItemsForRead(false);
3984 4351
3985 if (keys.Count == 0) 4352 if (keys.Count == 0)
3986 { 4353 {
@@ -4018,7 +4385,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4018 if (item == null) 4385 if (item == null)
4019 { 4386 {
4020 llSay(0, String.Format("Could not find object '{0}'", inventory)); 4387 llSay(0, String.Format("Could not find object '{0}'", inventory));
4021 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4388 return;
4389// throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
4022 } 4390 }
4023 4391
4024 UUID objId = item.ItemID; 4392 UUID objId = item.ItemID;
@@ -4046,33 +4414,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4046 return; 4414 return;
4047 } 4415 }
4048 } 4416 }
4417
4049 // destination is an avatar 4418 // destination is an avatar
4050 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4419 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
4051 4420
4052 if (agentItem == null) 4421 if (agentItem == null)
4053 return; 4422 return;
4054 4423
4055 if (m_TransferModule != null) 4424 byte[] bucket = new byte[1];
4056 { 4425 bucket[0] = (byte)item.Type;
4057 byte[] bucket = new byte[1]; 4426 //byte[] objBytes = agentItem.ID.GetBytes();
4058 bucket[0] = (byte)item.Type; 4427 //Array.Copy(objBytes, 0, bucket, 1, 16);
4059 4428
4060 GridInstantMessage msg = new GridInstantMessage(World, 4429 GridInstantMessage msg = new GridInstantMessage(World,
4061 m_host.OwnerID, m_host.Name, destId, 4430 m_host.OwnerID, m_host.Name, destId,
4062 (byte)InstantMessageDialog.TaskInventoryOffered, 4431 (byte)InstantMessageDialog.TaskInventoryOffered,
4063 false, item.Name+". "+m_host.Name+" is located at "+ 4432 false, item.Name+". "+m_host.Name+" is located at "+
4064 World.RegionInfo.RegionName+" "+ 4433 World.RegionInfo.RegionName+" "+
4065 m_host.AbsolutePosition.ToString(), 4434 m_host.AbsolutePosition.ToString(),
4066 agentItem.ID, true, m_host.AbsolutePosition, 4435 agentItem.ID, true, m_host.AbsolutePosition,
4067 bucket, true); 4436 bucket, true);
4068 4437
4069 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4438 ScenePresence sp;
4070 }
4071 4439
4440 if (World.TryGetScenePresence(destId, out sp))
4441 {
4442 sp.ControllingClient.SendInstantMessage(msg);
4443 }
4444 else
4445 {
4446 if (m_TransferModule != null)
4447 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4448 }
4449
4450 //This delay should only occur when giving inventory to avatars.
4072 ScriptSleep(3000); 4451 ScriptSleep(3000);
4073 } 4452 }
4074 } 4453 }
4075 4454
4455 [DebuggerNonUserCode]
4076 public void llRemoveInventory(string name) 4456 public void llRemoveInventory(string name)
4077 { 4457 {
4078 m_host.AddScriptLPS(1); 4458 m_host.AddScriptLPS(1);
@@ -4127,109 +4507,115 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4127 { 4507 {
4128 m_host.AddScriptLPS(1); 4508 m_host.AddScriptLPS(1);
4129 4509
4130 UUID uuid = (UUID)id; 4510 UUID uuid;
4131 PresenceInfo pinfo = null; 4511 if (UUID.TryParse(id, out uuid))
4132 UserAccount account;
4133
4134 UserInfoCacheEntry ce;
4135 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4136 { 4512 {
4137 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); 4513 PresenceInfo pinfo = null;
4138 if (account == null) 4514 UserAccount account;
4515
4516 UserInfoCacheEntry ce;
4517 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4139 { 4518 {
4140 m_userInfoCache[uuid] = null; // Cache negative 4519 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
4141 return UUID.Zero.ToString(); 4520 if (account == null)
4142 } 4521 {
4522 m_userInfoCache[uuid] = null; // Cache negative
4523 return UUID.Zero.ToString();
4524 }
4143 4525
4144 4526
4145 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); 4527 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4146 if (pinfos != null && pinfos.Length > 0) 4528 if (pinfos != null && pinfos.Length > 0)
4147 {
4148 foreach (PresenceInfo p in pinfos)
4149 { 4529 {
4150 if (p.RegionID != UUID.Zero) 4530 foreach (PresenceInfo p in pinfos)
4151 { 4531 {
4152 pinfo = p; 4532 if (p.RegionID != UUID.Zero)
4533 {
4534 pinfo = p;
4535 }
4153 } 4536 }
4154 } 4537 }
4155 }
4156 4538
4157 ce = new UserInfoCacheEntry(); 4539 ce = new UserInfoCacheEntry();
4158 ce.time = Util.EnvironmentTickCount(); 4540 ce.time = Util.EnvironmentTickCount();
4159 ce.account = account; 4541 ce.account = account;
4160 ce.pinfo = pinfo; 4542 ce.pinfo = pinfo;
4161 } 4543 m_userInfoCache[uuid] = ce;
4162 else 4544 }
4163 { 4545 else
4164 if (ce == null) 4546 {
4165 return UUID.Zero.ToString(); 4547 if (ce == null)
4548 return UUID.Zero.ToString();
4166 4549
4167 account = ce.account; 4550 account = ce.account;
4168 pinfo = ce.pinfo; 4551 pinfo = ce.pinfo;
4169 } 4552 }
4170 4553
4171 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) 4554 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
4172 {
4173 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4174 if (pinfos != null && pinfos.Length > 0)
4175 { 4555 {
4176 foreach (PresenceInfo p in pinfos) 4556 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4557 if (pinfos != null && pinfos.Length > 0)
4177 { 4558 {
4178 if (p.RegionID != UUID.Zero) 4559 foreach (PresenceInfo p in pinfos)
4179 { 4560 {
4180 pinfo = p; 4561 if (p.RegionID != UUID.Zero)
4562 {
4563 pinfo = p;
4564 }
4181 } 4565 }
4182 } 4566 }
4183 } 4567 else
4184 else 4568 pinfo = null;
4185 pinfo = null;
4186 4569
4187 ce.time = Util.EnvironmentTickCount(); 4570 ce.time = Util.EnvironmentTickCount();
4188 ce.pinfo = pinfo; 4571 ce.pinfo = pinfo;
4189 } 4572 }
4190 4573
4191 string reply = String.Empty; 4574 string reply = String.Empty;
4192 4575
4193 switch (data) 4576 switch (data)
4194 { 4577 {
4195 case 1: // DATA_ONLINE (0|1) 4578 case 1: // DATA_ONLINE (0|1)
4196 if (pinfo != null && pinfo.RegionID != UUID.Zero) 4579 if (pinfo != null && pinfo.RegionID != UUID.Zero)
4197 reply = "1"; 4580 reply = "1";
4198 else 4581 else
4199 reply = "0"; 4582 reply = "0";
4200 break; 4583 break;
4201 case 2: // DATA_NAME (First Last) 4584 case 2: // DATA_NAME (First Last)
4202 reply = account.FirstName + " " + account.LastName; 4585 reply = account.FirstName + " " + account.LastName;
4203 break; 4586 break;
4204 case 3: // DATA_BORN (YYYY-MM-DD) 4587 case 3: // DATA_BORN (YYYY-MM-DD)
4205 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); 4588 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
4206 born = born.AddSeconds(account.Created); 4589 born = born.AddSeconds(account.Created);
4207 reply = born.ToString("yyyy-MM-dd"); 4590 reply = born.ToString("yyyy-MM-dd");
4208 break; 4591 break;
4209 case 4: // DATA_RATING (0,0,0,0,0,0) 4592 case 4: // DATA_RATING (0,0,0,0,0,0)
4210 reply = "0,0,0,0,0,0"; 4593 reply = "0,0,0,0,0,0";
4211 break; 4594 break;
4212 case 7: // DATA_USERLEVEL (integer) 4595 case 8: // DATA_PAYINFO (0|1|2|3)
4213 reply = account.UserLevel.ToString(); 4596 reply = "0";
4214 break; 4597 break;
4215 case 8: // DATA_PAYINFO (0|1|2|3) 4598 default:
4216 reply = "0"; 4599 return UUID.Zero.ToString(); // Raise no event
4217 break; 4600 }
4218 default:
4219 return UUID.Zero.ToString(); // Raise no event
4220 }
4221 4601
4222 UUID rq = UUID.Random(); 4602 UUID rq = UUID.Random();
4223 4603
4224 UUID tid = AsyncCommands. 4604 UUID tid = AsyncCommands.
4225 DataserverPlugin.RegisterRequest(m_host.LocalId, 4605 DataserverPlugin.RegisterRequest(m_host.LocalId,
4226 m_item.ItemID, rq.ToString()); 4606 m_item.ItemID, rq.ToString());
4227 4607
4228 AsyncCommands. 4608 AsyncCommands.
4229 DataserverPlugin.DataserverReply(rq.ToString(), reply); 4609 DataserverPlugin.DataserverReply(rq.ToString(), reply);
4230 4610
4231 ScriptSleep(100); 4611 ScriptSleep(100);
4232 return tid.ToString(); 4612 return tid.ToString();
4613 }
4614 else
4615 {
4616 ShoutError("Invalid UUID passed to llRequestAgentData.");
4617 }
4618 return "";
4233 } 4619 }
4234 4620
4235 public LSL_String llRequestInventoryData(string name) 4621 public LSL_String llRequestInventoryData(string name)
@@ -4286,12 +4672,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4286 if (UUID.TryParse(agent, out agentId)) 4672 if (UUID.TryParse(agent, out agentId))
4287 { 4673 {
4288 ScenePresence presence = World.GetScenePresence(agentId); 4674 ScenePresence presence = World.GetScenePresence(agentId);
4289 if (presence != null) 4675 if (presence != null && presence.PresenceType != PresenceType.Npc)
4290 { 4676 {
4677 // agent must not be a god
4678 if (presence.UserLevel >= 200) return;
4679
4291 // agent must be over the owners land 4680 // agent must be over the owners land
4292 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID) 4681 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID)
4293 { 4682 {
4294 World.TeleportClientHome(agentId, presence.ControllingClient); 4683 if (!World.TeleportClientHome(agentId, presence.ControllingClient))
4684 {
4685 // They can't be teleported home for some reason
4686 GridRegion regionInfo = World.GridService.GetRegionByUUID(UUID.Zero, new UUID("2b02daac-e298-42fa-9a75-f488d37896e6"));
4687 if (regionInfo != null)
4688 {
4689 World.RequestTeleportLocation(
4690 presence.ControllingClient, regionInfo.RegionHandle, new Vector3(128, 128, 23), Vector3.Zero,
4691 (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
4692 }
4693 }
4295 } 4694 }
4296 } 4695 }
4297 } 4696 }
@@ -4309,20 +4708,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4309 ScenePresence presence = World.GetScenePresence(agentId); 4708 ScenePresence presence = World.GetScenePresence(agentId);
4310 if (presence != null && presence.PresenceType != PresenceType.Npc) 4709 if (presence != null && presence.PresenceType != PresenceType.Npc)
4311 { 4710 {
4312 // agent must not be a god
4313 if (presence.GodLevel >= 200) return;
4314
4315 if (destination == String.Empty) 4711 if (destination == String.Empty)
4316 destination = World.RegionInfo.RegionName; 4712 destination = World.RegionInfo.RegionName;
4317 4713
4318 // agent must be over the owners land 4714 if (m_item.PermsGranter == agentId)
4319 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID) 4715 {
4716 if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TELEPORT) != 0)
4717 {
4718 DoLLTeleport(presence, destination, targetPos, targetLookAt);
4719 }
4720 }
4721
4722 // agent must be wearing the object
4723 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.OwnerID == presence.UUID)
4320 { 4724 {
4321 DoLLTeleport(presence, destination, targetPos, targetLookAt); 4725 DoLLTeleport(presence, destination, targetPos, targetLookAt);
4322 } 4726 }
4323 else // or must be wearing the prim 4727 else
4324 { 4728 {
4325 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.OwnerID == presence.UUID) 4729 // agent must not be a god
4730 if (presence.GodLevel >= 200) return;
4731
4732 // agent must be over the owners land
4733 ILandObject agentLand = World.LandChannel.GetLandObject(presence.AbsolutePosition);
4734 ILandObject objectLand = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
4735 if (m_host.OwnerID == objectLand.LandData.OwnerID && m_host.OwnerID == agentLand.LandData.OwnerID)
4326 { 4736 {
4327 DoLLTeleport(presence, destination, targetPos, targetLookAt); 4737 DoLLTeleport(presence, destination, targetPos, targetLookAt);
4328 } 4738 }
@@ -4336,24 +4746,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4336 m_host.AddScriptLPS(1); 4746 m_host.AddScriptLPS(1);
4337 UUID agentId = new UUID(); 4747 UUID agentId = new UUID();
4338 4748
4339 ulong regionHandle = Utils.UIntsToLong((uint)global_coords.x, (uint)global_coords.y); 4749 ulong regionHandle = Utils.UIntsToLong((uint)(global_coords.x / 256) * 256, (uint)(global_coords.y / 256) * 256);
4340 4750
4341 if (UUID.TryParse(agent, out agentId)) 4751 if (UUID.TryParse(agent, out agentId))
4342 { 4752 {
4753 // This function is owner only!
4754 if (m_host.OwnerID != agentId)
4755 return;
4756
4343 ScenePresence presence = World.GetScenePresence(agentId); 4757 ScenePresence presence = World.GetScenePresence(agentId);
4758
4759 // Can't TP sitting avatars
4760 if (presence.ParentID != 0) // Sitting
4761 return;
4762
4344 if (presence != null && presence.PresenceType != PresenceType.Npc) 4763 if (presence != null && presence.PresenceType != PresenceType.Npc)
4345 { 4764 {
4346 // agent must not be a god 4765 if (m_item.PermsGranter == agentId)
4347 if (presence.GodLevel >= 200) return;
4348
4349 // agent must be over the owners land
4350 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID)
4351 { 4766 {
4352 World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation); 4767 // If attached using llAttachToAvatarTemp, cowardly refuse
4353 } 4768 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.ParentGroup.FromItemID == UUID.Zero)
4354 else // or must be wearing the prim 4769 return;
4355 { 4770
4356 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.OwnerID == presence.UUID) 4771 if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TELEPORT) != 0)
4357 { 4772 {
4358 World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation); 4773 World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation);
4359 } 4774 }
@@ -4397,7 +4812,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4397 UUID av = new UUID(); 4812 UUID av = new UUID();
4398 if (!UUID.TryParse(agent,out av)) 4813 if (!UUID.TryParse(agent,out av))
4399 { 4814 {
4400 LSLError("First parameter to llDialog needs to be a key");
4401 return; 4815 return;
4402 } 4816 }
4403 4817
@@ -4430,9 +4844,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4430 { 4844 {
4431 m_host.AddScriptLPS(1); 4845 m_host.AddScriptLPS(1);
4432 4846
4847 if(impact_sound == "")
4848 {
4849 m_host.CollisionSoundVolume = (float)impact_volume;
4850 m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
4851 m_host.CollisionSoundType = 0;
4852 return;
4853 }
4433 // TODO: Parameter check logic required. 4854 // TODO: Parameter check logic required.
4434 m_host.CollisionSound = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound); 4855 m_host.CollisionSound = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound);
4435 m_host.CollisionSoundVolume = (float)impact_volume; 4856 m_host.CollisionSoundVolume = (float)impact_volume;
4857 m_host.CollisionSoundType = 1;
4436 } 4858 }
4437 4859
4438 public LSL_String llGetAnimation(string id) 4860 public LSL_String llGetAnimation(string id)
@@ -4446,14 +4868,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4446 4868
4447 if (m_host.RegionHandle == presence.RegionHandle) 4869 if (m_host.RegionHandle == presence.RegionHandle)
4448 { 4870 {
4449 Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames;
4450
4451 if (presence != null) 4871 if (presence != null)
4452 { 4872 {
4453 AnimationSet currentAnims = presence.Animator.Animations; 4873 if (presence.SitGround)
4454 string currentAnimationState = String.Empty; 4874 return "Sitting on Ground";
4455 if (animationstateNames.TryGetValue(currentAnims.ImplicitDefaultAnimation.AnimID, out currentAnimationState)) 4875 if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero)
4456 return currentAnimationState; 4876 return "Sitting";
4877
4878 string movementAnimation = presence.Animator.CurrentMovementAnimation;
4879 string lslMovementAnimation;
4880
4881 if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation))
4882 return lslMovementAnimation;
4457 } 4883 }
4458 } 4884 }
4459 4885
@@ -4601,7 +5027,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4601 { 5027 {
4602 float distance = (PusheePos - m_host.AbsolutePosition).Length(); 5028 float distance = (PusheePos - m_host.AbsolutePosition).Length();
4603 float distance_term = distance * distance * distance; // Script Energy 5029 float distance_term = distance * distance * distance; // Script Energy
4604 float pusher_mass = m_host.GetMass(); 5030 // use total object mass and not part
5031 float pusher_mass = m_host.ParentGroup.GetMass();
4605 5032
4606 float PUSH_ATTENUATION_DISTANCE = 17f; 5033 float PUSH_ATTENUATION_DISTANCE = 17f;
4607 float PUSH_ATTENUATION_SCALE = 5f; 5034 float PUSH_ATTENUATION_SCALE = 5f;
@@ -4838,6 +5265,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4838 { 5265 {
4839 return item.AssetID.ToString(); 5266 return item.AssetID.ToString();
4840 } 5267 }
5268 m_host.TaskInventory.LockItemsForRead(false);
4841 5269
4842 return UUID.Zero.ToString(); 5270 return UUID.Zero.ToString();
4843 } 5271 }
@@ -4990,14 +5418,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4990 { 5418 {
4991 m_host.AddScriptLPS(1); 5419 m_host.AddScriptLPS(1);
4992 5420
4993 if (src == null) 5421 return src.Length;
4994 {
4995 return 0;
4996 }
4997 else
4998 {
4999 return src.Length;
5000 }
5001 } 5422 }
5002 5423
5003 public LSL_Integer llList2Integer(LSL_List src, int index) 5424 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -5068,7 +5489,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5068 else if (src.Data[index] is LSL_Float) 5489 else if (src.Data[index] is LSL_Float)
5069 return Convert.ToDouble(((LSL_Float)src.Data[index]).value); 5490 return Convert.ToDouble(((LSL_Float)src.Data[index]).value);
5070 else if (src.Data[index] is LSL_String) 5491 else if (src.Data[index] is LSL_String)
5071 return Convert.ToDouble(((LSL_String)src.Data[index]).m_string); 5492 {
5493 string str = ((LSL_String) src.Data[index]).m_string;
5494 Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)");
5495 if (m != Match.Empty)
5496 {
5497 str = m.Value;
5498 double d = 0.0;
5499 if (!Double.TryParse(str, out d))
5500 return 0.0;
5501
5502 return d;
5503 }
5504 return 0.0;
5505 }
5072 return Convert.ToDouble(src.Data[index]); 5506 return Convert.ToDouble(src.Data[index]);
5073 } 5507 }
5074 catch (FormatException) 5508 catch (FormatException)
@@ -5110,7 +5544,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5110 // for completion and should LSL_Key ever be implemented 5544 // for completion and should LSL_Key ever be implemented
5111 // as it's own struct 5545 // as it's own struct
5112 else if (!(src.Data[index] is LSL_String || 5546 else if (!(src.Data[index] is LSL_String ||
5113 src.Data[index] is LSL_Key)) 5547 src.Data[index] is LSL_Key ||
5548 src.Data[index] is String))
5114 { 5549 {
5115 return ""; 5550 return "";
5116 } 5551 }
@@ -5368,7 +5803,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5368 } 5803 }
5369 } 5804 }
5370 } 5805 }
5371 else { 5806 else
5807 {
5372 object[] array = new object[src.Length]; 5808 object[] array = new object[src.Length];
5373 Array.Copy(src.Data, 0, array, 0, src.Length); 5809 Array.Copy(src.Data, 0, array, 0, src.Length);
5374 result = new LSL_List(array); 5810 result = new LSL_List(array);
@@ -5475,7 +5911,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5475 public LSL_Integer llGetRegionAgentCount() 5911 public LSL_Integer llGetRegionAgentCount()
5476 { 5912 {
5477 m_host.AddScriptLPS(1); 5913 m_host.AddScriptLPS(1);
5478 return new LSL_Integer(World.GetRootAgentCount()); 5914
5915 int count = 0;
5916 World.ForEachRootScenePresence(delegate(ScenePresence sp) {
5917 count++;
5918 });
5919
5920 return new LSL_Integer(count);
5479 } 5921 }
5480 5922
5481 public LSL_Vector llGetRegionCorner() 5923 public LSL_Vector llGetRegionCorner()
@@ -5716,6 +6158,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5716 flags |= ScriptBaseClass.AGENT_AWAY; 6158 flags |= ScriptBaseClass.AGENT_AWAY;
5717 } 6159 }
5718 6160
6161 UUID busy = new UUID("efcf670c-2d18-8128-973a-034ebc806b67");
6162 UUID[] anims = agent.Animator.GetAnimationArray();
6163 if (Array.Exists<UUID>(anims, a => { return a == busy; }))
6164 {
6165 flags |= ScriptBaseClass.AGENT_BUSY;
6166 }
6167
5719 // seems to get unset, even if in mouselook, when avatar is sitting on a prim??? 6168 // seems to get unset, even if in mouselook, when avatar is sitting on a prim???
5720 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0) 6169 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
5721 { 6170 {
@@ -5763,6 +6212,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5763 flags |= ScriptBaseClass.AGENT_SITTING; 6212 flags |= ScriptBaseClass.AGENT_SITTING;
5764 } 6213 }
5765 6214
6215 if (agent.Appearance.VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MALE] > 0)
6216 {
6217 flags |= ScriptBaseClass.AGENT_MALE;
6218 }
6219
5766 return flags; 6220 return flags;
5767 } 6221 }
5768 6222
@@ -5908,9 +6362,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5908 6362
5909 List<SceneObjectPart> parts = GetLinkParts(linknumber); 6363 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5910 6364
5911 foreach (SceneObjectPart part in parts) 6365 try
6366 {
6367 foreach (SceneObjectPart part in parts)
6368 {
6369 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
6370 }
6371 }
6372 finally
5912 { 6373 {
5913 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
5914 } 6374 }
5915 } 6375 }
5916 6376
@@ -5964,13 +6424,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5964 6424
5965 if (m_host.OwnerID == land.LandData.OwnerID) 6425 if (m_host.OwnerID == land.LandData.OwnerID)
5966 { 6426 {
5967 World.TeleportClientHome(agentID, presence.ControllingClient); 6427 Vector3 p = World.GetNearestAllowedPosition(presence, land);
6428 presence.TeleportWithMomentum(p, null);
6429 presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
5968 } 6430 }
5969 } 6431 }
5970 } 6432 }
5971 ScriptSleep(5000); 6433 ScriptSleep(5000);
5972 } 6434 }
5973 6435
6436 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
6437 {
6438 return ParseString2List(str, separators, in_spacers, false);
6439 }
6440
5974 public LSL_Integer llOverMyLand(string id) 6441 public LSL_Integer llOverMyLand(string id)
5975 { 6442 {
5976 m_host.AddScriptLPS(1); 6443 m_host.AddScriptLPS(1);
@@ -6023,26 +6490,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6023 } 6490 }
6024 else 6491 else
6025 { 6492 {
6026 agentSize = GetAgentSize(avatar); 6493// agentSize = new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight);
6494 Vector3 s = avatar.Appearance.AvatarSize;
6495 agentSize = new LSL_Vector(s.X, s.Y, s.Z);
6027 } 6496 }
6028
6029 return agentSize; 6497 return agentSize;
6030 } 6498 }
6031 6499
6032 public LSL_Integer llSameGroup(string agent) 6500 public LSL_Integer llSameGroup(string id)
6033 { 6501 {
6034 m_host.AddScriptLPS(1); 6502 m_host.AddScriptLPS(1);
6035 UUID agentId = new UUID(); 6503 UUID uuid = new UUID();
6036 if (!UUID.TryParse(agent, out agentId)) 6504 if (!UUID.TryParse(id, out uuid))
6037 return new LSL_Integer(0); 6505 return new LSL_Integer(0);
6038 ScenePresence presence = World.GetScenePresence(agentId); 6506
6039 if (presence == null || presence.IsChildAgent) // Return flase for child agents 6507 // Check if it's a group key
6040 return new LSL_Integer(0); 6508 if (uuid == m_host.ParentGroup.RootPart.GroupID)
6041 IClientAPI client = presence.ControllingClient;
6042 if (m_host.GroupID == client.ActiveGroupId)
6043 return new LSL_Integer(1); 6509 return new LSL_Integer(1);
6044 else 6510
6511 // We got passed a UUID.Zero
6512 if (uuid == UUID.Zero)
6513 return new LSL_Integer(0);
6514
6515 // Handle the case where id names an avatar
6516 ScenePresence presence = World.GetScenePresence(uuid);
6517 if (presence != null)
6518 {
6519 if (presence.IsChildAgent)
6520 return new LSL_Integer(0);
6521
6522 IClientAPI client = presence.ControllingClient;
6523 if (m_host.ParentGroup.RootPart.GroupID == client.ActiveGroupId)
6524 return new LSL_Integer(1);
6525
6526 return new LSL_Integer(0);
6527 }
6528
6529 // Handle object case
6530 SceneObjectPart part = World.GetSceneObjectPart(uuid);
6531 if (part != null)
6532 {
6533 // This will handle both deed and non-deed and also the no
6534 // group case
6535 if (part.ParentGroup.RootPart.GroupID == m_host.ParentGroup.RootPart.GroupID)
6536 return new LSL_Integer(1);
6537
6045 return new LSL_Integer(0); 6538 return new LSL_Integer(0);
6539 }
6540
6541 return new LSL_Integer(0);
6046 } 6542 }
6047 6543
6048 public void llUnSit(string id) 6544 public void llUnSit(string id)
@@ -6605,6 +7101,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6605 7101
6606 protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot) 7102 protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot)
6607 { 7103 {
7104 // LSL quaternions can normalize to 0, normal Quaternions can't.
7105 if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0)
7106 rot.s = 1; // ZERO_ROTATION = 0,0,0,1
7107
6608 part.SitTargetPosition = offset; 7108 part.SitTargetPosition = offset;
6609 part.SitTargetOrientation = rot; 7109 part.SitTargetOrientation = rot;
6610 part.ParentGroup.HasGroupChanged = true; 7110 part.ParentGroup.HasGroupChanged = true;
@@ -6791,30 +7291,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6791 UUID av = new UUID(); 7291 UUID av = new UUID();
6792 if (!UUID.TryParse(avatar,out av)) 7292 if (!UUID.TryParse(avatar,out av))
6793 { 7293 {
6794 LSLError("First parameter to llDialog needs to be a key"); 7294 //LSLError("First parameter to llDialog needs to be a key");
6795 return; 7295 return;
6796 } 7296 }
6797 if (buttons.Length < 1) 7297 if (buttons.Length < 1)
6798 { 7298 {
6799 LSLError("No less than 1 button can be shown"); 7299 buttons.Add("OK");
6800 return;
6801 } 7300 }
6802 if (buttons.Length > 12) 7301 if (buttons.Length > 12)
6803 { 7302 {
6804 LSLError("No more than 12 buttons can be shown"); 7303 ShoutError("button list too long, must be 12 or fewer entries");
6805 return;
6806 } 7304 }
6807 string[] buts = new string[buttons.Length]; 7305 int length = buttons.Length;
6808 for (int i = 0; i < buttons.Length; i++) 7306 if (length > 12)
7307 length = 12;
7308
7309 string[] buts = new string[length];
7310 for (int i = 0; i < length; i++)
6809 { 7311 {
6810 if (buttons.Data[i].ToString() == String.Empty) 7312 if (buttons.Data[i].ToString() == String.Empty)
6811 { 7313 {
6812 LSLError("button label cannot be blank"); 7314 ShoutError("button label cannot be blank");
6813 return; 7315 return;
6814 } 7316 }
6815 if (buttons.Data[i].ToString().Length > 24) 7317 if (buttons.Data[i].ToString().Length > 24)
6816 { 7318 {
6817 LSLError("button label cannot be longer than 24 characters"); 7319 ShoutError("button label cannot be longer than 24 characters");
6818 return; 7320 return;
6819 } 7321 }
6820 buts[i] = buttons.Data[i].ToString(); 7322 buts[i] = buttons.Data[i].ToString();
@@ -6881,9 +7383,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6881 return; 7383 return;
6882 } 7384 }
6883 7385
6884 // the rest of the permission checks are done in RezScript, so check the pin there as well 7386 SceneObjectPart dest = World.GetSceneObjectPart(destId);
6885 World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); 7387 if (dest != null)
7388 {
7389 if ((item.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID)
7390 {
7391 // the rest of the permission checks are done in RezScript, so check the pin there as well
7392 World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param);
6886 7393
7394 if ((item.BasePermissions & (uint)PermissionMask.Copy) == 0)
7395 m_host.Inventory.RemoveInventoryItem(item.ItemID);
7396 }
7397 }
6887 // this will cause the delay even if the script pin or permissions were wrong - seems ok 7398 // this will cause the delay even if the script pin or permissions were wrong - seems ok
6888 ScriptSleep(3000); 7399 ScriptSleep(3000);
6889 } 7400 }
@@ -6957,19 +7468,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6957 public LSL_String llMD5String(string src, int nonce) 7468 public LSL_String llMD5String(string src, int nonce)
6958 { 7469 {
6959 m_host.AddScriptLPS(1); 7470 m_host.AddScriptLPS(1);
6960 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString())); 7471 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()), Encoding.UTF8);
6961 } 7472 }
6962 7473
6963 public LSL_String llSHA1String(string src) 7474 public LSL_String llSHA1String(string src)
6964 { 7475 {
6965 m_host.AddScriptLPS(1); 7476 m_host.AddScriptLPS(1);
6966 return Util.SHA1Hash(src).ToLower(); 7477 return Util.SHA1Hash(src, Encoding.UTF8).ToLower();
6967 } 7478 }
6968 7479
6969 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) 7480 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve)
6970 { 7481 {
6971 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7482 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6972 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7483 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7484 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7485 return shapeBlock;
6973 7486
6974 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 7487 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6975 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 7488 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -7074,6 +7587,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7074 // Prim type box, cylinder and prism. 7587 // Prim type box, cylinder and prism.
7075 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte profileshape, byte pathcurve) 7588 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte profileshape, byte pathcurve)
7076 { 7589 {
7590 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7591 return;
7592
7077 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7593 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
7078 ObjectShapePacket.ObjectDataBlock shapeBlock; 7594 ObjectShapePacket.ObjectDataBlock shapeBlock;
7079 7595
@@ -7127,6 +7643,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7127 // Prim type sphere. 7643 // Prim type sphere.
7128 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve) 7644 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve)
7129 { 7645 {
7646 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7647 return;
7648
7130 ObjectShapePacket.ObjectDataBlock shapeBlock; 7649 ObjectShapePacket.ObjectDataBlock shapeBlock;
7131 7650
7132 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve); 7651 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve);
@@ -7168,6 +7687,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7168 // Prim type torus, tube and ring. 7687 // Prim type torus, tube and ring.
7169 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte profileshape, byte pathcurve) 7688 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte profileshape, byte pathcurve)
7170 { 7689 {
7690 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7691 return;
7692
7171 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7693 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
7172 ObjectShapePacket.ObjectDataBlock shapeBlock; 7694 ObjectShapePacket.ObjectDataBlock shapeBlock;
7173 7695
@@ -7303,6 +7825,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7303 // Prim type sculpt. 7825 // Prim type sculpt.
7304 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve) 7826 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve)
7305 { 7827 {
7828 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7829 return;
7830
7306 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7831 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7307 UUID sculptId; 7832 UUID sculptId;
7308 7833
@@ -7325,7 +7850,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7325 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag)) 7850 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag))
7326 { 7851 {
7327 // default 7852 // default
7328 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7853 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
7329 } 7854 }
7330 7855
7331 part.Shape.SetSculptProperties((byte)type, sculptId); 7856 part.Shape.SetSculptProperties((byte)type, sculptId);
@@ -7342,15 +7867,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7342 ScriptSleep(200); 7867 ScriptSleep(200);
7343 } 7868 }
7344 7869
7345 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7346 {
7347 m_host.AddScriptLPS(1);
7348
7349 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
7350
7351 ScriptSleep(200);
7352 }
7353
7354 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7870 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
7355 { 7871 {
7356 m_host.AddScriptLPS(1); 7872 m_host.AddScriptLPS(1);
@@ -7358,169 +7874,135 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7358 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast"); 7874 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast");
7359 } 7875 }
7360 7876
7361 protected void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc) 7877 private void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc)
7362 { 7878 {
7363 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7879 List<object> parts = new List<object>();
7880 List<SceneObjectPart> prims = GetLinkParts(linknumber);
7881 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7882 foreach (SceneObjectPart p in prims)
7883 parts.Add(p);
7884 foreach (ScenePresence p in avatars)
7885 parts.Add(p);
7364 7886
7365 LSL_List remaining = null; 7887 LSL_List remaining = null;
7366 uint rulesParsed = 0; 7888 uint rulesParsed = 0;
7367 7889
7368 foreach (SceneObjectPart part in parts) 7890 if (parts.Count > 0)
7369 remaining = SetPrimParams(part, rules, originFunc, ref rulesParsed);
7370
7371 while (remaining != null && remaining.Length > 2)
7372 { 7891 {
7373 linknumber = remaining.GetLSLIntegerItem(0); 7892 foreach (object part in parts)
7374 rules = remaining.GetSublist(1, -1);
7375 parts = GetLinkParts(linknumber);
7376
7377 foreach (SceneObjectPart part in parts)
7378 remaining = SetPrimParams(part, rules, originFunc, ref rulesParsed);
7379 }
7380 }
7381
7382 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
7383 {
7384 SceneObjectGroup group = m_host.ParentGroup;
7385
7386 if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
7387 return;
7388 if (group.IsAttachment)
7389 return;
7390
7391 if (frames.Data.Length > 0) // We are getting a new motion
7392 {
7393 if (group.RootPart.KeyframeMotion != null)
7394 group.RootPart.KeyframeMotion.Delete();
7395 group.RootPart.KeyframeMotion = null;
7396
7397 int idx = 0;
7398
7399 KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
7400 KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
7401
7402 while (idx < options.Data.Length)
7403 { 7893 {
7404 int option = (int)options.GetLSLIntegerItem(idx++); 7894 if (part is SceneObjectPart)
7405 int remain = options.Data.Length - idx; 7895 remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
7896 else
7897 remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
7898 }
7406 7899
7407 switch (option) 7900 while ((object)remaining != null && remaining.Length > 2)
7901 {
7902 linknumber = remaining.GetLSLIntegerItem(0);
7903 rules = remaining.GetSublist(1, -1);
7904 parts.Clear();
7905 prims = GetLinkParts(linknumber);
7906 avatars = GetLinkAvatars(linknumber);
7907 foreach (SceneObjectPart p in prims)
7908 parts.Add(p);
7909 foreach (ScenePresence p in avatars)
7910 parts.Add(p);
7911
7912 remaining = null;
7913 foreach (object part in parts)
7408 { 7914 {
7409 case ScriptBaseClass.KFM_MODE: 7915 if (part is SceneObjectPart)
7410 if (remain < 1) 7916 remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
7411 break; 7917 else
7412 int modeval = (int)options.GetLSLIntegerItem(idx++); 7918 remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
7413 switch(modeval)
7414 {
7415 case ScriptBaseClass.KFM_FORWARD:
7416 mode = KeyframeMotion.PlayMode.Forward;
7417 break;
7418 case ScriptBaseClass.KFM_REVERSE:
7419 mode = KeyframeMotion.PlayMode.Reverse;
7420 break;
7421 case ScriptBaseClass.KFM_LOOP:
7422 mode = KeyframeMotion.PlayMode.Loop;
7423 break;
7424 case ScriptBaseClass.KFM_PING_PONG:
7425 mode = KeyframeMotion.PlayMode.PingPong;
7426 break;
7427 }
7428 break;
7429 case ScriptBaseClass.KFM_DATA:
7430 if (remain < 1)
7431 break;
7432 int dataval = (int)options.GetLSLIntegerItem(idx++);
7433 data = (KeyframeMotion.DataFormat)dataval;
7434 break;
7435 } 7919 }
7436 } 7920 }
7921 }
7922 }
7437 7923
7438 group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data); 7924 public LSL_List llGetPhysicsMaterial()
7925 {
7926 LSL_List result = new LSL_List();
7439 7927
7440 idx = 0; 7928 result.Add(new LSL_Float(m_host.GravityModifier));
7929 result.Add(new LSL_Float(m_host.Restitution));
7930 result.Add(new LSL_Float(m_host.Friction));
7931 result.Add(new LSL_Float(m_host.Density));
7441 7932
7442 int elemLength = 2; 7933 return result;
7443 if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation)) 7934 }
7444 elemLength = 3;
7445 7935
7446 List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>(); 7936 private void SetPhysicsMaterial(SceneObjectPart part, int material_bits,
7447 while (idx < frames.Data.Length) 7937 float material_density, float material_friction,
7448 { 7938 float material_restitution, float material_gravity_modifier)
7449 int remain = frames.Data.Length - idx; 7939 {
7940 ExtraPhysicsData physdata = new ExtraPhysicsData();
7941 physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType;
7942 physdata.Density = part.Density;
7943 physdata.Friction = part.Friction;
7944 physdata.Bounce = part.Restitution;
7945 physdata.GravitationModifier = part.GravityModifier;
7450 7946
7451 if (remain < elemLength) 7947 if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0)
7452 break; 7948 physdata.Density = material_density;
7949 if ((material_bits & (int)ScriptBaseClass.FRICTION) != 0)
7950 physdata.Friction = material_friction;
7951 if ((material_bits & (int)ScriptBaseClass.RESTITUTION) != 0)
7952 physdata.Bounce = material_restitution;
7953 if ((material_bits & (int)ScriptBaseClass.GRAVITY_MULTIPLIER) != 0)
7954 physdata.GravitationModifier = material_gravity_modifier;
7453 7955
7454 KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe(); 7956 part.UpdateExtraPhysics(physdata);
7455 frame.Position = null; 7957 }
7456 frame.Rotation = null;
7457 7958
7458 if ((data & KeyframeMotion.DataFormat.Translation) != 0) 7959 public void llSetPhysicsMaterial(int material_bits,
7459 { 7960 float material_gravity_modifier, float material_restitution,
7460 LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++); 7961 float material_friction, float material_density)
7461 frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z); 7962 {
7462 } 7963 SetPhysicsMaterial(m_host, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
7463 if ((data & KeyframeMotion.DataFormat.Rotation) != 0) 7964 }
7464 {
7465 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
7466 Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
7467 q.Normalize();
7468 frame.Rotation = q;
7469 }
7470 7965
7471 float tempf = (float)frames.GetLSLFloatItem(idx++); 7966 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7472 frame.TimeMS = (int)(tempf * 1000.0f); 7967 {
7968 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
7969 llSetLinkPrimitiveParamsFast(linknumber, rules);
7970 ScriptSleep(200);
7971 }
7473 7972
7474 keyframes.Add(frame); 7973 // vector up using libomv (c&p from sop )
7475 } 7974 // vector up rotated by r
7975 private Vector3 Zrot(Quaternion r)
7976 {
7977 double x, y, z, m;
7476 7978
7477 group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray()); 7979 m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
7478 group.RootPart.KeyframeMotion.Start(); 7980 if (Math.Abs(1.0 - m) > 0.000001)
7479 }
7480 else
7481 { 7981 {
7482 if (group.RootPart.KeyframeMotion == null) 7982 m = 1.0 / Math.Sqrt(m);
7483 return; 7983 r.X *= (float)m;
7484 7984 r.Y *= (float)m;
7485 if (options.Data.Length == 0) 7985 r.Z *= (float)m;
7486 { 7986 r.W *= (float)m;
7487 group.RootPart.KeyframeMotion.Stop(); 7987 }
7488 return;
7489 }
7490
7491 int idx = 0;
7492 7988
7493 while (idx < options.Data.Length) 7989 x = 2 * (r.X * r.Z + r.Y * r.W);
7494 { 7990 y = 2 * (-r.X * r.W + r.Y * r.Z);
7495 int option = (int)options.GetLSLIntegerItem(idx++); 7991 z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
7496 7992
7497 switch (option) 7993 return new Vector3((float)x, (float)y, (float)z);
7498 {
7499 case ScriptBaseClass.KFM_COMMAND:
7500 int cmd = (int)options.GetLSLIntegerItem(idx++);
7501 switch (cmd)
7502 {
7503 case ScriptBaseClass.KFM_CMD_PLAY:
7504 group.RootPart.KeyframeMotion.Start();
7505 break;
7506 case ScriptBaseClass.KFM_CMD_STOP:
7507 group.RootPart.KeyframeMotion.Stop();
7508 break;
7509 case ScriptBaseClass.KFM_CMD_PAUSE:
7510 group.RootPart.KeyframeMotion.Pause();
7511 break;
7512 }
7513 break;
7514 }
7515 }
7516 }
7517 } 7994 }
7518 7995
7519 protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules, string originFunc, ref uint rulesParsed) 7996 protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules, string originFunc, ref uint rulesParsed)
7520 { 7997 {
7998 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7999 return null;
8000
7521 int idx = 0; 8001 int idx = 0;
7522 int idxStart = 0; 8002 int idxStart = 0;
7523 8003
8004 SceneObjectGroup parentgrp = part.ParentGroup;
8005
7524 bool positionChanged = false; 8006 bool positionChanged = false;
7525 LSL_Vector currentPosition = GetPartLocalPos(part); 8007 LSL_Vector currentPosition = GetPartLocalPos(part);
7526 8008
@@ -7545,8 +8027,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7545 return null; 8027 return null;
7546 8028
7547 v=rules.GetVector3Item(idx++); 8029 v=rules.GetVector3Item(idx++);
8030 if (part.IsRoot && !part.ParentGroup.IsAttachment)
8031 currentPosition = GetSetPosTarget(part, v, currentPosition, true);
8032 else
8033 currentPosition = GetSetPosTarget(part, v, currentPosition, false);
7548 positionChanged = true; 8034 positionChanged = true;
7549 currentPosition = GetSetPosTarget(part, v, currentPosition);
7550 8035
7551 break; 8036 break;
7552 case (int)ScriptBaseClass.PRIM_SIZE: 8037 case (int)ScriptBaseClass.PRIM_SIZE:
@@ -7563,7 +8048,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7563 8048
7564 LSL_Rotation q = rules.GetQuaternionItem(idx++); 8049 LSL_Rotation q = rules.GetQuaternionItem(idx++);
7565 // try to let this work as in SL... 8050 // try to let this work as in SL...
7566 if (part.ParentID == 0) 8051 if (part.ParentID == 0 || (part.ParentGroup != null && part == part.ParentGroup.RootPart))
7567 { 8052 {
7568 // special case: If we are root, rotate complete SOG to new rotation 8053 // special case: If we are root, rotate complete SOG to new rotation
7569 SetRot(part, q); 8054 SetRot(part, q);
@@ -7857,6 +8342,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7857 8342
7858 break; 8343 break;
7859 8344
8345 case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
8346 if (remain < 5)
8347 return null;
8348
8349 int material_bits = rules.GetLSLIntegerItem(idx++);
8350 float material_density = (float)rules.GetLSLFloatItem(idx++);
8351 float material_friction = (float)rules.GetLSLFloatItem(idx++);
8352 float material_restitution = (float)rules.GetLSLFloatItem(idx++);
8353 float material_gravity_modifier = (float)rules.GetLSLFloatItem(idx++);
8354
8355 SetPhysicsMaterial(part, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
8356
8357 break;
8358
7860 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ: 8359 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
7861 if (remain < 1) 8360 if (remain < 1)
7862 return null; 8361 return null;
@@ -7936,14 +8435,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7936 if (part.ParentGroup.RootPart == part) 8435 if (part.ParentGroup.RootPart == part)
7937 { 8436 {
7938 SceneObjectGroup parent = part.ParentGroup; 8437 SceneObjectGroup parent = part.ParentGroup;
7939 parent.UpdateGroupPosition(currentPosition); 8438 Util.FireAndForget(delegate(object x) {
8439 parent.UpdateGroupPosition(currentPosition);
8440 });
7940 } 8441 }
7941 else 8442 else
7942 { 8443 {
7943 part.OffsetPosition = currentPosition; 8444 part.OffsetPosition = currentPosition;
7944 SceneObjectGroup parent = part.ParentGroup; 8445// SceneObjectGroup parent = part.ParentGroup;
7945 parent.HasGroupChanged = true; 8446// parent.HasGroupChanged = true;
7946 parent.ScheduleGroupForTerseUpdate(); 8447// parent.ScheduleGroupForTerseUpdate();
8448 part.ScheduleTerseUpdate();
7947 } 8449 }
7948 } 8450 }
7949 } 8451 }
@@ -7981,10 +8483,91 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7981 8483
7982 public LSL_String llXorBase64Strings(string str1, string str2) 8484 public LSL_String llXorBase64Strings(string str1, string str2)
7983 { 8485 {
7984 m_host.AddScriptLPS(1); 8486 string b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
7985 Deprecated("llXorBase64Strings"); 8487
7986 ScriptSleep(300); 8488 ScriptSleep(300);
7987 return String.Empty; 8489 m_host.AddScriptLPS(1);
8490
8491 if (str1 == String.Empty)
8492 return String.Empty;
8493 if (str2 == String.Empty)
8494 return str1;
8495
8496 int len = str2.Length;
8497 if ((len % 4) != 0) // LL is EVIL!!!!
8498 {
8499 while (str2.EndsWith("="))
8500 str2 = str2.Substring(0, str2.Length - 1);
8501
8502 len = str2.Length;
8503 int mod = len % 4;
8504
8505 if (mod == 1)
8506 str2 = str2.Substring(0, str2.Length - 1);
8507 else if (mod == 2)
8508 str2 += "==";
8509 else if (mod == 3)
8510 str2 += "=";
8511 }
8512
8513 byte[] data1;
8514 byte[] data2;
8515 try
8516 {
8517 data1 = Convert.FromBase64String(str1);
8518 data2 = Convert.FromBase64String(str2);
8519 }
8520 catch (Exception)
8521 {
8522 return new LSL_String(String.Empty);
8523 }
8524
8525 // For cases where the decoded length of s2 is greater
8526 // than the decoded length of s1, simply perform a normal
8527 // decode and XOR
8528 //
8529 if (data2.Length >= data1.Length)
8530 {
8531 for (int pos = 0 ; pos < data1.Length ; pos++ )
8532 data1[pos] ^= data2[pos];
8533
8534 return Convert.ToBase64String(data1);
8535 }
8536
8537 // Remove padding
8538 while (str1.EndsWith("="))
8539 str1 = str1.Substring(0, str1.Length - 1);
8540 while (str2.EndsWith("="))
8541 str2 = str2.Substring(0, str2.Length - 1);
8542
8543 byte[] d1 = new byte[str1.Length];
8544 byte[] d2 = new byte[str2.Length];
8545
8546 for (int i = 0 ; i < str1.Length ; i++)
8547 {
8548 int idx = b64.IndexOf(str1.Substring(i, 1));
8549 if (idx == -1)
8550 idx = 0;
8551 d1[i] = (byte)idx;
8552 }
8553
8554 for (int i = 0 ; i < str2.Length ; i++)
8555 {
8556 int idx = b64.IndexOf(str2.Substring(i, 1));
8557 if (idx == -1)
8558 idx = 0;
8559 d2[i] = (byte)idx;
8560 }
8561
8562 string output = String.Empty;
8563
8564 for (int pos = 0 ; pos < d1.Length ; pos++)
8565 output += b64[d1[pos] ^ d2[pos % d2.Length]];
8566
8567 while (output.Length % 3 > 0)
8568 output += "=";
8569
8570 return output;
7988 } 8571 }
7989 8572
7990 public void llRemoteDataSetRegion() 8573 public void llRemoteDataSetRegion()
@@ -8109,8 +8692,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8109 public LSL_Integer llGetNumberOfPrims() 8692 public LSL_Integer llGetNumberOfPrims()
8110 { 8693 {
8111 m_host.AddScriptLPS(1); 8694 m_host.AddScriptLPS(1);
8112 8695 int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
8113 return m_host.ParentGroup.PrimCount + m_host.ParentGroup.GetSittingAvatarsCount(); 8696
8697 return m_host.ParentGroup.PrimCount + avatarCount;
8114 } 8698 }
8115 8699
8116 /// <summary> 8700 /// <summary>
@@ -8125,55 +8709,114 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8125 m_host.AddScriptLPS(1); 8709 m_host.AddScriptLPS(1);
8126 UUID objID = UUID.Zero; 8710 UUID objID = UUID.Zero;
8127 LSL_List result = new LSL_List(); 8711 LSL_List result = new LSL_List();
8712
8713 // If the ID is not valid, return null result
8128 if (!UUID.TryParse(obj, out objID)) 8714 if (!UUID.TryParse(obj, out objID))
8129 { 8715 {
8130 result.Add(new LSL_Vector()); 8716 result.Add(new LSL_Vector());
8131 result.Add(new LSL_Vector()); 8717 result.Add(new LSL_Vector());
8132 return result; 8718 return result;
8133 } 8719 }
8720
8721 // Check if this is an attached prim. If so, replace
8722 // the UUID with the avatar UUID and report it's bounding box
8723 SceneObjectPart part = World.GetSceneObjectPart(objID);
8724 if (part != null && part.ParentGroup.IsAttachment)
8725 objID = part.ParentGroup.AttachedAvatar;
8726
8727 // Find out if this is an avatar ID. If so, return it's box
8134 ScenePresence presence = World.GetScenePresence(objID); 8728 ScenePresence presence = World.GetScenePresence(objID);
8135 if (presence != null) 8729 if (presence != null)
8136 { 8730 {
8137 if (presence.ParentID == 0) // not sat on an object 8731 // As per LSL Wiki, there is no difference between sitting
8732 // and standing avatar since server 1.36
8733 LSL_Vector lower;
8734 LSL_Vector upper;
8735
8736 Vector3 box = presence.Appearance.AvatarBoxSize * 0.5f;
8737
8738 if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID
8739 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
8740/*
8138 { 8741 {
8139 LSL_Vector lower; 8742 // This is for ground sitting avatars
8140 LSL_Vector upper; 8743 float height = presence.Appearance.AvatarHeight / 2.66666667f;
8141 if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID 8744 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
8142 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 8745 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
8143 {
8144 // This is for ground sitting avatars
8145 float height = presence.Appearance.AvatarHeight / 2.66666667f;
8146 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
8147 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
8148 }
8149 else
8150 {
8151 // This is for standing/flying avatars
8152 float height = presence.Appearance.AvatarHeight / 2.0f;
8153 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
8154 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
8155 }
8156 result.Add(lower);
8157 result.Add(upper);
8158 return result;
8159 } 8746 }
8160 else 8747 else
8161 { 8748 {
8162 // sitting on an object so we need the bounding box of that 8749 // This is for standing/flying avatars
8163 // which should include the avatar so set the UUID to the 8750 float height = presence.Appearance.AvatarHeight / 2.0f;
8164 // UUID of the object the avatar is sat on and allow it to fall through 8751 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
8165 // to processing an object 8752 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
8166 SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
8167 objID = p.UUID;
8168 } 8753 }
8754
8755 // Adjust to the documented error offsets (see LSL Wiki)
8756 lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
8757 upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
8758*/
8759 {
8760 // This is for ground sitting avatars TODO!
8761 lower = new LSL_Vector(-box.X - 0.1125, -box.Y, box.Z * -1.0f);
8762 upper = new LSL_Vector(box.X + 0.1125, box.Y, box.Z * -1.0f);
8763 }
8764 else
8765 {
8766 // This is for standing/flying avatars
8767 lower = new LSL_Vector(-box.X, -box.Y, -box.Z);
8768 upper = new LSL_Vector(box.X, box.Y, box.Z);
8769 }
8770
8771 if (lower.x > upper.x)
8772 lower.x = upper.x;
8773 if (lower.y > upper.y)
8774 lower.y = upper.y;
8775 if (lower.z > upper.z)
8776 lower.z = upper.z;
8777
8778 result.Add(lower);
8779 result.Add(upper);
8780 return result;
8169 } 8781 }
8170 SceneObjectPart part = World.GetSceneObjectPart(objID); 8782
8783 part = World.GetSceneObjectPart(objID);
8171 // Currently only works for single prims without a sitting avatar 8784 // Currently only works for single prims without a sitting avatar
8172 if (part != null) 8785 if (part != null)
8173 { 8786 {
8174 Vector3 halfSize = part.Scale / 2.0f; 8787 float minX;
8175 LSL_Vector lower = (new LSL_Vector(halfSize)) * -1.0f; 8788 float maxX;
8176 LSL_Vector upper = new LSL_Vector(halfSize); 8789 float minY;
8790 float maxY;
8791 float minZ;
8792 float maxZ;
8793
8794 // This BBox is in sim coordinates, with the offset being
8795 // a contained point.
8796 Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
8797 out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
8798
8799 minX -= offsets[0].X;
8800 maxX -= offsets[0].X;
8801 minY -= offsets[0].Y;
8802 maxY -= offsets[0].Y;
8803 minZ -= offsets[0].Z;
8804 maxZ -= offsets[0].Z;
8805
8806 LSL_Vector lower;
8807 LSL_Vector upper;
8808
8809 // Adjust to the documented error offsets (see LSL Wiki)
8810 lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
8811 upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
8812
8813 if (lower.x > upper.x)
8814 lower.x = upper.x;
8815 if (lower.y > upper.y)
8816 lower.y = upper.y;
8817 if (lower.z > upper.z)
8818 lower.z = upper.z;
8819
8177 result.Add(lower); 8820 result.Add(lower);
8178 result.Add(upper); 8821 result.Add(upper);
8179 return result; 8822 return result;
@@ -8190,227 +8833,70 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8190 return new LSL_Vector(m_host.GetGeometricCenter()); 8833 return new LSL_Vector(m_host.GetGeometricCenter());
8191 } 8834 }
8192 8835
8193 public LSL_List GetEntityParams(ISceneEntity entity, LSL_List rules) 8836 public LSL_List llGetPrimitiveParams(LSL_List rules)
8194 { 8837 {
8195 LSL_List result = new LSL_List(); 8838 m_host.AddScriptLPS(1);
8196 LSL_List remaining = null;
8197
8198 while (true)
8199 {
8200// m_log.DebugFormat(
8201// "[LSL API]: GetEntityParams has {0} rules with scene entity named {1}",
8202// rules.Length, entity != null ? entity.Name : "NULL");
8203
8204 if (entity == null)
8205 return result;
8206 8839
8207 if (entity is SceneObjectPart) 8840 LSL_List result = new LSL_List();
8208 remaining = GetPrimParams((SceneObjectPart)entity, rules, ref result);
8209 else
8210 remaining = GetAgentParams((ScenePresence)entity, rules, ref result);
8211 8841
8212 if (remaining == null || remaining.Length < 2) 8842 LSL_List remaining = GetPrimParams(m_host, rules, ref result);
8213 return result;
8214 8843
8844 while ((object)remaining != null && remaining.Length > 2)
8845 {
8215 int linknumber = remaining.GetLSLIntegerItem(0); 8846 int linknumber = remaining.GetLSLIntegerItem(0);
8216 rules = remaining.GetSublist(1, -1); 8847 rules = remaining.GetSublist(1, -1);
8217 entity = GetLinkEntity(linknumber); 8848 List<SceneObjectPart> parts = GetLinkParts(linknumber);
8218 }
8219 }
8220 8849
8221 public LSL_List llGetPrimitiveParams(LSL_List rules) 8850 foreach (SceneObjectPart part in parts)
8222 { 8851 remaining = GetPrimParams(part, rules, ref result);
8223 m_host.AddScriptLPS(1); 8852 }
8224 8853
8225 return GetEntityParams(m_host, rules); 8854 return result;
8226 } 8855 }
8227 8856
8228 public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules) 8857 public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules)
8229 { 8858 {
8230 m_host.AddScriptLPS(1); 8859 m_host.AddScriptLPS(1);
8231 8860
8232 return GetEntityParams(GetLinkEntity(linknumber), rules); 8861 // acording to SL wiki this must indicate a single link number or link_root or link_this.
8233 } 8862 // keep other options as before
8234 8863
8235 public LSL_Vector GetAgentSize(ScenePresence sp) 8864 List<SceneObjectPart> parts;
8236 { 8865 List<ScenePresence> avatars;
8237 return new LSL_Vector(0.45, 0.6, sp.Appearance.AvatarHeight); 8866
8238 } 8867 LSL_List res = new LSL_List();
8868 LSL_List remaining = null;
8239 8869
8240 /// <summary> 8870 while (rules.Length > 0)
8241 /// Gets params for a seated avatar in a linkset.
8242 /// </summary>
8243 /// <returns></returns>
8244 /// <param name='sp'></param>
8245 /// <param name='rules'></param>
8246 /// <param name='res'></param>
8247 public LSL_List GetAgentParams(ScenePresence sp, LSL_List rules, ref LSL_List res)
8248 {
8249 int idx = 0;
8250 while (idx < rules.Length)
8251 { 8871 {
8252 int code = (int)rules.GetLSLIntegerItem(idx++); 8872 parts = GetLinkParts(linknumber);
8253 int remain = rules.Length-idx; 8873 avatars = GetLinkAvatars(linknumber);
8254 8874
8255 switch (code) 8875 remaining = null;
8876 foreach (SceneObjectPart part in parts)
8256 { 8877 {
8257 case (int)ScriptBaseClass.PRIM_MATERIAL: 8878 remaining = GetPrimParams(part, rules, ref res);
8258 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_MATERIAL_FLESH)); 8879 }
8259 break; 8880 foreach (ScenePresence avatar in avatars)
8260 8881 {
8261 case (int)ScriptBaseClass.PRIM_PHYSICS: 8882 remaining = GetPrimParams(avatar, rules, ref res);
8262 res.Add(ScriptBaseClass.FALSE); 8883 }
8263 break;
8264
8265 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
8266 res.Add(ScriptBaseClass.FALSE);
8267 break;
8268
8269 case (int)ScriptBaseClass.PRIM_PHANTOM:
8270 res.Add(ScriptBaseClass.FALSE);
8271 break;
8272
8273 case (int)ScriptBaseClass.PRIM_POSITION:
8274 res.Add(new LSL_Vector(sp.AbsolutePosition));
8275 break;
8276
8277 case (int)ScriptBaseClass.PRIM_SIZE:
8278 res.Add(GetAgentSize(sp));
8279 break;
8280
8281 case (int)ScriptBaseClass.PRIM_ROTATION:
8282 res.Add(sp.GetWorldRotation());
8283 break;
8284
8285 case (int)ScriptBaseClass.PRIM_TYPE:
8286 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
8287 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
8288 res.Add(new LSL_Vector(0, 1, 0));
8289 res.Add(new LSL_Float(0));
8290 res.Add(new LSL_Vector(0, 0, 0));
8291 res.Add(new LSL_Vector(1, 1, 0));
8292 res.Add(new LSL_Vector(0, 0, 0));
8293 break;
8294
8295 case (int)ScriptBaseClass.PRIM_TEXTURE:
8296 if (remain < 1)
8297 return null;
8298
8299 int face = (int)rules.GetLSLIntegerItem(idx++);
8300 if (face > 21)
8301 break;
8302
8303 res.Add(new LSL_String(""));
8304 res.Add(ScriptBaseClass.ZERO_VECTOR);
8305 res.Add(ScriptBaseClass.ZERO_VECTOR);
8306 res.Add(new LSL_Float(0));
8307 break;
8308
8309 case (int)ScriptBaseClass.PRIM_COLOR:
8310 if (remain < 1)
8311 return null;
8312
8313 face = (int)rules.GetLSLIntegerItem(idx++);
8314 if (face > 21)
8315 break;
8316
8317 res.Add(ScriptBaseClass.ZERO_VECTOR);
8318 res.Add(new LSL_Float(0));
8319 break;
8320
8321 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
8322 if (remain < 1)
8323 return null;
8324
8325 face = (int)rules.GetLSLIntegerItem(idx++);
8326 if (face > 21)
8327 break;
8328
8329 res.Add(ScriptBaseClass.PRIM_SHINY_NONE);
8330 res.Add(ScriptBaseClass.PRIM_BUMP_NONE);
8331 break;
8332
8333 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
8334 if (remain < 1)
8335 return null;
8336
8337 face = (int)rules.GetLSLIntegerItem(idx++);
8338 if (face > 21)
8339 break;
8340
8341 res.Add(ScriptBaseClass.FALSE);
8342 break;
8343
8344 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
8345 res.Add(ScriptBaseClass.FALSE);
8346 res.Add(new LSL_Integer(0));
8347 res.Add(new LSL_Float(0));
8348 res.Add(new LSL_Float(0));
8349 res.Add(new LSL_Float(0));
8350 res.Add(new LSL_Float(0));
8351 res.Add(ScriptBaseClass.ZERO_VECTOR);
8352 break;
8353
8354 case (int)ScriptBaseClass.PRIM_TEXGEN:
8355 if (remain < 1)
8356 return null;
8357
8358 face = (int)rules.GetLSLIntegerItem(idx++);
8359 if (face > 21)
8360 break;
8361
8362 res.Add(ScriptBaseClass.PRIM_TEXGEN_DEFAULT);
8363 break;
8364
8365 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
8366 res.Add(ScriptBaseClass.FALSE);
8367 res.Add(ScriptBaseClass.ZERO_VECTOR);
8368 res.Add(ScriptBaseClass.ZERO_VECTOR);
8369 break;
8370
8371 case (int)ScriptBaseClass.PRIM_GLOW:
8372 if (remain < 1)
8373 return null;
8374
8375 face = (int)rules.GetLSLIntegerItem(idx++);
8376 if (face > 21)
8377 break;
8378
8379 res.Add(new LSL_Float(0));
8380 break;
8381
8382 case (int)ScriptBaseClass.PRIM_TEXT:
8383 res.Add(new LSL_String(""));
8384 res.Add(ScriptBaseClass.ZERO_VECTOR);
8385 res.Add(new LSL_Float(1));
8386 break;
8387
8388 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
8389 res.Add(new LSL_Rotation(sp.Rotation));
8390 break;
8391
8392 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
8393 res.Add(new LSL_Vector(sp.OffsetPosition));
8394 break;
8395
8396 case (int)ScriptBaseClass.PRIM_SLICE:
8397 res.Add(new LSL_Vector(0, 1, 0));
8398 break;
8399
8400 case (int)ScriptBaseClass.PRIM_LINK_TARGET:
8401 if(remain < 3)
8402 return null;
8403 8884
8404 return rules.GetSublist(idx, -1); 8885 if ((object)remaining != null && remaining.Length > 0)
8886 {
8887 linknumber = remaining.GetLSLIntegerItem(0);
8888 rules = remaining.GetSublist(1, -1);
8405 } 8889 }
8890 else
8891 break;
8406 } 8892 }
8407 8893
8408 return null; 8894 return res;
8409 } 8895 }
8410 8896
8411 public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules, ref LSL_List res) 8897 public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules, ref LSL_List res)
8412 { 8898 {
8413 int idx = 0; 8899 int idx=0;
8414 while (idx < rules.Length) 8900 while (idx < rules.Length)
8415 { 8901 {
8416 int code = (int)rules.GetLSLIntegerItem(idx++); 8902 int code = (int)rules.GetLSLIntegerItem(idx++);
@@ -8444,19 +8930,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8444 break; 8930 break;
8445 8931
8446 case (int)ScriptBaseClass.PRIM_POSITION: 8932 case (int)ScriptBaseClass.PRIM_POSITION:
8447 LSL_Vector v = new LSL_Vector(part.AbsolutePosition); 8933 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
8448 8934 part.AbsolutePosition.Y,
8449 // For some reason, the part.AbsolutePosition.* values do not change if the 8935 part.AbsolutePosition.Z);
8450 // linkset is rotated; they always reflect the child prim's world position
8451 // as though the linkset is unrotated. This is incompatible behavior with SL's
8452 // implementation, so will break scripts imported from there (not to mention it
8453 // makes it more difficult to determine a child prim's actual inworld position).
8454 if (!part.IsRoot)
8455 {
8456 LSL_Vector rootPos = new LSL_Vector(m_host.ParentGroup.AbsolutePosition);
8457 v = ((v - rootPos) * llGetRootRotation()) + rootPos;
8458 }
8459
8460 res.Add(v); 8936 res.Add(v);
8461 break; 8937 break;
8462 8938
@@ -8626,30 +9102,56 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8626 if (remain < 1) 9102 if (remain < 1)
8627 return null; 9103 return null;
8628 9104
8629 face=(int)rules.GetLSLIntegerItem(idx++); 9105 face = (int)rules.GetLSLIntegerItem(idx++);
8630 9106
8631 tex = part.Shape.Textures; 9107 tex = part.Shape.Textures;
9108 int shiny;
8632 if (face == ScriptBaseClass.ALL_SIDES) 9109 if (face == ScriptBaseClass.ALL_SIDES)
8633 { 9110 {
8634 for (face = 0; face < GetNumberOfSides(part); face++) 9111 for (face = 0; face < GetNumberOfSides(part); face++)
8635 { 9112 {
8636 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9113 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8637 // Convert Shininess to PRIM_SHINY_* 9114 if (shinyness == Shininess.High)
8638 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 9115 {
8639 // PRIM_BUMP_* 9116 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8640 res.Add(new LSL_Integer((int)texface.Bump)); 9117 }
9118 else if (shinyness == Shininess.Medium)
9119 {
9120 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
9121 }
9122 else if (shinyness == Shininess.Low)
9123 {
9124 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
9125 }
9126 else
9127 {
9128 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
9129 }
9130 res.Add(new LSL_Integer(shiny));
9131 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8641 } 9132 }
8642 } 9133 }
8643 else 9134 else
8644 { 9135 {
8645 if (face >= 0 && face < GetNumberOfSides(part)) 9136 Shininess shinyness = tex.GetFace((uint)face).Shiny;
9137 if (shinyness == Shininess.High)
8646 { 9138 {
8647 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9139 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8648 // Convert Shininess to PRIM_SHINY_*
8649 res.Add(new LSL_Integer((uint)texface.Shiny >> 6));
8650 // PRIM_BUMP_*
8651 res.Add(new LSL_Integer((int)texface.Bump));
8652 } 9140 }
9141 else if (shinyness == Shininess.Medium)
9142 {
9143 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
9144 }
9145 else if (shinyness == Shininess.Low)
9146 {
9147 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
9148 }
9149 else
9150 {
9151 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
9152 }
9153 res.Add(new LSL_Integer(shiny));
9154 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8653 } 9155 }
8654 break; 9156 break;
8655 9157
@@ -8660,21 +9162,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8660 face = (int)rules.GetLSLIntegerItem(idx++); 9162 face = (int)rules.GetLSLIntegerItem(idx++);
8661 9163
8662 tex = part.Shape.Textures; 9164 tex = part.Shape.Textures;
9165 int fullbright;
8663 if (face == ScriptBaseClass.ALL_SIDES) 9166 if (face == ScriptBaseClass.ALL_SIDES)
8664 { 9167 {
8665 for (face = 0; face < GetNumberOfSides(part); face++) 9168 for (face = 0; face < GetNumberOfSides(part); face++)
8666 { 9169 {
8667 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9170 if (tex.GetFace((uint)face).Fullbright == true)
8668 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 9171 {
9172 fullbright = ScriptBaseClass.TRUE;
9173 }
9174 else
9175 {
9176 fullbright = ScriptBaseClass.FALSE;
9177 }
9178 res.Add(new LSL_Integer(fullbright));
8669 } 9179 }
8670 } 9180 }
8671 else 9181 else
8672 { 9182 {
8673 if (face >= 0 && face < GetNumberOfSides(part)) 9183 if (tex.GetFace((uint)face).Fullbright == true)
8674 { 9184 {
8675 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9185 fullbright = ScriptBaseClass.TRUE;
8676 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 9186 }
9187 else
9188 {
9189 fullbright = ScriptBaseClass.FALSE;
8677 } 9190 }
9191 res.Add(new LSL_Integer(fullbright));
8678 } 9192 }
8679 break; 9193 break;
8680 9194
@@ -8696,27 +9210,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8696 break; 9210 break;
8697 9211
8698 case (int)ScriptBaseClass.PRIM_TEXGEN: 9212 case (int)ScriptBaseClass.PRIM_TEXGEN:
9213 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
8699 if (remain < 1) 9214 if (remain < 1)
8700 return null; 9215 return null;
8701 9216
8702 face=(int)rules.GetLSLIntegerItem(idx++); 9217 face = (int)rules.GetLSLIntegerItem(idx++);
8703 9218
8704 tex = part.Shape.Textures; 9219 tex = part.Shape.Textures;
8705 if (face == ScriptBaseClass.ALL_SIDES) 9220 if (face == ScriptBaseClass.ALL_SIDES)
8706 { 9221 {
8707 for (face = 0; face < GetNumberOfSides(part); face++) 9222 for (face = 0; face < GetNumberOfSides(part); face++)
8708 { 9223 {
8709 MappingType texgen = tex.GetFace((uint)face).TexMapType; 9224 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8710 // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc. 9225 {
8711 res.Add(new LSL_Integer((uint)texgen >> 1)); 9226 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
9227 }
9228 else
9229 {
9230 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
9231 }
8712 } 9232 }
8713 } 9233 }
8714 else 9234 else
8715 { 9235 {
8716 if (face >= 0 && face < GetNumberOfSides(part)) 9236 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
9237 {
9238 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
9239 }
9240 else
8717 { 9241 {
8718 MappingType texgen = tex.GetFace((uint)face).TexMapType; 9242 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8719 res.Add(new LSL_Integer((uint)texgen >> 1));
8720 } 9243 }
8721 } 9244 }
8722 break; 9245 break;
@@ -8740,24 +9263,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8740 if (remain < 1) 9263 if (remain < 1)
8741 return null; 9264 return null;
8742 9265
8743 face=(int)rules.GetLSLIntegerItem(idx++); 9266 face = (int)rules.GetLSLIntegerItem(idx++);
8744 9267
8745 tex = part.Shape.Textures; 9268 tex = part.Shape.Textures;
9269 float primglow;
8746 if (face == ScriptBaseClass.ALL_SIDES) 9270 if (face == ScriptBaseClass.ALL_SIDES)
8747 { 9271 {
8748 for (face = 0; face < GetNumberOfSides(part); face++) 9272 for (face = 0; face < GetNumberOfSides(part); face++)
8749 { 9273 {
8750 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9274 primglow = tex.GetFace((uint)face).Glow;
8751 res.Add(new LSL_Float(texface.Glow)); 9275 res.Add(new LSL_Float(primglow));
8752 } 9276 }
8753 } 9277 }
8754 else 9278 else
8755 { 9279 {
8756 if (face >= 0 && face < GetNumberOfSides(part)) 9280 primglow = tex.GetFace((uint)face).Glow;
8757 { 9281 res.Add(new LSL_Float(primglow));
8758 Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
8759 res.Add(new LSL_Float(texface.Glow));
8760 }
8761 } 9282 }
8762 break; 9283 break;
8763 9284
@@ -8769,15 +9290,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8769 textColor.B)); 9290 textColor.B));
8770 res.Add(new LSL_Float(textColor.A)); 9291 res.Add(new LSL_Float(textColor.A));
8771 break; 9292 break;
9293
8772 case (int)ScriptBaseClass.PRIM_NAME: 9294 case (int)ScriptBaseClass.PRIM_NAME:
8773 res.Add(new LSL_String(part.Name)); 9295 res.Add(new LSL_String(part.Name));
8774 break; 9296 break;
9297
8775 case (int)ScriptBaseClass.PRIM_DESC: 9298 case (int)ScriptBaseClass.PRIM_DESC:
8776 res.Add(new LSL_String(part.Description)); 9299 res.Add(new LSL_String(part.Description));
8777 break; 9300 break;
8778 case (int)ScriptBaseClass.PRIM_ROT_LOCAL: 9301 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
8779 res.Add(new LSL_Rotation(part.RotationOffset)); 9302 res.Add(new LSL_Rotation(part.RotationOffset));
8780 break; 9303 break;
9304
8781 case (int)ScriptBaseClass.PRIM_POS_LOCAL: 9305 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
8782 res.Add(new LSL_Vector(GetPartLocalPos(part))); 9306 res.Add(new LSL_Vector(GetPartLocalPos(part)));
8783 break; 9307 break;
@@ -9390,8 +9914,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9390 // The function returns an ordered list 9914 // The function returns an ordered list
9391 // representing the tokens found in the supplied 9915 // representing the tokens found in the supplied
9392 // sources string. If two successive tokenizers 9916 // sources string. If two successive tokenizers
9393 // are encountered, then a NULL entry is added 9917 // are encountered, then a null-string entry is
9394 // to the list. 9918 // added to the list.
9395 // 9919 //
9396 // It is a precondition that the source and 9920 // It is a precondition that the source and
9397 // toekizer lisst are non-null. If they are null, 9921 // toekizer lisst are non-null. If they are null,
@@ -9399,7 +9923,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9399 // while their lengths are being determined. 9923 // while their lengths are being determined.
9400 // 9924 //
9401 // A small amount of working memoryis required 9925 // A small amount of working memoryis required
9402 // of approximately 8*#tokenizers. 9926 // of approximately 8*#tokenizers + 8*srcstrlen.
9403 // 9927 //
9404 // There are many ways in which this function 9928 // There are many ways in which this function
9405 // can be implemented, this implementation is 9929 // can be implemented, this implementation is
@@ -9415,155 +9939,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9415 // and eliminates redundant tokenizers as soon 9939 // and eliminates redundant tokenizers as soon
9416 // as is possible. 9940 // as is possible.
9417 // 9941 //
9418 // The implementation tries to avoid any copying 9942 // The implementation tries to minimize temporary
9419 // of arrays or other objects. 9943 // garbage generation.
9420 // </remarks> 9944 // </remarks>
9421 9945
9422 private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) 9946 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
9423 { 9947 {
9424 int beginning = 0; 9948 return ParseString2List(src, separators, spacers, true);
9425 int srclen = src.Length; 9949 }
9426 int seplen = separators.Length;
9427 object[] separray = separators.Data;
9428 int spclen = spacers.Length;
9429 object[] spcarray = spacers.Data;
9430 int mlen = seplen+spclen;
9431
9432 int[] offset = new int[mlen+1];
9433 bool[] active = new bool[mlen];
9434
9435 int best;
9436 int j;
9437
9438 // Initial capacity reduces resize cost
9439 9950
9440 LSL_List tokens = new LSL_List(); 9951 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
9952 {
9953 int srclen = src.Length;
9954 int seplen = separators.Length;
9955 object[] separray = separators.Data;
9956 int spclen = spacers.Length;
9957 object[] spcarray = spacers.Data;
9958 int dellen = 0;
9959 string[] delarray = new string[seplen+spclen];
9441 9960
9442 // All entries are initially valid 9961 int outlen = 0;
9962 string[] outarray = new string[srclen*2+1];
9443 9963
9444 for (int i = 0; i < mlen; i++) 9964 int i, j;
9445 active[i] = true; 9965 string d;
9446 9966
9447 offset[mlen] = srclen; 9967 m_host.AddScriptLPS(1);
9448 9968
9449 while (beginning < srclen) 9969 /*
9970 * Convert separator and spacer lists to C# strings.
9971 * Also filter out null strings so we don't hang.
9972 */
9973 for (i = 0; i < seplen; i ++)
9450 { 9974 {
9975 d = separray[i].ToString();
9976 if (d.Length > 0)
9977 {
9978 delarray[dellen++] = d;
9979 }
9980 }
9981 seplen = dellen;
9451 9982
9452 best = mlen; // as bad as it gets 9983 for (i = 0; i < spclen; i ++)
9984 {
9985 d = spcarray[i].ToString();
9986 if (d.Length > 0)
9987 {
9988 delarray[dellen++] = d;
9989 }
9990 }
9453 9991
9454 // Scan for separators 9992 /*
9993 * Scan through source string from beginning to end.
9994 */
9995 for (i = 0;;)
9996 {
9455 9997
9456 for (j = 0; j < seplen; j++) 9998 /*
9999 * Find earliest delimeter in src starting at i (if any).
10000 */
10001 int earliestDel = -1;
10002 int earliestSrc = srclen;
10003 string earliestStr = null;
10004 for (j = 0; j < dellen; j ++)
9457 { 10005 {
9458 if (separray[j].ToString() == String.Empty) 10006 d = delarray[j];
9459 active[j] = false; 10007 if (d != null)
9460
9461 if (active[j])
9462 { 10008 {
9463 // scan all of the markers 10009 int index = src.IndexOf(d, i);
9464 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) 10010 if (index < 0)
9465 { 10011 {
9466 // not present at all 10012 delarray[j] = null; // delim nowhere in src, don't check it anymore
9467 active[j] = false;
9468 } 10013 }
9469 else 10014 else if (index < earliestSrc)
9470 { 10015 {
9471 // present and correct 10016 earliestSrc = index; // where delimeter starts in source string
9472 if (offset[j] < offset[best]) 10017 earliestDel = j; // where delimeter is in delarray[]
9473 { 10018 earliestStr = d; // the delimeter string from delarray[]
9474 // closest so far 10019 if (index == i) break; // can't do any better than found at beg of string
9475 best = j;
9476 if (offset[best] == beginning)
9477 break;
9478 }
9479 } 10020 }
9480 } 10021 }
9481 } 10022 }
9482 10023
9483 // Scan for spacers 10024 /*
9484 10025 * Output source string starting at i through start of earliest delimeter.
9485 if (offset[best] != beginning) 10026 */
10027 if (keepNulls || (earliestSrc > i))
9486 { 10028 {
9487 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 10029 outarray[outlen++] = src.Substring(i, earliestSrc - i);
9488 {
9489 if (spcarray[j-seplen].ToString() == String.Empty)
9490 active[j] = false;
9491
9492 if (active[j])
9493 {
9494 // scan all of the markers
9495 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
9496 {
9497 // not present at all
9498 active[j] = false;
9499 }
9500 else
9501 {
9502 // present and correct
9503 if (offset[j] < offset[best])
9504 {
9505 // closest so far
9506 best = j;
9507 }
9508 }
9509 }
9510 }
9511 } 10030 }
9512 10031
9513 // This is the normal exit from the scanning loop 10032 /*
10033 * If no delimeter found at or after i, we're done scanning.
10034 */
10035 if (earliestDel < 0) break;
9514 10036
9515 if (best == mlen) 10037 /*
10038 * If delimeter was a spacer, output the spacer.
10039 */
10040 if (earliestDel >= seplen)
9516 { 10041 {
9517 // no markers were found on this pass 10042 outarray[outlen++] = earliestStr;
9518 // so we're pretty much done
9519 if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
9520 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
9521 break;
9522 } 10043 }
9523 10044
9524 // Otherwise we just add the newly delimited token 10045 /*
9525 // and recalculate where the search should continue. 10046 * Look at rest of src string following delimeter.
9526 if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) 10047 */
9527 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 10048 i = earliestSrc + earliestStr.Length;
9528
9529 if (best < seplen)
9530 {
9531 beginning = offset[best] + (separray[best].ToString()).Length;
9532 }
9533 else
9534 {
9535 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
9536 string str = spcarray[best - seplen].ToString();
9537 if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
9538 tokens.Add(new LSL_String(str));
9539 }
9540 } 10049 }
9541 10050
9542 // This an awkward an not very intuitive boundary case. If the 10051 /*
9543 // last substring is a tokenizer, then there is an implied trailing 10052 * Make up an exact-sized output array suitable for an LSL_List object.
9544 // null list entry. Hopefully the single comparison will not be too 10053 */
9545 // arduous. Alternatively the 'break' could be replced with a return 10054 object[] outlist = new object[outlen];
9546 // but that's shabby programming. 10055 for (i = 0; i < outlen; i ++)
9547
9548 if ((beginning == srclen) && (keepNulls))
9549 { 10056 {
9550 if (srclen != 0) 10057 outlist[i] = new LSL_String(outarray[i]);
9551 tokens.Add(new LSL_String(""));
9552 } 10058 }
9553 10059 return new LSL_List(outlist);
9554 return tokens;
9555 }
9556
9557 public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
9558 {
9559 m_host.AddScriptLPS(1);
9560 return this.ParseString(src, separators, spacers, false);
9561 }
9562
9563 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
9564 {
9565 m_host.AddScriptLPS(1);
9566 return this.ParseString(src, separators, spacers, true);
9567 } 10060 }
9568 10061
9569 public LSL_Integer llGetObjectPermMask(int mask) 10062 public LSL_Integer llGetObjectPermMask(int mask)
@@ -9658,6 +10151,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9658 case 4: 10151 case 4:
9659 return (int)item.NextPermissions; 10152 return (int)item.NextPermissions;
9660 } 10153 }
10154 m_host.TaskInventory.LockItemsForRead(false);
9661 10155
9662 return -1; 10156 return -1;
9663 } 10157 }
@@ -9861,31 +10355,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9861 UUID key = new UUID(); 10355 UUID key = new UUID();
9862 if (UUID.TryParse(id, out key)) 10356 if (UUID.TryParse(id, out key))
9863 { 10357 {
9864 try 10358 // return total object mass
9865 { 10359 SceneObjectPart part = World.GetSceneObjectPart(key);
9866 SceneObjectPart obj = World.GetSceneObjectPart(World.Entities[key].LocalId); 10360 if (part != null)
9867 if (obj != null) 10361 return part.ParentGroup.GetMass();
9868 return (double)obj.GetMass(); 10362
9869 // the object is null so the key is for an avatar 10363 // the object is null so the key is for an avatar
9870 ScenePresence avatar = World.GetScenePresence(key); 10364 ScenePresence avatar = World.GetScenePresence(key);
9871 if (avatar != null) 10365 if (avatar != null)
9872 if (avatar.IsChildAgent)
9873 // reference http://www.lslwiki.net/lslwiki/wakka.php?wakka=llGetObjectMass
9874 // child agents have a mass of 1.0
9875 return 1;
9876 else
9877 return (double)avatar.GetMass();
9878 }
9879 catch (KeyNotFoundException)
9880 { 10366 {
9881 return 0; // The Object/Agent not in the region so just return zero 10367 if (avatar.IsChildAgent)
10368 {
10369 // reference http://www.lslwiki.net/lslwiki/wakka.php?wakka=llGetObjectMass
10370 // child agents have a mass of 1.0
10371 return 1;
10372 }
10373 else
10374 {
10375 return (double)avatar.GetMass();
10376 }
9882 } 10377 }
9883 } 10378 }
9884 return 0; 10379 return 0;
9885 } 10380 }
9886 10381
9887 /// <summary> 10382 /// <summary>
9888 /// illListReplaceList removes the sub-list defined by the inclusive indices 10383 /// llListReplaceList removes the sub-list defined by the inclusive indices
9889 /// start and end and inserts the src list in its place. The inclusive 10384 /// start and end and inserts the src list in its place. The inclusive
9890 /// nature of the indices means that at least one element must be deleted 10385 /// nature of the indices means that at least one element must be deleted
9891 /// if the indices are within the bounds of the existing list. I.e. 2,2 10386 /// if the indices are within the bounds of the existing list. I.e. 2,2
@@ -9942,16 +10437,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9942 // based upon end. Note that if end exceeds the upper 10437 // based upon end. Note that if end exceeds the upper
9943 // bound in this case, the entire destination list 10438 // bound in this case, the entire destination list
9944 // is removed. 10439 // is removed.
9945 else 10440 else if (start == 0)
9946 { 10441 {
9947 if (end + 1 < dest.Length) 10442 if (end + 1 < dest.Length)
9948 {
9949 return src + dest.GetSublist(end + 1, -1); 10443 return src + dest.GetSublist(end + 1, -1);
9950 }
9951 else 10444 else
9952 {
9953 return src; 10445 return src;
9954 } 10446 }
10447 else // Start < 0
10448 {
10449 if (end + 1 < dest.Length)
10450 return dest.GetSublist(end + 1, -1);
10451 else
10452 return new LSL_List();
9955 } 10453 }
9956 } 10454 }
9957 // Finally, if start > end, we strip away a prefix and 10455 // Finally, if start > end, we strip away a prefix and
@@ -10002,17 +10500,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10002 int width = 0; 10500 int width = 0;
10003 int height = 0; 10501 int height = 0;
10004 10502
10005 ParcelMediaCommandEnum? commandToSend = null; 10503 uint commandToSend = 0;
10006 float time = 0.0f; // default is from start 10504 float time = 0.0f; // default is from start
10007 10505
10008 ScenePresence presence = null; 10506 ScenePresence presence = null;
10009 10507
10010 for (int i = 0; i < commandList.Data.Length; i++) 10508 for (int i = 0; i < commandList.Data.Length; i++)
10011 { 10509 {
10012 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 10510 uint command = (uint)(commandList.GetLSLIntegerItem(i));
10013 switch (command) 10511 switch (command)
10014 { 10512 {
10015 case ParcelMediaCommandEnum.Agent: 10513 case (uint)ParcelMediaCommandEnum.Agent:
10016 // we send only to one agent 10514 // we send only to one agent
10017 if ((i + 1) < commandList.Length) 10515 if ((i + 1) < commandList.Length)
10018 { 10516 {
@@ -10029,25 +10527,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10029 } 10527 }
10030 break; 10528 break;
10031 10529
10032 case ParcelMediaCommandEnum.Loop: 10530 case (uint)ParcelMediaCommandEnum.Loop:
10033 loop = 1; 10531 loop = 1;
10034 commandToSend = command; 10532 commandToSend = command;
10035 update = true; //need to send the media update packet to set looping 10533 update = true; //need to send the media update packet to set looping
10036 break; 10534 break;
10037 10535
10038 case ParcelMediaCommandEnum.Play: 10536 case (uint)ParcelMediaCommandEnum.Play:
10039 loop = 0; 10537 loop = 0;
10040 commandToSend = command; 10538 commandToSend = command;
10041 update = true; //need to send the media update packet to make sure it doesn't loop 10539 update = true; //need to send the media update packet to make sure it doesn't loop
10042 break; 10540 break;
10043 10541
10044 case ParcelMediaCommandEnum.Pause: 10542 case (uint)ParcelMediaCommandEnum.Pause:
10045 case ParcelMediaCommandEnum.Stop: 10543 case (uint)ParcelMediaCommandEnum.Stop:
10046 case ParcelMediaCommandEnum.Unload: 10544 case (uint)ParcelMediaCommandEnum.Unload:
10047 commandToSend = command; 10545 commandToSend = command;
10048 break; 10546 break;
10049 10547
10050 case ParcelMediaCommandEnum.Url: 10548 case (uint)ParcelMediaCommandEnum.Url:
10051 if ((i + 1) < commandList.Length) 10549 if ((i + 1) < commandList.Length)
10052 { 10550 {
10053 if (commandList.Data[i + 1] is LSL_String) 10551 if (commandList.Data[i + 1] is LSL_String)
@@ -10060,7 +10558,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10060 } 10558 }
10061 break; 10559 break;
10062 10560
10063 case ParcelMediaCommandEnum.Texture: 10561 case (uint)ParcelMediaCommandEnum.Texture:
10064 if ((i + 1) < commandList.Length) 10562 if ((i + 1) < commandList.Length)
10065 { 10563 {
10066 if (commandList.Data[i + 1] is LSL_String) 10564 if (commandList.Data[i + 1] is LSL_String)
@@ -10073,7 +10571,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10073 } 10571 }
10074 break; 10572 break;
10075 10573
10076 case ParcelMediaCommandEnum.Time: 10574 case (uint)ParcelMediaCommandEnum.Time:
10077 if ((i + 1) < commandList.Length) 10575 if ((i + 1) < commandList.Length)
10078 { 10576 {
10079 if (commandList.Data[i + 1] is LSL_Float) 10577 if (commandList.Data[i + 1] is LSL_Float)
@@ -10085,7 +10583,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10085 } 10583 }
10086 break; 10584 break;
10087 10585
10088 case ParcelMediaCommandEnum.AutoAlign: 10586 case (uint)ParcelMediaCommandEnum.AutoAlign:
10089 if ((i + 1) < commandList.Length) 10587 if ((i + 1) < commandList.Length)
10090 { 10588 {
10091 if (commandList.Data[i + 1] is LSL_Integer) 10589 if (commandList.Data[i + 1] is LSL_Integer)
@@ -10099,7 +10597,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10099 } 10597 }
10100 break; 10598 break;
10101 10599
10102 case ParcelMediaCommandEnum.Type: 10600 case (uint)ParcelMediaCommandEnum.Type:
10103 if ((i + 1) < commandList.Length) 10601 if ((i + 1) < commandList.Length)
10104 { 10602 {
10105 if (commandList.Data[i + 1] is LSL_String) 10603 if (commandList.Data[i + 1] is LSL_String)
@@ -10112,7 +10610,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10112 } 10610 }
10113 break; 10611 break;
10114 10612
10115 case ParcelMediaCommandEnum.Desc: 10613 case (uint)ParcelMediaCommandEnum.Desc:
10116 if ((i + 1) < commandList.Length) 10614 if ((i + 1) < commandList.Length)
10117 { 10615 {
10118 if (commandList.Data[i + 1] is LSL_String) 10616 if (commandList.Data[i + 1] is LSL_String)
@@ -10125,7 +10623,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10125 } 10623 }
10126 break; 10624 break;
10127 10625
10128 case ParcelMediaCommandEnum.Size: 10626 case (uint)ParcelMediaCommandEnum.Size:
10129 if ((i + 2) < commandList.Length) 10627 if ((i + 2) < commandList.Length)
10130 { 10628 {
10131 if (commandList.Data[i + 1] is LSL_Integer) 10629 if (commandList.Data[i + 1] is LSL_Integer)
@@ -10195,7 +10693,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10195 } 10693 }
10196 } 10694 }
10197 10695
10198 if (commandToSend != null) 10696 if (commandToSend != 0)
10199 { 10697 {
10200 // the commandList contained a start/stop/... command, too 10698 // the commandList contained a start/stop/... command, too
10201 if (presence == null) 10699 if (presence == null)
@@ -10232,7 +10730,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10232 10730
10233 if (aList.Data[i] != null) 10731 if (aList.Data[i] != null)
10234 { 10732 {
10235 switch ((ParcelMediaCommandEnum) aList.Data[i]) 10733 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
10236 { 10734 {
10237 case ParcelMediaCommandEnum.Url: 10735 case ParcelMediaCommandEnum.Url:
10238 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition).MediaURL)); 10736 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition).MediaURL));
@@ -10289,15 +10787,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10289 10787
10290 if (quick_pay_buttons.Data.Length < 4) 10788 if (quick_pay_buttons.Data.Length < 4)
10291 { 10789 {
10292 LSLError("List must have at least 4 elements"); 10790 int x;
10293 return; 10791 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
10792 {
10793 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
10794 }
10294 } 10795 }
10295 m_host.ParentGroup.RootPart.PayPrice[0]=price; 10796 int[] nPrice = new int[5];
10296 10797 nPrice[0] = price;
10297 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 10798 nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
10298 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 10799 nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
10299 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 10800 nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
10300 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 10801 nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
10802 m_host.ParentGroup.RootPart.PayPrice = nPrice;
10301 m_host.ParentGroup.HasGroupChanged = true; 10803 m_host.ParentGroup.HasGroupChanged = true;
10302 } 10804 }
10303 10805
@@ -10314,7 +10816,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10314 return Vector3.Zero; 10816 return Vector3.Zero;
10315 } 10817 }
10316 10818
10317 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10819// ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
10820 ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
10318 if (presence != null) 10821 if (presence != null)
10319 { 10822 {
10320 LSL_Vector pos = new LSL_Vector(presence.CameraPosition); 10823 LSL_Vector pos = new LSL_Vector(presence.CameraPosition);
@@ -10337,7 +10840,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10337 return Quaternion.Identity; 10840 return Quaternion.Identity;
10338 } 10841 }
10339 10842
10340 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10843// ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
10844 ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
10341 if (presence != null) 10845 if (presence != null)
10342 { 10846 {
10343 return new LSL_Rotation(presence.CameraRotation); 10847 return new LSL_Rotation(presence.CameraRotation);
@@ -10397,14 +10901,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10397 { 10901 {
10398 m_host.AddScriptLPS(1); 10902 m_host.AddScriptLPS(1);
10399 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0); 10903 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0);
10400 if (detectedParams == null) return; // only works on the first detected avatar 10904 if (detectedParams == null)
10401 10905 {
10906 if (m_host.ParentGroup.IsAttachment == true)
10907 {
10908 detectedParams = new DetectParams();
10909 detectedParams.Key = m_host.OwnerID;
10910 }
10911 else
10912 {
10913 return;
10914 }
10915 }
10916
10402 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 10917 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
10403 if (avatar != null) 10918 if (avatar != null)
10404 { 10919 {
10405 avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, 10920 avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name,
10406 simname, pos, lookAt); 10921 simname, pos, lookAt);
10407 } 10922 }
10923
10408 ScriptSleep(1000); 10924 ScriptSleep(1000);
10409 } 10925 }
10410 10926
@@ -10528,12 +11044,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10528 11044
10529 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 11045 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
10530 object[] data = rules.Data; 11046 object[] data = rules.Data;
10531 for (int i = 0; i < data.Length; ++i) { 11047 for (int i = 0; i < data.Length; ++i)
11048 {
10532 int type = Convert.ToInt32(data[i++].ToString()); 11049 int type = Convert.ToInt32(data[i++].ToString());
10533 if (i >= data.Length) break; // odd number of entries => ignore the last 11050 if (i >= data.Length) break; // odd number of entries => ignore the last
10534 11051
10535 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 11052 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
10536 switch (type) { 11053 switch (type)
11054 {
10537 case ScriptBaseClass.CAMERA_FOCUS: 11055 case ScriptBaseClass.CAMERA_FOCUS:
10538 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 11056 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
10539 case ScriptBaseClass.CAMERA_POSITION: 11057 case ScriptBaseClass.CAMERA_POSITION:
@@ -10638,19 +11156,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10638 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 11156 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
10639 { 11157 {
10640 m_host.AddScriptLPS(1); 11158 m_host.AddScriptLPS(1);
10641 string ret = String.Empty; 11159
10642 string src1 = llBase64ToString(str1); 11160 if (str1 == String.Empty)
10643 string src2 = llBase64ToString(str2); 11161 return String.Empty;
10644 int c = 0; 11162 if (str2 == String.Empty)
10645 for (int i = 0; i < src1.Length; i++) 11163 return str1;
11164
11165 int len = str2.Length;
11166 if ((len % 4) != 0) // LL is EVIL!!!!
11167 {
11168 while (str2.EndsWith("="))
11169 str2 = str2.Substring(0, str2.Length - 1);
11170
11171 len = str2.Length;
11172 int mod = len % 4;
11173
11174 if (mod == 1)
11175 str2 = str2.Substring(0, str2.Length - 1);
11176 else if (mod == 2)
11177 str2 += "==";
11178 else if (mod == 3)
11179 str2 += "=";
11180 }
11181
11182 byte[] data1;
11183 byte[] data2;
11184 try
11185 {
11186 data1 = Convert.FromBase64String(str1);
11187 data2 = Convert.FromBase64String(str2);
11188 }
11189 catch (Exception)
11190 {
11191 return new LSL_String(String.Empty);
11192 }
11193
11194 byte[] d2 = new Byte[data1.Length];
11195 int pos = 0;
11196
11197 if (data1.Length <= data2.Length)
10646 { 11198 {
10647 ret += (char) (src1[i] ^ src2[c]); 11199 Array.Copy(data2, 0, d2, 0, data1.Length);
11200 }
11201 else
11202 {
11203 while (pos < data1.Length)
11204 {
11205 len = data1.Length - pos;
11206 if (len > data2.Length)
11207 len = data2.Length;
10648 11208
10649 c++; 11209 Array.Copy(data2, 0, d2, pos, len);
10650 if (c >= src2.Length) 11210 pos += len;
10651 c = 0; 11211 }
10652 } 11212 }
10653 return llStringToBase64(ret); 11213
11214 for (pos = 0 ; pos < data1.Length ; pos++ )
11215 data1[pos] ^= d2[pos];
11216
11217 return Convert.ToBase64String(data1);
10654 } 11218 }
10655 11219
10656 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 11220 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -10754,16 +11318,72 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10754 if (userAgent != null) 11318 if (userAgent != null)
10755 httpHeaders["User-Agent"] = userAgent; 11319 httpHeaders["User-Agent"] = userAgent;
10756 11320
11321 // See if the URL contains any header hacks
11322 string[] urlParts = url.Split(new char[] {'\n'});
11323 if (urlParts.Length > 1)
11324 {
11325 // Iterate the passed headers and parse them
11326 for (int i = 1 ; i < urlParts.Length ; i++ )
11327 {
11328 // The rest of those would be added to the body in SL.
11329 // Let's not do that.
11330 if (urlParts[i] == String.Empty)
11331 break;
11332
11333 // See if this could be a valid header
11334 string[] headerParts = urlParts[i].Split(new char[] {':'}, 2);
11335 if (headerParts.Length != 2)
11336 continue;
11337
11338 string headerName = headerParts[0].Trim();
11339 string headerValue = headerParts[1].Trim();
11340
11341 // Filter out headers that could be used to abuse
11342 // another system or cloak the request
11343 if (headerName.ToLower() == "x-secondlife-shard" ||
11344 headerName.ToLower() == "x-secondlife-object-name" ||
11345 headerName.ToLower() == "x-secondlife-object-key" ||
11346 headerName.ToLower() == "x-secondlife-region" ||
11347 headerName.ToLower() == "x-secondlife-local-position" ||
11348 headerName.ToLower() == "x-secondlife-local-velocity" ||
11349 headerName.ToLower() == "x-secondlife-local-rotation" ||
11350 headerName.ToLower() == "x-secondlife-owner-name" ||
11351 headerName.ToLower() == "x-secondlife-owner-key" ||
11352 headerName.ToLower() == "connection" ||
11353 headerName.ToLower() == "content-length" ||
11354 headerName.ToLower() == "from" ||
11355 headerName.ToLower() == "host" ||
11356 headerName.ToLower() == "proxy-authorization" ||
11357 headerName.ToLower() == "referer" ||
11358 headerName.ToLower() == "trailer" ||
11359 headerName.ToLower() == "transfer-encoding" ||
11360 headerName.ToLower() == "via" ||
11361 headerName.ToLower() == "authorization")
11362 continue;
11363
11364 httpHeaders[headerName] = headerValue;
11365 }
11366
11367 // Finally, strip any protocol specifier from the URL
11368 url = urlParts[0].Trim();
11369 int idx = url.IndexOf(" HTTP/");
11370 if (idx != -1)
11371 url = url.Substring(0, idx);
11372 }
11373
10757 string authregex = @"^(https?:\/\/)(\w+):(\w+)@(.*)$"; 11374 string authregex = @"^(https?:\/\/)(\w+):(\w+)@(.*)$";
10758 Regex r = new Regex(authregex); 11375 Regex r = new Regex(authregex);
10759 int[] gnums = r.GetGroupNumbers(); 11376 int[] gnums = r.GetGroupNumbers();
10760 Match m = r.Match(url); 11377 Match m = r.Match(url);
10761 if (m.Success) { 11378 if (m.Success)
10762 for (int i = 1; i < gnums.Length; i++) { 11379 {
11380 for (int i = 1; i < gnums.Length; i++)
11381 {
10763 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 11382 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
10764 //CaptureCollection cc = g.Captures; 11383 //CaptureCollection cc = g.Captures;
10765 } 11384 }
10766 if (m.Groups.Count == 5) { 11385 if (m.Groups.Count == 5)
11386 {
10767 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 11387 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
10768 url = m.Groups[1].ToString() + m.Groups[4].ToString(); 11388 url = m.Groups[1].ToString() + m.Groups[4].ToString();
10769 } 11389 }
@@ -10966,6 +11586,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10966 11586
10967 LSL_List ret = new LSL_List(); 11587 LSL_List ret = new LSL_List();
10968 UUID key = new UUID(); 11588 UUID key = new UUID();
11589
11590
10969 if (UUID.TryParse(id, out key)) 11591 if (UUID.TryParse(id, out key))
10970 { 11592 {
10971 ScenePresence av = World.GetScenePresence(key); 11593 ScenePresence av = World.GetScenePresence(key);
@@ -10983,13 +11605,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10983 ret.Add(new LSL_String("")); 11605 ret.Add(new LSL_String(""));
10984 break; 11606 break;
10985 case ScriptBaseClass.OBJECT_POS: 11607 case ScriptBaseClass.OBJECT_POS:
10986 ret.Add(new LSL_Vector((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z)); 11608 Vector3 avpos;
11609
11610 if (av.ParentID != 0 && av.ParentPart != null)
11611 {
11612 avpos = av.OffsetPosition;
11613
11614 Vector3 sitOffset = (Zrot(av.Rotation)) * (av.Appearance.AvatarHeight * 0.02638f *2.0f);
11615 avpos -= sitOffset;
11616
11617 avpos = av.ParentPart.GetWorldPosition() + avpos * av.ParentPart.GetWorldRotation();
11618 }
11619 else
11620 avpos = av.AbsolutePosition;
11621
11622 ret.Add(new LSL_Vector((double)avpos.X, (double)avpos.Y, (double)avpos.Z));
10987 break; 11623 break;
10988 case ScriptBaseClass.OBJECT_ROT: 11624 case ScriptBaseClass.OBJECT_ROT:
10989 ret.Add(new LSL_Rotation(av.GetWorldRotation())); 11625 Quaternion avrot = av.Rotation;
11626 if (av.ParentID != 0 && av.ParentPart != null)
11627 {
11628 avrot = av.ParentPart.GetWorldRotation() * avrot;
11629 }
11630 ret.Add(new LSL_Rotation((double)avrot.X, (double)avrot.Y, (double)avrot.Z, (double)avrot.W));
10990 break; 11631 break;
10991 case ScriptBaseClass.OBJECT_VELOCITY: 11632 case ScriptBaseClass.OBJECT_VELOCITY:
10992 ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z)); 11633 Vector3 avvel = av.Velocity;
11634 ret.Add(new LSL_Vector((double)avvel.X, (double)avvel.Y, (double)avvel.Z));
10993 break; 11635 break;
10994 case ScriptBaseClass.OBJECT_OWNER: 11636 case ScriptBaseClass.OBJECT_OWNER:
10995 ret.Add(new LSL_String(id)); 11637 ret.Add(new LSL_String(id));
@@ -11074,11 +11716,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11074 case ScriptBaseClass.OBJECT_NAME: 11716 case ScriptBaseClass.OBJECT_NAME:
11075 ret.Add(new LSL_String(obj.Name)); 11717 ret.Add(new LSL_String(obj.Name));
11076 break; 11718 break;
11077 case ScriptBaseClass.OBJECT_DESC: 11719 case ScriptBaseClass.OBJECT_DESC:
11078 ret.Add(new LSL_String(obj.Description)); 11720 ret.Add(new LSL_String(obj.Description));
11079 break; 11721 break;
11080 case ScriptBaseClass.OBJECT_POS: 11722 case ScriptBaseClass.OBJECT_POS:
11081 ret.Add(new LSL_Vector(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z)); 11723 Vector3 opos = obj.AbsolutePosition;
11724 ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z));
11082 break; 11725 break;
11083 case ScriptBaseClass.OBJECT_ROT: 11726 case ScriptBaseClass.OBJECT_ROT:
11084 { 11727 {
@@ -11128,9 +11771,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11128 // The value returned in SL for normal prims is prim count 11771 // The value returned in SL for normal prims is prim count
11129 ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount)); 11772 ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount));
11130 break; 11773 break;
11131 // The following 3 costs I have intentionaly coded to return zero. They are part of 11774
11132 // "Land Impact" calculations. These calculations are probably not applicable 11775 // costs below may need to be diferent for root parts, need to check
11133 // to OpenSim and are not yet complete in SL
11134 case ScriptBaseClass.OBJECT_SERVER_COST: 11776 case ScriptBaseClass.OBJECT_SERVER_COST:
11135 // The linden calculation is here 11777 // The linden calculation is here
11136 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight 11778 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight
@@ -11138,16 +11780,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11138 ret.Add(new LSL_Float(0)); 11780 ret.Add(new LSL_Float(0));
11139 break; 11781 break;
11140 case ScriptBaseClass.OBJECT_STREAMING_COST: 11782 case ScriptBaseClass.OBJECT_STREAMING_COST:
11141 // The linden calculation is here 11783 // The value returned in SL for normal prims is prim count * 0.06
11142 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Streaming_Cost 11784 ret.Add(new LSL_Float(obj.StreamingCost));
11143 // The value returned in SL for normal prims looks like the prim count * 0.06
11144 ret.Add(new LSL_Float(0));
11145 break; 11785 break;
11146 case ScriptBaseClass.OBJECT_PHYSICS_COST: 11786 case ScriptBaseClass.OBJECT_PHYSICS_COST:
11147 // The linden calculation is here 11787 // The value returned in SL for normal prims is prim count
11148 // http://wiki.secondlife.com/wiki/Mesh/Mesh_physics 11788 ret.Add(new LSL_Float(obj.PhysicsCost));
11149 // The value returned in SL for normal prims looks like the prim count
11150 ret.Add(new LSL_Float(0));
11151 break; 11789 break;
11152 case ScriptBaseClass.OBJECT_CHARACTER_TIME: // Pathfinding 11790 case ScriptBaseClass.OBJECT_CHARACTER_TIME: // Pathfinding
11153 ret.Add(new LSL_Float(0)); 11791 ret.Add(new LSL_Float(0));
@@ -11406,15 +12044,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11406 return result; 12044 return result;
11407 } 12045 }
11408 12046
11409 public void print(string str) 12047 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
11410 { 12048 {
11411 // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print 12049 List<SceneObjectPart> parts = GetLinkParts(link);
11412 IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "OSSL"); 12050 if (parts.Count < 1)
11413 if (ossl != null) 12051 return 0;
11414 { 12052
11415 ossl.CheckThreatLevel(ThreatLevel.High, "print"); 12053 return GetNumberOfSides(parts[0]);
11416 m_log.Info("LSL print():" + str);
11417 }
11418 } 12054 }
11419 12055
11420 private string Name2Username(string name) 12056 private string Name2Username(string name)
@@ -11459,7 +12095,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11459 12095
11460 return rq.ToString(); 12096 return rq.ToString();
11461 } 12097 }
11462 12098/*
12099 private void SayShoutTimerElapsed(Object sender, ElapsedEventArgs args)
12100 {
12101 m_SayShoutCount = 0;
12102 }
12103*/
11463 private struct Tri 12104 private struct Tri
11464 { 12105 {
11465 public Vector3 p1; 12106 public Vector3 p1;
@@ -11608,9 +12249,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11608 12249
11609 ContactResult result = new ContactResult (); 12250 ContactResult result = new ContactResult ();
11610 result.ConsumerID = group.LocalId; 12251 result.ConsumerID = group.LocalId;
11611 result.Depth = intersection.distance; 12252// result.Depth = intersection.distance;
11612 result.Normal = intersection.normal; 12253 result.Normal = intersection.normal;
11613 result.Pos = intersection.ipoint; 12254 result.Pos = intersection.ipoint;
12255 result.Depth = Vector3.Mag(rayStart - result.Pos);
11614 12256
11615 contacts.Add(result); 12257 contacts.Add(result);
11616 }); 12258 });
@@ -11743,6 +12385,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11743 12385
11744 return contacts[0]; 12386 return contacts[0];
11745 } 12387 }
12388/*
12389 // not done:
12390 private ContactResult[] testRay2NonPhysicalPhantom(Vector3 rayStart, Vector3 raydir, float raylenght)
12391 {
12392 ContactResult[] contacts = null;
12393 World.ForEachSOG(delegate(SceneObjectGroup group)
12394 {
12395 if (m_host.ParentGroup == group)
12396 return;
12397
12398 if (group.IsAttachment)
12399 return;
12400
12401 if(group.RootPart.PhysActor != null)
12402 return;
12403
12404 contacts = group.RayCastGroupPartsOBBNonPhysicalPhantom(rayStart, raydir, raylenght);
12405 });
12406 return contacts;
12407 }
12408*/
11746 12409
11747 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) 12410 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
11748 { 12411 {
@@ -11866,18 +12529,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11866 } 12529 }
11867 } 12530 }
11868 12531
12532 // Double check this
11869 if (checkTerrain) 12533 if (checkTerrain)
11870 { 12534 {
11871 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd); 12535 bool skipGroundCheck = false;
11872 if (groundContact != null) 12536
11873 results.Add((ContactResult)groundContact); 12537 foreach (ContactResult c in results)
12538 {
12539 if (c.ConsumerID == 0) // Physics gave us a ground collision
12540 skipGroundCheck = true;
12541 }
12542
12543 if (!skipGroundCheck)
12544 {
12545 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd);
12546 if (groundContact != null)
12547 results.Add((ContactResult)groundContact);
12548 }
11874 } 12549 }
11875 12550
11876 results.Sort(delegate(ContactResult a, ContactResult b) 12551 results.Sort(delegate(ContactResult a, ContactResult b)
11877 { 12552 {
11878 return a.Depth.CompareTo(b.Depth); 12553 return a.Depth.CompareTo(b.Depth);
11879 }); 12554 });
11880 12555
11881 int values = 0; 12556 int values = 0;
11882 SceneObjectGroup thisgrp = m_host.ParentGroup; 12557 SceneObjectGroup thisgrp = m_host.ParentGroup;
11883 12558
@@ -11970,7 +12645,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11970 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD: 12645 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD:
11971 if (!isAccount) return 0; 12646 if (!isAccount) return 0;
11972 if (estate.HasAccess(id)) return 1; 12647 if (estate.HasAccess(id)) return 1;
11973 if (estate.IsBanned(id)) 12648 if (estate.IsBanned(id, World.GetUserFlags(id)))
11974 estate.RemoveBan(id); 12649 estate.RemoveBan(id);
11975 estate.AddEstateUser(id); 12650 estate.AddEstateUser(id);
11976 break; 12651 break;
@@ -11989,14 +12664,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11989 break; 12664 break;
11990 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD: 12665 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD:
11991 if (!isAccount) return 0; 12666 if (!isAccount) return 0;
11992 if (estate.IsBanned(id)) return 1; 12667 if (estate.IsBanned(id, World.GetUserFlags(id))) return 1;
11993 EstateBan ban = new EstateBan(); 12668 EstateBan ban = new EstateBan();
11994 ban.EstateID = estate.EstateID; 12669 ban.EstateID = estate.EstateID;
11995 ban.BannedUserID = id; 12670 ban.BannedUserID = id;
11996 estate.AddBan(ban); 12671 estate.AddBan(ban);
11997 break; 12672 break;
11998 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE: 12673 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE:
11999 if (!isAccount || !estate.IsBanned(id)) return 0; 12674 if (!isAccount || !estate.IsBanned(id, World.GetUserFlags(id))) return 0;
12000 estate.RemoveBan(id); 12675 estate.RemoveBan(id);
12001 break; 12676 break;
12002 default: return 0; 12677 default: return 0;
@@ -12061,13 +12736,63 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12061 public void llCollisionSprite(string impact_sprite) 12736 public void llCollisionSprite(string impact_sprite)
12062 { 12737 {
12063 m_host.AddScriptLPS(1); 12738 m_host.AddScriptLPS(1);
12064 NotImplemented("llCollisionSprite"); 12739 // Viewer 2.0 broke this and it's likely LL has no intention
12740 // of fixing it. Therefore, letting this be a NOP seems appropriate.
12065 } 12741 }
12066 12742
12067 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 12743 public void llGodLikeRezObject(string inventory, LSL_Vector pos)
12068 { 12744 {
12069 m_host.AddScriptLPS(1); 12745 m_host.AddScriptLPS(1);
12070 NotImplemented("llGodLikeRezObject"); 12746
12747 if (!World.Permissions.IsGod(m_host.OwnerID))
12748 NotImplemented("llGodLikeRezObject");
12749
12750 AssetBase rezAsset = World.AssetService.Get(inventory);
12751 if (rezAsset == null)
12752 {
12753 llSay(0, "Asset not found");
12754 return;
12755 }
12756
12757 SceneObjectGroup group = null;
12758
12759 try
12760 {
12761 string xmlData = Utils.BytesToString(rezAsset.Data);
12762 group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
12763 }
12764 catch
12765 {
12766 llSay(0, "Asset not found");
12767 return;
12768 }
12769
12770 if (group == null)
12771 {
12772 llSay(0, "Asset not found");
12773 return;
12774 }
12775
12776 group.RootPart.AttachPoint = group.RootPart.Shape.State;
12777 group.RootPart.AttachOffset = group.AbsolutePosition;
12778
12779 group.ResetIDs();
12780
12781 Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
12782 World.AddNewSceneObject(group, true, llpos, Quaternion.Identity, Vector3.Zero);
12783 group.CreateScriptInstances(0, true, World.DefaultScriptEngine, 3);
12784 group.ScheduleGroupForFullUpdate();
12785
12786 // objects rezzed with this method are die_at_edge by default.
12787 group.RootPart.SetDieAtEdge(true);
12788
12789 group.ResumeScripts();
12790
12791 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
12792 "object_rez", new Object[] {
12793 new LSL_String(
12794 group.RootPart.UUID.ToString()) },
12795 new DetectParams[0]));
12071 } 12796 }
12072 12797
12073 public LSL_String llTransferLindenDollars(string destination, int amount) 12798 public LSL_String llTransferLindenDollars(string destination, int amount)
@@ -12118,8 +12843,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12118 return; 12843 return;
12119 } 12844 }
12120 12845
12846 string reason;
12121 bool result = money.ObjectGiveMoney( 12847 bool result = money.ObjectGiveMoney(
12122 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); 12848 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount, txn, out reason);
12123 12849
12124 if (result) 12850 if (result)
12125 { 12851 {
@@ -12127,7 +12853,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12127 return; 12853 return;
12128 } 12854 }
12129 12855
12130 replydata = "LINDENDOLLAR_INSUFFICIENTFUNDS"; 12856 replydata = reason;
12131 } 12857 }
12132 finally 12858 finally
12133 { 12859 {
@@ -12144,6 +12870,610 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12144 } 12870 }
12145 12871
12146 #endregion 12872 #endregion
12873
12874 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
12875 {
12876 SceneObjectGroup group = m_host.ParentGroup;
12877
12878 if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
12879 return;
12880 if (group.IsAttachment)
12881 return;
12882
12883 if (frames.Data.Length > 0) // We are getting a new motion
12884 {
12885 if (group.RootPart.KeyframeMotion != null)
12886 group.RootPart.KeyframeMotion.Delete();
12887 group.RootPart.KeyframeMotion = null;
12888
12889 int idx = 0;
12890
12891 KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
12892 KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
12893
12894 while (idx < options.Data.Length)
12895 {
12896 int option = (int)options.GetLSLIntegerItem(idx++);
12897 int remain = options.Data.Length - idx;
12898
12899 switch (option)
12900 {
12901 case ScriptBaseClass.KFM_MODE:
12902 if (remain < 1)
12903 break;
12904 int modeval = (int)options.GetLSLIntegerItem(idx++);
12905 switch(modeval)
12906 {
12907 case ScriptBaseClass.KFM_FORWARD:
12908 mode = KeyframeMotion.PlayMode.Forward;
12909 break;
12910 case ScriptBaseClass.KFM_REVERSE:
12911 mode = KeyframeMotion.PlayMode.Reverse;
12912 break;
12913 case ScriptBaseClass.KFM_LOOP:
12914 mode = KeyframeMotion.PlayMode.Loop;
12915 break;
12916 case ScriptBaseClass.KFM_PING_PONG:
12917 mode = KeyframeMotion.PlayMode.PingPong;
12918 break;
12919 }
12920 break;
12921 case ScriptBaseClass.KFM_DATA:
12922 if (remain < 1)
12923 break;
12924 int dataval = (int)options.GetLSLIntegerItem(idx++);
12925 data = (KeyframeMotion.DataFormat)dataval;
12926 break;
12927 }
12928 }
12929
12930 group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data);
12931
12932 idx = 0;
12933
12934 int elemLength = 2;
12935 if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation))
12936 elemLength = 3;
12937
12938 List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>();
12939 while (idx < frames.Data.Length)
12940 {
12941 int remain = frames.Data.Length - idx;
12942
12943 if (remain < elemLength)
12944 break;
12945
12946 KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe();
12947 frame.Position = null;
12948 frame.Rotation = null;
12949
12950 if ((data & KeyframeMotion.DataFormat.Translation) != 0)
12951 {
12952 LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++);
12953 frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z);
12954 }
12955 if ((data & KeyframeMotion.DataFormat.Rotation) != 0)
12956 {
12957 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
12958 Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
12959 q.Normalize();
12960 frame.Rotation = q;
12961 }
12962
12963 float tempf = (float)frames.GetLSLFloatItem(idx++);
12964 frame.TimeMS = (int)(tempf * 1000.0f);
12965
12966 keyframes.Add(frame);
12967 }
12968
12969 group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray());
12970 group.RootPart.KeyframeMotion.Start();
12971 }
12972 else
12973 {
12974 if (group.RootPart.KeyframeMotion == null)
12975 return;
12976
12977 if (options.Data.Length == 0)
12978 {
12979 group.RootPart.KeyframeMotion.Stop();
12980 return;
12981 }
12982
12983 int code = (int)options.GetLSLIntegerItem(0);
12984
12985 int idx = 0;
12986
12987 while (idx < options.Data.Length)
12988 {
12989 int option = (int)options.GetLSLIntegerItem(idx++);
12990 int remain = options.Data.Length - idx;
12991
12992 switch (option)
12993 {
12994 case ScriptBaseClass.KFM_COMMAND:
12995 int cmd = (int)options.GetLSLIntegerItem(idx++);
12996 switch (cmd)
12997 {
12998 case ScriptBaseClass.KFM_CMD_PLAY:
12999 group.RootPart.KeyframeMotion.Start();
13000 break;
13001 case ScriptBaseClass.KFM_CMD_STOP:
13002 group.RootPart.KeyframeMotion.Stop();
13003 break;
13004 case ScriptBaseClass.KFM_CMD_PAUSE:
13005 group.RootPart.KeyframeMotion.Pause();
13006 break;
13007 }
13008 break;
13009 }
13010 }
13011 }
13012 }
13013
13014 protected LSL_List SetPrimParams(ScenePresence av, LSL_List rules, string originFunc, ref uint rulesParsed)
13015 {
13016 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
13017
13018 int idx = 0;
13019 int idxStart = 0;
13020
13021 bool positionChanged = false;
13022 Vector3 finalPos = Vector3.Zero;
13023
13024 try
13025 {
13026 while (idx < rules.Length)
13027 {
13028 ++rulesParsed;
13029 int code = rules.GetLSLIntegerItem(idx++);
13030
13031 int remain = rules.Length - idx;
13032 idxStart = idx;
13033
13034 switch (code)
13035 {
13036 case (int)ScriptBaseClass.PRIM_POSITION:
13037 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
13038 {
13039 if (remain < 1)
13040 return null;
13041
13042 LSL_Vector v;
13043 v = rules.GetVector3Item(idx++);
13044
13045 SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
13046 if (part == null)
13047 break;
13048
13049 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
13050 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
13051 if (part.LinkNum > 1)
13052 {
13053 localRot = GetPartLocalRot(part);
13054 localPos = GetPartLocalPos(part);
13055 }
13056
13057 v -= localPos;
13058 v /= localRot;
13059
13060 LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
13061
13062 v = v + 2 * sitOffset;
13063
13064 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
13065 av.SendAvatarDataToAllAgents();
13066
13067 }
13068 break;
13069
13070 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
13071 case (int)ScriptBaseClass.PRIM_ROTATION:
13072 {
13073 if (remain < 1)
13074 return null;
13075
13076 LSL_Rotation r;
13077 r = rules.GetQuaternionItem(idx++);
13078
13079 SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
13080 if (part == null)
13081 break;
13082
13083 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
13084 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
13085
13086 if (part.LinkNum > 1)
13087 localRot = GetPartLocalRot(part);
13088
13089 r = r * llGetRootRotation() / localRot;
13090 av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
13091 av.SendAvatarDataToAllAgents();
13092 }
13093 break;
13094
13095 // parse rest doing nothing but number of parameters error check
13096 case (int)ScriptBaseClass.PRIM_SIZE:
13097 case (int)ScriptBaseClass.PRIM_MATERIAL:
13098 case (int)ScriptBaseClass.PRIM_PHANTOM:
13099 case (int)ScriptBaseClass.PRIM_PHYSICS:
13100 case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
13101 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
13102 case (int)ScriptBaseClass.PRIM_NAME:
13103 case (int)ScriptBaseClass.PRIM_DESC:
13104 if (remain < 1)
13105 return null;
13106 idx++;
13107 break;
13108
13109 case (int)ScriptBaseClass.PRIM_GLOW:
13110 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
13111 case (int)ScriptBaseClass.PRIM_TEXGEN:
13112 if (remain < 2)
13113 return null;
13114 idx += 2;
13115 break;
13116
13117 case (int)ScriptBaseClass.PRIM_TYPE:
13118 if (remain < 3)
13119 return null;
13120 code = (int)rules.GetLSLIntegerItem(idx++);
13121 remain = rules.Length - idx;
13122 switch (code)
13123 {
13124 case (int)ScriptBaseClass.PRIM_TYPE_BOX:
13125 case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
13126 case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
13127 if (remain < 6)
13128 return null;
13129 idx += 6;
13130 break;
13131
13132 case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
13133 if (remain < 5)
13134 return null;
13135 idx += 5;
13136 break;
13137
13138 case (int)ScriptBaseClass.PRIM_TYPE_TORUS:
13139 case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
13140 case (int)ScriptBaseClass.PRIM_TYPE_RING:
13141 if (remain < 11)
13142 return null;
13143 idx += 11;
13144 break;
13145
13146 case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
13147 if (remain < 2)
13148 return null;
13149 idx += 2;
13150 break;
13151 }
13152 break;
13153
13154 case (int)ScriptBaseClass.PRIM_COLOR:
13155 case (int)ScriptBaseClass.PRIM_TEXT:
13156 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
13157 case (int)ScriptBaseClass.PRIM_OMEGA:
13158 if (remain < 3)
13159 return null;
13160 idx += 3;
13161 break;
13162
13163 case (int)ScriptBaseClass.PRIM_TEXTURE:
13164 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
13165 case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
13166 if (remain < 5)
13167 return null;
13168 idx += 5;
13169 break;
13170
13171 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
13172 if (remain < 7)
13173 return null;
13174
13175 idx += 7;
13176 break;
13177
13178 case (int)ScriptBaseClass.PRIM_LINK_TARGET:
13179 if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
13180 return null;
13181
13182 return rules.GetSublist(idx, -1);
13183 }
13184 }
13185 }
13186 catch (InvalidCastException e)
13187 {
13188 ShoutError(string.Format(
13189 "{0} error running rule #{1}: arg #{2} ",
13190 originFunc, rulesParsed, idx - idxStart) + e.Message);
13191 }
13192 finally
13193 {
13194 if (positionChanged)
13195 {
13196 av.OffsetPosition = finalPos;
13197// av.SendAvatarDataToAllAgents();
13198 av.SendTerseUpdateToAllClients();
13199 positionChanged = false;
13200 }
13201 }
13202 return null;
13203 }
13204
13205 public LSL_List GetPrimParams(ScenePresence avatar, LSL_List rules, ref LSL_List res)
13206 {
13207 // avatars case
13208 // replies as SL wiki
13209
13210// SceneObjectPart sitPart = avatar.ParentPart; // most likelly it will be needed
13211 SceneObjectPart sitPart = World.GetSceneObjectPart(avatar.ParentID); // maybe better do this expensive search for it in case it's gone??
13212
13213 int idx = 0;
13214 while (idx < rules.Length)
13215 {
13216 int code = (int)rules.GetLSLIntegerItem(idx++);
13217 int remain = rules.Length - idx;
13218
13219 switch (code)
13220 {
13221 case (int)ScriptBaseClass.PRIM_MATERIAL:
13222 res.Add(new LSL_Integer((int)SOPMaterialData.SopMaterial.Flesh));
13223 break;
13224
13225 case (int)ScriptBaseClass.PRIM_PHYSICS:
13226 res.Add(new LSL_Integer(0));
13227 break;
13228
13229 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
13230 res.Add(new LSL_Integer(0));
13231 break;
13232
13233 case (int)ScriptBaseClass.PRIM_PHANTOM:
13234 res.Add(new LSL_Integer(0));
13235 break;
13236
13237 case (int)ScriptBaseClass.PRIM_POSITION:
13238
13239 Vector3 pos = avatar.OffsetPosition;
13240
13241 Vector3 sitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f *2.0f);
13242 pos -= sitOffset;
13243
13244 if( sitPart != null)
13245 pos = sitPart.GetWorldPosition() + pos * sitPart.GetWorldRotation();
13246
13247 res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z));
13248 break;
13249
13250 case (int)ScriptBaseClass.PRIM_SIZE:
13251 // as in llGetAgentSize above
13252// res.Add(new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight));
13253 Vector3 s = avatar.Appearance.AvatarSize;
13254 res.Add(new LSL_Vector(s.X, s.Y, s.Z));
13255
13256 break;
13257
13258 case (int)ScriptBaseClass.PRIM_ROTATION:
13259 Quaternion rot = avatar.Rotation;
13260 if (sitPart != null)
13261 {
13262 rot = sitPart.GetWorldRotation() * rot; // apply sit part world rotation
13263 }
13264
13265 res.Add(new LSL_Rotation (rot.X, rot.Y, rot.Z, rot.W));
13266 break;
13267
13268 case (int)ScriptBaseClass.PRIM_TYPE:
13269 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
13270 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
13271 res.Add(new LSL_Vector(0f,1.0f,0f));
13272 res.Add(new LSL_Float(0.0f));
13273 res.Add(new LSL_Vector(0, 0, 0));
13274 res.Add(new LSL_Vector(1.0f,1.0f,0f));
13275 res.Add(new LSL_Vector(0, 0, 0));
13276 break;
13277
13278 case (int)ScriptBaseClass.PRIM_TEXTURE:
13279 if (remain < 1)
13280 return null;
13281
13282 int face = (int)rules.GetLSLIntegerItem(idx++);
13283 if (face == ScriptBaseClass.ALL_SIDES)
13284 {
13285 for (face = 0; face < 21; face++)
13286 {
13287 res.Add(new LSL_String(""));
13288 res.Add(new LSL_Vector(0,0,0));
13289 res.Add(new LSL_Vector(0,0,0));
13290 res.Add(new LSL_Float(0.0));
13291 }
13292 }
13293 else
13294 {
13295 if (face >= 0 && face < 21)
13296 {
13297 res.Add(new LSL_String(""));
13298 res.Add(new LSL_Vector(0,0,0));
13299 res.Add(new LSL_Vector(0,0,0));
13300 res.Add(new LSL_Float(0.0));
13301 }
13302 }
13303 break;
13304
13305 case (int)ScriptBaseClass.PRIM_COLOR:
13306 if (remain < 1)
13307 return null;
13308
13309 face = (int)rules.GetLSLIntegerItem(idx++);
13310
13311 if (face == ScriptBaseClass.ALL_SIDES)
13312 {
13313 for (face = 0; face < 21; face++)
13314 {
13315 res.Add(new LSL_Vector(0,0,0));
13316 res.Add(new LSL_Float(0));
13317 }
13318 }
13319 else
13320 {
13321 res.Add(new LSL_Vector(0,0,0));
13322 res.Add(new LSL_Float(0));
13323 }
13324 break;
13325
13326 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
13327 if (remain < 1)
13328 return null;
13329 face = (int)rules.GetLSLIntegerItem(idx++);
13330
13331 if (face == ScriptBaseClass.ALL_SIDES)
13332 {
13333 for (face = 0; face < 21; face++)
13334 {
13335 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
13336 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
13337 }
13338 }
13339 else
13340 {
13341 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
13342 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
13343 }
13344 break;
13345
13346 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
13347 if (remain < 1)
13348 return null;
13349 face = (int)rules.GetLSLIntegerItem(idx++);
13350
13351 if (face == ScriptBaseClass.ALL_SIDES)
13352 {
13353 for (face = 0; face < 21; face++)
13354 {
13355 res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
13356 }
13357 }
13358 else
13359 {
13360 res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
13361 }
13362 break;
13363
13364 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
13365 res.Add(new LSL_Integer(0));
13366 res.Add(new LSL_Integer(0));// softness
13367 res.Add(new LSL_Float(0.0f)); // gravity
13368 res.Add(new LSL_Float(0.0f)); // friction
13369 res.Add(new LSL_Float(0.0f)); // wind
13370 res.Add(new LSL_Float(0.0f)); // tension
13371 res.Add(new LSL_Vector(0f,0f,0f));
13372 break;
13373
13374 case (int)ScriptBaseClass.PRIM_TEXGEN:
13375 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
13376 if (remain < 1)
13377 return null;
13378 face = (int)rules.GetLSLIntegerItem(idx++);
13379
13380 if (face == ScriptBaseClass.ALL_SIDES)
13381 {
13382 for (face = 0; face < 21; face++)
13383 {
13384 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
13385 }
13386 }
13387 else
13388 {
13389 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
13390 }
13391 break;
13392
13393 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
13394 res.Add(new LSL_Integer(0));
13395 res.Add(new LSL_Vector(0f,0f,0f));
13396 res.Add(new LSL_Float(0f)); // intensity
13397 res.Add(new LSL_Float(0f)); // radius
13398 res.Add(new LSL_Float(0f)); // falloff
13399 break;
13400
13401 case (int)ScriptBaseClass.PRIM_GLOW:
13402 if (remain < 1)
13403 return null;
13404 face = (int)rules.GetLSLIntegerItem(idx++);
13405
13406 if (face == ScriptBaseClass.ALL_SIDES)
13407 {
13408 for (face = 0; face < 21; face++)
13409 {
13410 res.Add(new LSL_Float(0f));
13411 }
13412 }
13413 else
13414 {
13415 res.Add(new LSL_Float(0f));
13416 }
13417 break;
13418
13419 case (int)ScriptBaseClass.PRIM_TEXT:
13420 res.Add(new LSL_String(""));
13421 res.Add(new LSL_Vector(0f,0f,0f));
13422 res.Add(new LSL_Float(1.0f));
13423 break;
13424
13425 case (int)ScriptBaseClass.PRIM_NAME:
13426 res.Add(new LSL_String(avatar.Name));
13427 break;
13428
13429 case (int)ScriptBaseClass.PRIM_DESC:
13430 res.Add(new LSL_String(""));
13431 break;
13432
13433 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
13434 Quaternion lrot = avatar.Rotation;
13435
13436 if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
13437 {
13438 lrot = sitPart.RotationOffset * lrot; // apply sit part rotation offset
13439 }
13440 res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W));
13441 break;
13442
13443 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
13444 Vector3 lpos = avatar.OffsetPosition; // pos relative to sit part
13445 Vector3 lsitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f * 2.0f);
13446 lpos -= lsitOffset;
13447
13448 if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
13449 {
13450 lpos = sitPart.OffsetPosition + (lpos * sitPart.RotationOffset); // make it relative to root prim
13451 }
13452 res.Add(new LSL_Vector(lpos.X,lpos.Y,lpos.Z));
13453 break;
13454
13455 case (int)ScriptBaseClass.PRIM_LINK_TARGET:
13456 if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
13457 return null;
13458
13459 return rules.GetSublist(idx, -1);
13460 }
13461 }
13462
13463 return null;
13464 }
13465
13466 public void llSetContentType(LSL_Key id, LSL_Integer content_type)
13467 {
13468 if (m_UrlModule != null)
13469 {
13470 string type = "text.plain";
13471 if (content_type == (int)ScriptBaseClass.CONTENT_TYPE_HTML)
13472 type = "text/html";
13473
13474 m_UrlModule.HttpContentType(new UUID(id),type);
13475 }
13476 }
12147 } 13477 }
12148 13478
12149 public class NotecardCache 13479 public class NotecardCache
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 92dd813..edcdfbc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
136// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 136// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
137 137
138 Type returntype = m_comms.LookupReturnType(fname); 138 Type returntype = m_comms.LookupReturnType(fname);
139 if (returntype != typeof(string)) 139 if (returntype != typeof(void))
140 MODError(String.Format("return type mismatch for {0}",fname)); 140 MODError(String.Format("return type mismatch for {0}",fname));
141 141
142 modInvoke(fname,parms); 142 modInvoke(fname,parms);
@@ -329,6 +329,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
329 if (result != null) 329 if (result != null)
330 return result; 330 return result;
331 331
332 Type returntype = m_comms.LookupReturnType(fname);
333 if (returntype == typeof(void))
334 return null;
335
332 MODError(String.Format("Invocation of {0} failed; null return value",fname)); 336 MODError(String.Format("Invocation of {0} failed; null return value",fname));
333 } 337 }
334 catch (Exception e) 338 catch (Exception e)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index f4d5562..5c57971 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -139,6 +139,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
139 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; 139 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
140 internal float m_ScriptDelayFactor = 1.0f; 140 internal float m_ScriptDelayFactor = 1.0f;
141 internal float m_ScriptDistanceFactor = 1.0f; 141 internal float m_ScriptDistanceFactor = 1.0f;
142 internal bool m_debuggerSafe = false;
142 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); 143 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
143 144
144 protected IUrlModule m_UrlModule = null; 145 protected IUrlModule m_UrlModule = null;
@@ -149,6 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
149 m_ScriptEngine = scriptEngine; 150 m_ScriptEngine = scriptEngine;
150 m_host = host; 151 m_host = host;
151 m_item = item; 152 m_item = item;
153 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
152 154
153 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); 155 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
154 156
@@ -212,7 +214,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
212 214
213 internal void OSSLError(string msg) 215 internal void OSSLError(string msg)
214 { 216 {
215 throw new ScriptException("OSSL Runtime Error: " + msg); 217 if (m_debuggerSafe)
218 {
219 OSSLShoutError(msg);
220 }
221 else
222 {
223 throw new ScriptException("OSSL Runtime Error: " + msg);
224 }
216 } 225 }
217 226
218 /// <summary> 227 /// <summary>
@@ -931,18 +940,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
931 if (target != null) 940 if (target != null)
932 { 941 {
933 UUID animID=UUID.Zero; 942 UUID animID=UUID.Zero;
934 lock (m_host.TaskInventory) 943 m_host.TaskInventory.LockItemsForRead(true);
944 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
935 { 945 {
936 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 946 if (inv.Value.Name == animation)
937 { 947 {
938 if (inv.Value.Name == animation) 948 if (inv.Value.Type == (int)AssetType.Animation)
939 { 949 animID = inv.Value.AssetID;
940 if (inv.Value.Type == (int)AssetType.Animation) 950 continue;
941 animID = inv.Value.AssetID;
942 continue;
943 }
944 } 951 }
945 } 952 }
953 m_host.TaskInventory.LockItemsForRead(false);
946 if (animID == UUID.Zero) 954 if (animID == UUID.Zero)
947 target.Animator.AddAnimation(animation, m_host.UUID); 955 target.Animator.AddAnimation(animation, m_host.UUID);
948 else 956 else
@@ -983,6 +991,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
983 else 991 else
984 animID = UUID.Zero; 992 animID = UUID.Zero;
985 } 993 }
994 m_host.TaskInventory.LockItemsForRead(false);
986 995
987 if (animID == UUID.Zero) 996 if (animID == UUID.Zero)
988 target.Animator.RemoveAnimation(animation); 997 target.Animator.RemoveAnimation(animation);
@@ -1645,7 +1654,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1645 } 1654 }
1646 } 1655 }
1647 1656
1648 public Object osParseJSONNew(string JSON) 1657 private Object osParseJSONNew(string JSON)
1649 { 1658 {
1650 CheckThreatLevel(ThreatLevel.None, "osParseJSONNew"); 1659 CheckThreatLevel(ThreatLevel.None, "osParseJSONNew");
1651 1660
@@ -1847,15 +1856,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1847 { 1856 {
1848 UUID assetID = UUID.Zero; 1857 UUID assetID = UUID.Zero;
1849 1858
1850 if (!UUID.TryParse(notecardNameOrUuid, out assetID)) 1859 bool notecardNameIsUUID = UUID.TryParse(notecardNameOrUuid, out assetID);
1860
1861 if (!notecardNameIsUUID)
1851 { 1862 {
1852 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1863 assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
1853 {
1854 if (item.Type == 7 && item.Name == notecardNameOrUuid)
1855 {
1856 assetID = item.AssetID;
1857 }
1858 }
1859 } 1864 }
1860 1865
1861 if (assetID == UUID.Zero) 1866 if (assetID == UUID.Zero)
@@ -1866,7 +1871,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1866 AssetBase a = World.AssetService.Get(assetID.ToString()); 1871 AssetBase a = World.AssetService.Get(assetID.ToString());
1867 1872
1868 if (a == null) 1873 if (a == null)
1869 return UUID.Zero; 1874 {
1875 // Whoops, it's still possible here that the notecard name was properly
1876 // formatted like a UUID but isn't an asset UUID so lets look it up by name after all
1877 assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
1878 if (assetID == UUID.Zero)
1879 return UUID.Zero;
1880
1881 if (!NotecardCache.IsCached(assetID))
1882 {
1883 a = World.AssetService.Get(assetID.ToString());
1884
1885 if (a == null)
1886 {
1887 return UUID.Zero;
1888 }
1889 }
1890 }
1870 1891
1871 string data = Encoding.UTF8.GetString(a.Data); 1892 string data = Encoding.UTF8.GetString(a.Data);
1872 NotecardCache.Cache(assetID, data); 1893 NotecardCache.Cache(assetID, data);
@@ -1874,6 +1895,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1874 1895
1875 return assetID; 1896 return assetID;
1876 } 1897 }
1898 protected UUID SearchTaskInventoryForAssetId(string name)
1899 {
1900 UUID assetId = UUID.Zero;
1901 m_host.TaskInventory.LockItemsForRead(true);
1902 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1903 {
1904 if (item.Type == 7 && item.Name == name)
1905 {
1906 assetId = item.AssetID;
1907 }
1908 }
1909 m_host.TaskInventory.LockItemsForRead(false);
1910 return assetId;
1911 }
1877 1912
1878 /// <summary> 1913 /// <summary>
1879 /// Directly get an entire notecard at once. 1914 /// Directly get an entire notecard at once.
@@ -2351,7 +2386,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2351 CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); 2386 CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
2352 m_host.AddScriptLPS(1); 2387 m_host.AddScriptLPS(1);
2353 2388
2354 return NpcCreate(firstname, lastname, position, notecard, false, false); 2389 return NpcCreate(firstname, lastname, position, notecard, true, false);
2355 } 2390 }
2356 2391
2357 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) 2392 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
@@ -2362,24 +2397,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2362 return NpcCreate( 2397 return NpcCreate(
2363 firstname, lastname, position, notecard, 2398 firstname, lastname, position, notecard,
2364 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, 2399 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0,
2365 (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0); 2400 false);
2401// (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
2366 } 2402 }
2367 2403
2368 private LSL_Key NpcCreate( 2404 private LSL_Key NpcCreate(
2369 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent) 2405 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent)
2370 { 2406 {
2407 if (!owned)
2408 OSSLError("Unowned NPCs are unsupported");
2409
2410 string groupTitle = String.Empty;
2411
2412 if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z)))
2413 return new LSL_Key(UUID.Zero.ToString());
2414
2415 if (firstname != String.Empty || lastname != String.Empty)
2416 {
2417 if (firstname != "Shown outfit:")
2418 groupTitle = "- NPC -";
2419 }
2420
2371 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2421 INPCModule module = World.RequestModuleInterface<INPCModule>();
2372 if (module != null) 2422 if (module != null)
2373 { 2423 {
2374 AvatarAppearance appearance = null; 2424 AvatarAppearance appearance = null;
2375 2425
2376 UUID id; 2426// UUID id;
2377 if (UUID.TryParse(notecard, out id)) 2427// if (UUID.TryParse(notecard, out id))
2378 { 2428// {
2379 ScenePresence clonePresence = World.GetScenePresence(id); 2429// ScenePresence clonePresence = World.GetScenePresence(id);
2380 if (clonePresence != null) 2430// if (clonePresence != null)
2381 appearance = clonePresence.Appearance; 2431// appearance = clonePresence.Appearance;
2382 } 2432// }
2383 2433
2384 if (appearance == null) 2434 if (appearance == null)
2385 { 2435 {
@@ -2387,9 +2437,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2387 2437
2388 if (appearanceSerialized != null) 2438 if (appearanceSerialized != null)
2389 { 2439 {
2390 OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized); 2440 try
2391 appearance = new AvatarAppearance(); 2441 {
2392 appearance.Unpack(appearanceOsd); 2442 OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
2443 appearance = new AvatarAppearance();
2444 appearance.Unpack(appearanceOsd);
2445 }
2446 catch
2447 {
2448 return UUID.Zero.ToString();
2449 }
2393 } 2450 }
2394 else 2451 else
2395 { 2452 {
@@ -2408,6 +2465,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2408 World, 2465 World,
2409 appearance); 2466 appearance);
2410 2467
2468 ScenePresence sp;
2469 if (World.TryGetScenePresence(x, out sp))
2470 {
2471 sp.Grouptitle = groupTitle;
2472 sp.SendAvatarDataToAllAgents();
2473 }
2411 return new LSL_Key(x.ToString()); 2474 return new LSL_Key(x.ToString());
2412 } 2475 }
2413 2476
@@ -2705,16 +2768,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2705 CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); 2768 CheckThreatLevel(ThreatLevel.High, "osNpcRemove");
2706 m_host.AddScriptLPS(1); 2769 m_host.AddScriptLPS(1);
2707 2770
2708 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2771 ManualResetEvent ev = new ManualResetEvent(false);
2709 if (module != null)
2710 {
2711 UUID npcId = new UUID(npc.m_string);
2712 2772
2713 if (!module.CheckPermissions(npcId, m_host.OwnerID)) 2773 Util.FireAndForget(delegate(object x) {
2714 return; 2774 try
2775 {
2776 INPCModule module = World.RequestModuleInterface<INPCModule>();
2777 if (module != null)
2778 {
2779 UUID npcId = new UUID(npc.m_string);
2715 2780
2716 module.DeleteNPC(npcId, World); 2781 ILandObject l = World.LandChannel.GetLandObject(m_host.GroupPosition.X, m_host.GroupPosition.Y);
2717 } 2782 if (l == null || m_host.OwnerID != l.LandData.OwnerID)
2783 {
2784 if (!module.CheckPermissions(npcId, m_host.OwnerID))
2785 return;
2786 }
2787
2788 module.DeleteNPC(npcId, World);
2789 }
2790 }
2791 finally
2792 {
2793 ev.Set();
2794 }
2795 });
2796 ev.WaitOne();
2718 } 2797 }
2719 2798
2720 public void osNpcPlayAnimation(LSL_Key npc, string animation) 2799 public void osNpcPlayAnimation(LSL_Key npc, string animation)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 6e74227..44a7c14 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -93,7 +93,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
93 private const int AGENT = 1; 93 private const int AGENT = 1;
94 private const int AGENT_BY_USERNAME = 0x10; 94 private const int AGENT_BY_USERNAME = 0x10;
95 private const int NPC = 0x20; 95 private const int NPC = 0x20;
96 private const int OS_NPC = 0x01000000;
97 private const int ACTIVE = 2; 96 private const int ACTIVE = 2;
98 private const int PASSIVE = 4; 97 private const int PASSIVE = 4;
99 private const int SCRIPTED = 8; 98 private const int SCRIPTED = 8;
@@ -240,7 +239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
240 List<SensedEntity> sensedEntities = new List<SensedEntity>(); 239 List<SensedEntity> sensedEntities = new List<SensedEntity>();
241 240
242 // Is the sensor type is AGENT and not SCRIPTED then include agents 241 // Is the sensor type is AGENT and not SCRIPTED then include agents
243 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC | OS_NPC)) != 0 && (ts.type & SCRIPTED) == 0) 242 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0)
244 { 243 {
245 sensedEntities.AddRange(doAgentSensor(ts)); 244 sensedEntities.AddRange(doAgentSensor(ts));
246 } 245 }
@@ -339,7 +338,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
339 float dy; 338 float dy;
340 float dz; 339 float dz;
341 340
342 Quaternion q = SensePoint.GetWorldRotation(); 341// Quaternion q = SensePoint.RotationOffset;
342 Quaternion q = SensePoint.GetWorldRotation(); // non-attached prim Sensor *always* uses World rotation!
343 if (SensePoint.ParentGroup.IsAttachment) 343 if (SensePoint.ParentGroup.IsAttachment)
344 { 344 {
345 // In attachments, rotate the sensor cone with the 345 // In attachments, rotate the sensor cone with the
@@ -358,7 +358,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
358 if (avatar == null) 358 if (avatar == null)
359 return sensedEntities; 359 return sensedEntities;
360 360
361 q = avatar.GetWorldRotation() * q; 361 fromRegionPos = avatar.AbsolutePosition;
362 q = avatar.Rotation;
362 } 363 }
363 364
364 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); 365 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
@@ -402,7 +403,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
402 objtype = 0; 403 objtype = 0;
403 404
404 part = ((SceneObjectGroup)ent).RootPart; 405 part = ((SceneObjectGroup)ent).RootPart;
405 if (part.ParentGroup.AttachmentPoint != 0) // Attached so ignore 406 if (part.ParentGroup.RootPart.Shape.PCode != (byte)PCode.Tree &&
407 part.ParentGroup.RootPart.Shape.PCode != (byte)PCode.NewTree &&
408 part.ParentGroup.AttachmentPoint != 0) // Attached so ignore
406 continue; 409 continue;
407 410
408 if (part.Inventory.ContainsScripts()) 411 if (part.Inventory.ContainsScripts())
@@ -489,8 +492,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
489 // Don't proceed if the avatar for this attachment has since been removed from the scene. 492 // Don't proceed if the avatar for this attachment has since been removed from the scene.
490 if (avatar == null) 493 if (avatar == null)
491 return sensedEntities; 494 return sensedEntities;
492 495 fromRegionPos = avatar.AbsolutePosition;
493 q = avatar.GetWorldRotation() * q; 496 q = avatar.Rotation;
494 } 497 }
495 498
496 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); 499 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
@@ -506,7 +509,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
506// "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}", 509// "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}",
507// presence.Name, presence.PresenceType, ts.name, ts.type); 510// presence.Name, presence.PresenceType, ts.name, ts.type);
508 511
509 if ((ts.type & NPC) == 0 && (ts.type & OS_NPC) == 0 && presence.PresenceType == PresenceType.Npc) 512 if ((ts.type & NPC) == 0 && presence.PresenceType == PresenceType.Npc)
510 { 513 {
511 INPC npcData = m_npcModule.GetNPC(presence.UUID, presence.Scene); 514 INPC npcData = m_npcModule.GetNPC(presence.UUID, presence.Scene);
512 if (npcData == null || !npcData.SenseAsAgent) 515 if (npcData == null || !npcData.SenseAsAgent)
@@ -706,4 +709,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
706 return retList; 709 return retList;
707 } 710 }
708 } 711 }
709} \ No newline at end of file 712}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 0b14565..68aacd2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -123,25 +123,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
123 if (Timers.Count == 0) 123 if (Timers.Count == 0)
124 return; 124 return;
125 125
126 Dictionary<string, TimerInfo>.ValueCollection tvals;
126 lock (TimerListLock) 127 lock (TimerListLock)
127 { 128 {
128 // Go through all timers 129 // Go through all timers
129 Dictionary<string, TimerInfo>.ValueCollection tvals = Timers.Values; 130 tvals = Timers.Values;
130 foreach (TimerInfo ts in tvals) 131 }
132
133 foreach (TimerInfo ts in tvals)
134 {
135 // Time has passed?
136 if (ts.next < DateTime.Now.Ticks)
131 { 137 {
132 // Time has passed? 138 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
133 if (ts.next < DateTime.Now.Ticks) 139 // Add it to queue
134 { 140 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
135 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 141 new EventParams("timer", new Object[0],
136 // Add it to queue 142 new DetectParams[0]));
137 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 143 // set next interval
138 new EventParams("timer", new Object[0], 144
139 new DetectParams[0])); 145 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
140 // set next interval 146 ts.next = DateTime.Now.Ticks + ts.interval;
141
142 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
143 ts.next = DateTime.Now.Ticks + ts.interval;
144 }
145 } 147 }
146 } 148 }
147 } 149 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
new file mode 100644
index 0000000..ab215f3
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
@@ -0,0 +1,46 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Collections;
29using OpenSim.Region.ScriptEngine.Interfaces;
30
31using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
32using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
33using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
34using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
35using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
36using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
37using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
38
39namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
40{
41 public interface ICM_Api
42 {
43 string cmDetectedCountry(int num);
44 string cmGetAgentCountry(key key);
45 }
46}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 340edb3..d211a2b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -126,6 +126,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
126 LSL_Float llGetEnergy(); 126 LSL_Float llGetEnergy();
127 LSL_Vector llGetForce(); 127 LSL_Vector llGetForce();
128 LSL_Integer llGetFreeMemory(); 128 LSL_Integer llGetFreeMemory();
129 LSL_Integer llGetUsedMemory();
129 LSL_Integer llGetFreeURLs(); 130 LSL_Integer llGetFreeURLs();
130 LSL_Vector llGetGeometricCenter(); 131 LSL_Vector llGetGeometricCenter();
131 LSL_Float llGetGMTclock(); 132 LSL_Float llGetGMTclock();
@@ -149,6 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
149 LSL_Vector llGetLocalPos(); 150 LSL_Vector llGetLocalPos();
150 LSL_Rotation llGetLocalRot(); 151 LSL_Rotation llGetLocalRot();
151 LSL_Float llGetMass(); 152 LSL_Float llGetMass();
153 LSL_Float llGetMassMKS();
152 LSL_Integer llGetMemoryLimit(); 154 LSL_Integer llGetMemoryLimit();
153 void llGetNextEmail(string address, string subject); 155 void llGetNextEmail(string address, string subject);
154 LSL_String llGetNotecardLine(string name, int line); 156 LSL_String llGetNotecardLine(string name, int line);
@@ -202,12 +204,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
202 LSL_String llGetTimestamp(); 204 LSL_String llGetTimestamp();
203 LSL_Vector llGetTorque(); 205 LSL_Vector llGetTorque();
204 LSL_Integer llGetUnixTime(); 206 LSL_Integer llGetUnixTime();
205 LSL_Integer llGetUsedMemory();
206 LSL_Vector llGetVel(); 207 LSL_Vector llGetVel();
207 LSL_Float llGetWallclock(); 208 LSL_Float llGetWallclock();
208 void llGiveInventory(string destination, string inventory); 209 void llGiveInventory(string destination, string inventory);
209 void llGiveInventoryList(string destination, string category, LSL_List inventory); 210 void llGiveInventoryList(string destination, string category, LSL_List inventory);
210 void llGiveMoney(string destination, int amount); 211 LSL_Integer llGiveMoney(string destination, int amount);
211 LSL_String llTransferLindenDollars(string destination, int amount); 212 LSL_String llTransferLindenDollars(string destination, int amount);
212 void llGodLikeRezObject(string inventory, LSL_Vector pos); 213 void llGodLikeRezObject(string inventory, LSL_Vector pos);
213 LSL_Float llGround(LSL_Vector offset); 214 LSL_Float llGround(LSL_Vector offset);
@@ -342,7 +343,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
342 void llSetDamage(double damage); 343 void llSetDamage(double damage);
343 void llSetForce(LSL_Vector force, int local); 344 void llSetForce(LSL_Vector force, int local);
344 void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local); 345 void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local);
345 void llSetVelocity(LSL_Vector velocity, int local);
346 void llSetAngularVelocity(LSL_Vector angularVelocity, int local); 346 void llSetAngularVelocity(LSL_Vector angularVelocity, int local);
347 void llSetHoverHeight(double height, int water, double tau); 347 void llSetHoverHeight(double height, int water, double tau);
348 void llSetInventoryPermMask(string item, int mask, int value); 348 void llSetInventoryPermMask(string item, int mask, int value);
@@ -360,11 +360,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
360 void llSetParcelMusicURL(string url); 360 void llSetParcelMusicURL(string url);
361 void llSetPayPrice(int price, LSL_List quick_pay_buttons); 361 void llSetPayPrice(int price, LSL_List quick_pay_buttons);
362 void llSetPos(LSL_Vector pos); 362 void llSetPos(LSL_Vector pos);
363 LSL_Integer llSetRegionPos(LSL_Vector pos);
363 LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules); 364 LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules);
364 void llSetPrimitiveParams(LSL_List rules); 365 void llSetPrimitiveParams(LSL_List rules);
365 void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules); 366 void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules);
366 void llSetPrimURL(string url); 367 void llSetPrimURL(string url);
367 LSL_Integer llSetRegionPos(LSL_Vector pos);
368 void llSetRemoteScriptAccessPin(int pin); 368 void llSetRemoteScriptAccessPin(int pin);
369 void llSetRot(LSL_Rotation rot); 369 void llSetRot(LSL_Rotation rot);
370 void llSetScale(LSL_Vector scale); 370 void llSetScale(LSL_Vector scale);
@@ -427,10 +427,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
427 LSL_Vector llWind(LSL_Vector offset); 427 LSL_Vector llWind(LSL_Vector offset);
428 LSL_String llXorBase64Strings(string str1, string str2); 428 LSL_String llXorBase64Strings(string str1, string str2);
429 LSL_String llXorBase64StringsCorrect(string str1, string str2); 429 LSL_String llXorBase64StringsCorrect(string str1, string str2);
430 void print(string str); 430 LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
431 void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density);
431 432
432 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc); 433 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc);
433 void llSetKeyframedMotion(LSL_List frames, LSL_List options); 434 void llSetKeyframedMotion(LSL_List frames, LSL_List options);
434 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 435 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
436 LSL_List llGetPhysicsMaterial();
435 } 437 }
436} 438}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 51d0581..a652cb8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
144 // Avatar Info Commands 144 // Avatar Info Commands
145 string osGetAgentIP(string agent); 145 string osGetAgentIP(string agent);
146 LSL_List osGetAgents(); 146 LSL_List osGetAgents();
147 147
148 // Teleport commands 148 // Teleport commands
149 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 149 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
150 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 150 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
@@ -260,7 +260,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
260 string osGetScriptEngineName(); 260 string osGetScriptEngineName();
261 string osGetSimulatorVersion(); 261 string osGetSimulatorVersion();
262 string osGetPhysicsEngineType(); 262 string osGetPhysicsEngineType();
263 Object osParseJSONNew(string JSON);
264 Hashtable osParseJSON(string JSON); 263 Hashtable osParseJSON(string JSON);
265 264
266 void osMessageObject(key objectUUID,string message); 265 void osMessageObject(key objectUUID,string message);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
new file mode 100644
index 0000000..4132dfa
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
@@ -0,0 +1,71 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Runtime.Remoting.Lifetime;
30using System.Threading;
31using System.Reflection;
32using System.Collections;
33using System.Collections.Generic;
34using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
38using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
39using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
40using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
41using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
42using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
43using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
44using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
45using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
46
47namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
48{
49 public partial class ScriptBaseClass : MarshalByRefObject
50 {
51 public ICM_Api m_CM_Functions;
52
53 public void ApiTypeCM(IScriptApi api)
54 {
55 if (!(api is ICM_Api))
56 return;
57
58 m_CM_Functions = (ICM_Api)api;
59 }
60
61 public string cmDetectedCountry(int num)
62 {
63 return m_CM_Functions.cmDetectedCountry(num);
64 }
65
66 public string cmGetAgentCountry(key key)
67 {
68 return m_CM_Functions.cmGetAgentCountry(key);
69 }
70 }
71}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 9615315..943d7a2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Reflection; 31using System.Reflection;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using OpenSim.Region.ScriptEngine.Shared; 33using OpenSim.Region.ScriptEngine.Shared;
@@ -132,6 +133,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
132 return (eventFlags); 133 return (eventFlags);
133 } 134 }
134 135
136 [DebuggerNonUserCode]
135 public void ExecuteEvent(string state, string FunctionName, object[] args) 137 public void ExecuteEvent(string state, string FunctionName, object[] args)
136 { 138 {
137 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory. 139 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index a073862..e59c0be 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -56,7 +56,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
56 public const int ACTIVE = 2; 56 public const int ACTIVE = 2;
57 public const int PASSIVE = 4; 57 public const int PASSIVE = 4;
58 public const int SCRIPTED = 8; 58 public const int SCRIPTED = 8;
59 public const int OS_NPC = 0x01000000;
60 59
61 public const int CONTROL_FWD = 1; 60 public const int CONTROL_FWD = 1;
62 public const int CONTROL_BACK = 2; 61 public const int CONTROL_BACK = 2;
@@ -81,6 +80,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
81 public const int PERMISSION_CHANGE_PERMISSIONS = 512; 80 public const int PERMISSION_CHANGE_PERMISSIONS = 512;
82 public const int PERMISSION_TRACK_CAMERA = 1024; 81 public const int PERMISSION_TRACK_CAMERA = 1024;
83 public const int PERMISSION_CONTROL_CAMERA = 2048; 82 public const int PERMISSION_CONTROL_CAMERA = 2048;
83 public const int PERMISSION_TELEPORT = 4096;
84 84
85 public const int AGENT_FLYING = 1; 85 public const int AGENT_FLYING = 1;
86 public const int AGENT_ATTACHMENTS = 2; 86 public const int AGENT_ATTACHMENTS = 2;
@@ -95,6 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
95 public const int AGENT_CROUCHING = 1024; 95 public const int AGENT_CROUCHING = 1024;
96 public const int AGENT_BUSY = 2048; 96 public const int AGENT_BUSY = 2048;
97 public const int AGENT_ALWAYS_RUN = 4096; 97 public const int AGENT_ALWAYS_RUN = 4096;
98 public const int AGENT_MALE = 8192;
98 99
99 //Particle Systems 100 //Particle Systems
100 public const int PSYS_PART_INTERP_COLOR_MASK = 1; 101 public const int PSYS_PART_INTERP_COLOR_MASK = 1;
@@ -350,6 +351,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
350 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART 351 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
351 public const int CHANGED_MEDIA = 2048; 352 public const int CHANGED_MEDIA = 2048;
352 public const int CHANGED_ANIMATION = 16384; 353 public const int CHANGED_ANIMATION = 16384;
354 public const int CHANGED_POSITION = 32768;
353 public const int TYPE_INVALID = 0; 355 public const int TYPE_INVALID = 0;
354 public const int TYPE_INTEGER = 1; 356 public const int TYPE_INTEGER = 1;
355 public const int TYPE_FLOAT = 2; 357 public const int TYPE_FLOAT = 2;
@@ -698,7 +700,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
698 public const int FRICTION = 2; 700 public const int FRICTION = 2;
699 public const int RESTITUTION = 4; 701 public const int RESTITUTION = 4;
700 public const int GRAVITY_MULTIPLIER = 8; 702 public const int GRAVITY_MULTIPLIER = 8;
701 703
702 // extra constants for llSetPrimMediaParams 704 // extra constants for llSetPrimMediaParams
703 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); 705 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0);
704 public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000); 706 public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000);
@@ -770,7 +772,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
770 772
771 public static readonly LSLInteger RCERR_UNKNOWN = -1; 773 public static readonly LSLInteger RCERR_UNKNOWN = -1;
772 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; 774 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2;
773 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3; 775 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = -3;
774 776
775 public const int KFM_MODE = 1; 777 public const int KFM_MODE = 1;
776 public const int KFM_LOOP = 1; 778 public const int KFM_LOOP = 1;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 7cd17e7..4fc8d65 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Diagnostics; //for [DebuggerNonUserCode]
29using System.Runtime.Remoting.Lifetime; 30using System.Runtime.Remoting.Lifetime;
30using System.Threading; 31using System.Threading;
31using System.Reflection; 32using System.Reflection;
@@ -314,6 +315,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
314 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); 315 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
315 } 316 }
316 317
318 [DebuggerNonUserCode]
317 public void llDie() 319 public void llDie()
318 { 320 {
319 m_LSL_Functions.llDie(); 321 m_LSL_Functions.llDie();
@@ -474,6 +476,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
474 return m_LSL_Functions.llGetFreeMemory(); 476 return m_LSL_Functions.llGetFreeMemory();
475 } 477 }
476 478
479 public LSL_Integer llGetUsedMemory()
480 {
481 return m_LSL_Functions.llGetUsedMemory();
482 }
483
477 public LSL_Integer llGetFreeURLs() 484 public LSL_Integer llGetFreeURLs()
478 { 485 {
479 return m_LSL_Functions.llGetFreeURLs(); 486 return m_LSL_Functions.llGetFreeURLs();
@@ -554,11 +561,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
554 return m_LSL_Functions.llGetLinkNumberOfSides(link); 561 return m_LSL_Functions.llGetLinkNumberOfSides(link);
555 } 562 }
556 563
557 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
558 {
559 m_LSL_Functions.llSetKeyframedMotion(frames, options);
560 }
561
562 public LSL_Integer llGetListEntryType(LSL_List src, int index) 564 public LSL_Integer llGetListEntryType(LSL_List src, int index)
563 { 565 {
564 return m_LSL_Functions.llGetListEntryType(src, index); 566 return m_LSL_Functions.llGetListEntryType(src, index);
@@ -584,6 +586,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
584 return m_LSL_Functions.llGetMass(); 586 return m_LSL_Functions.llGetMass();
585 } 587 }
586 588
589 public LSL_Float llGetMassMKS()
590 {
591 return m_LSL_Functions.llGetMassMKS();
592 }
593
587 public LSL_Integer llGetMemoryLimit() 594 public LSL_Integer llGetMemoryLimit()
588 { 595 {
589 return m_LSL_Functions.llGetMemoryLimit(); 596 return m_LSL_Functions.llGetMemoryLimit();
@@ -849,11 +856,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
849 return m_LSL_Functions.llGetUnixTime(); 856 return m_LSL_Functions.llGetUnixTime();
850 } 857 }
851 858
852 public LSL_Integer llGetUsedMemory()
853 {
854 return m_LSL_Functions.llGetUsedMemory();
855 }
856
857 public LSL_Vector llGetVel() 859 public LSL_Vector llGetVel()
858 { 860 {
859 return m_LSL_Functions.llGetVel(); 861 return m_LSL_Functions.llGetVel();
@@ -874,9 +876,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
874 m_LSL_Functions.llGiveInventoryList(destination, category, inventory); 876 m_LSL_Functions.llGiveInventoryList(destination, category, inventory);
875 } 877 }
876 878
877 public void llGiveMoney(string destination, int amount) 879 public LSL_Integer llGiveMoney(string destination, int amount)
878 { 880 {
879 m_LSL_Functions.llGiveMoney(destination, amount); 881 return m_LSL_Functions.llGiveMoney(destination, amount);
880 } 882 }
881 883
882 public LSL_String llTransferLindenDollars(string destination, int amount) 884 public LSL_String llTransferLindenDollars(string destination, int amount)
@@ -1548,11 +1550,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1548 m_LSL_Functions.llSetForceAndTorque(force, torque, local); 1550 m_LSL_Functions.llSetForceAndTorque(force, torque, local);
1549 } 1551 }
1550 1552
1551 public void llSetVelocity(LSL_Vector force, int local)
1552 {
1553 m_LSL_Functions.llSetVelocity(force, local);
1554 }
1555
1556 public void llSetAngularVelocity(LSL_Vector force, int local) 1553 public void llSetAngularVelocity(LSL_Vector force, int local)
1557 { 1554 {
1558 m_LSL_Functions.llSetAngularVelocity(force, local); 1555 m_LSL_Functions.llSetAngularVelocity(force, local);
@@ -1633,6 +1630,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1633 m_LSL_Functions.llSetPos(pos); 1630 m_LSL_Functions.llSetPos(pos);
1634 } 1631 }
1635 1632
1633 public LSL_Integer llSetRegionPos(LSL_Vector pos)
1634 {
1635 return m_LSL_Functions.llSetRegionPos(pos);
1636 }
1637
1636 public void llSetPrimitiveParams(LSL_List rules) 1638 public void llSetPrimitiveParams(LSL_List rules)
1637 { 1639 {
1638 m_LSL_Functions.llSetPrimitiveParams(rules); 1640 m_LSL_Functions.llSetPrimitiveParams(rules);
@@ -1648,11 +1650,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1648 m_LSL_Functions.llSetPrimURL(url); 1650 m_LSL_Functions.llSetPrimURL(url);
1649 } 1651 }
1650 1652
1651 public LSL_Integer llSetRegionPos(LSL_Vector pos)
1652 {
1653 return m_LSL_Functions.llSetRegionPos(pos);
1654 }
1655
1656 public void llSetRemoteScriptAccessPin(int pin) 1653 public void llSetRemoteScriptAccessPin(int pin)
1657 { 1654 {
1658 m_LSL_Functions.llSetRemoteScriptAccessPin(pin); 1655 m_LSL_Functions.llSetRemoteScriptAccessPin(pin);
@@ -1998,9 +1995,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1998 return m_LSL_Functions.llClearLinkMedia(link, face); 1995 return m_LSL_Functions.llClearLinkMedia(link, face);
1999 } 1996 }
2000 1997
2001 public void print(string str) 1998 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
1999 {
2000 return m_LSL_Functions.llGetLinkNumberOfSides(link);
2001 }
2002
2003 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
2004 {
2005 m_LSL_Functions.llSetKeyframedMotion(frames, options);
2006 }
2007
2008 public void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density)
2009 {
2010 m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density);
2011 }
2012
2013 public LSL_List llGetPhysicsMaterial()
2002 { 2014 {
2003 m_LSL_Functions.print(str); 2015 return m_LSL_Functions.llGetPhysicsMaterial();
2004 } 2016 }
2005 } 2017 }
2006} 2018}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index 143b497..2e27f16 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -72,9 +72,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
72 { 72 {
73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); 73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
74 } 74 }
75
75 public void lsClearWindlightScene() 76 public void lsClearWindlightScene()
76 { 77 {
77 m_LS_Functions.lsClearWindlightScene(); 78 m_LS_Functions.lsClearWindlightScene();
78 } 79 }
80
81 public LSL_List cmGetWindlightScene(LSL_List rules)
82 {
83 return m_LS_Functions.lsGetWindlightScene(rules);
84 }
85
86 public int cmSetWindlightScene(LSL_List rules)
87 {
88 return m_LS_Functions.lsSetWindlightScene(rules);
89 }
90
91 public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
92 {
93 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
94 }
95
96 public void cmClearWindlightScene()
97 {
98 m_LS_Functions.lsClearWindlightScene();
99 }
79 } 100 }
80} 101}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index c9902e4..b63773b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -435,11 +435,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
435 return m_OSSL_Functions.osParseJSON(JSON); 435 return m_OSSL_Functions.osParseJSON(JSON);
436 } 436 }
437 437
438 public Object osParseJSONNew(string JSON)
439 {
440 return m_OSSL_Functions.osParseJSONNew(JSON);
441 }
442
443 public void osMessageObject(key objectUUID,string message) 438 public void osMessageObject(key objectUUID,string message)
444 { 439 {
445 m_OSSL_Functions.osMessageObject(objectUUID,message); 440 m_OSSL_Functions.osMessageObject(objectUUID,message);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index edbbc2a..b138da3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -33,6 +33,7 @@ using System.Threading;
33using System.Reflection; 33using System.Reflection;
34using System.Collections; 34using System.Collections;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.Diagnostics; //for [DebuggerNonUserCode]
36using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared; 38using OpenSim.Region.ScriptEngine.Shared;
38using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; 39using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
@@ -90,6 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
90 return (int)m_Executor.GetStateEventFlags(state); 91 return (int)m_Executor.GetStateEventFlags(state);
91 } 92 }
92 93
94 [DebuggerNonUserCode]
93 public void ExecuteEvent(string state, string FunctionName, object[] args) 95 public void ExecuteEvent(string state, string FunctionName, object[] args)
94 { 96 {
95 m_Executor.ExecuteEvent(state, FunctionName, args); 97 m_Executor.ExecuteEvent(state, FunctionName, args);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index e02d35e..e44a106 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -35,6 +35,7 @@ using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.CoreModules; 36using OpenSim.Region.CoreModules;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Services.Interfaces;
38using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
39 40
40namespace OpenSim.Region.ScriptEngine.Shared 41namespace OpenSim.Region.ScriptEngine.Shared
@@ -120,6 +121,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
120 Type = 0; 121 Type = 0;
121 Velocity = new LSL_Types.Vector3(); 122 Velocity = new LSL_Types.Vector3();
122 initializeSurfaceTouch(); 123 initializeSurfaceTouch();
124 Country = String.Empty;
123 } 125 }
124 126
125 public UUID Key; 127 public UUID Key;
@@ -151,6 +153,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
151 private int touchFace; 153 private int touchFace;
152 public int TouchFace { get { return touchFace; } } 154 public int TouchFace { get { return touchFace; } }
153 155
156 public string Country;
157
154 // This can be done in two places including the constructor 158 // This can be done in two places including the constructor
155 // so be carefull what gets added here 159 // so be carefull what gets added here
156 private void initializeSurfaceTouch() 160 private void initializeSurfaceTouch()
@@ -198,6 +202,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
198 return; 202 return;
199 203
200 Name = presence.Firstname + " " + presence.Lastname; 204 Name = presence.Firstname + " " + presence.Lastname;
205 UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, Key);
206 if (account != null)
207 Country = account.UserCountry;
208
201 Owner = Key; 209 Owner = Key;
202 Position = new LSL_Types.Vector3(presence.AbsolutePosition); 210 Position = new LSL_Types.Vector3(presence.AbsolutePosition);
203 Rotation = new LSL_Types.Quaternion( 211 Rotation = new LSL_Types.Quaternion(
@@ -207,22 +215,27 @@ namespace OpenSim.Region.ScriptEngine.Shared
207 presence.Rotation.W); 215 presence.Rotation.W);
208 Velocity = new LSL_Types.Vector3(presence.Velocity); 216 Velocity = new LSL_Types.Vector3(presence.Velocity);
209 217
210 if (presence.PresenceType != PresenceType.Npc) 218 Type = 0x01; // Avatar
211 { 219 if (presence.PresenceType == PresenceType.Npc)
212 Type = AGENT; 220 Type = 0x20;
213 } 221
214 else 222 // Cope Impl. We don't use OS_NPC.
215 { 223 //if (presence.PresenceType != PresenceType.Npc)
216 Type = OS_NPC; 224 //{
217 225 // Type = AGENT;
218 INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); 226 //}
219 INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene); 227 //else
220 228 //{
221 if (npcData.SenseAsAgent) 229 // Type = OS_NPC;
222 { 230
223 Type |= AGENT; 231 // INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
224 } 232 // INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene);
225 } 233
234 // if (npcData.SenseAsAgent)
235 // {
236 // Type |= AGENT;
237 // }
238 //}
226 239
227 if (presence.Velocity != Vector3.Zero) 240 if (presence.Velocity != Vector3.Zero)
228 Type |= ACTIVE; 241 Type |= ACTIVE;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6264f5d..275b608 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -30,6 +30,7 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Globalization; 31using System.Globalization;
32using System.IO; 32using System.IO;
33using System.Diagnostics; //for [DebuggerNonUserCode]
33using System.Reflection; 34using System.Reflection;
34using System.Runtime.Remoting; 35using System.Runtime.Remoting;
35using System.Runtime.Remoting.Lifetime; 36using System.Runtime.Remoting.Lifetime;
@@ -165,13 +166,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
165 166
166 public UUID ItemID { get; private set; } 167 public UUID ItemID { get; private set; }
167 168
168 public UUID ObjectID { get { return Part.UUID; } } 169 public UUID ObjectID { get; private set; }
169 170
170 public uint LocalID { get { return Part.LocalId; } } 171 public uint LocalID { get; private set; }
171 172
172 public UUID RootObjectID { get { return Part.ParentGroup.UUID; } } 173 public UUID RootObjectID { get; private set; }
173 174
174 public uint RootLocalID { get { return Part.ParentGroup.LocalId; } } 175 public uint RootLocalID { get; private set; }
175 176
176 public UUID AssetID { get; private set; } 177 public UUID AssetID { get; private set; }
177 178
@@ -230,13 +231,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
230 ItemID = ScriptTask.ItemID; 231 ItemID = ScriptTask.ItemID;
231 AssetID = ScriptTask.AssetID; 232 AssetID = ScriptTask.AssetID;
232 } 233 }
234 LocalID = part.LocalId;
233 235
234 PrimName = part.ParentGroup.Name; 236 PrimName = part.ParentGroup.Name;
235 StartParam = startParam; 237 StartParam = startParam;
236 m_MaxScriptQueue = maxScriptQueue; 238 m_MaxScriptQueue = maxScriptQueue;
237 m_postOnRez = postOnRez; 239 m_postOnRez = postOnRez;
238 m_AttachedAvatar = Part.ParentGroup.AttachedAvatar; 240 m_AttachedAvatar = part.ParentGroup.AttachedAvatar;
239 m_RegionID = Part.ParentGroup.Scene.RegionInfo.RegionID; 241 m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID;
240 242
241 if (Engine.Config.GetString("ScriptStopStrategy", "abort") == "co-op") 243 if (Engine.Config.GetString("ScriptStopStrategy", "abort") == "co-op")
242 { 244 {
@@ -481,27 +483,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
481 PostEvent(new EventParams("attach", 483 PostEvent(new EventParams("attach",
482 new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0])); 484 new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0]));
483 } 485 }
486
484 } 487 }
485 } 488 }
486 489
487 private void ReleaseControls() 490 private void ReleaseControls()
488 { 491 {
489 int permsMask; 492 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
490 UUID permsGranter; 493
491 lock (Part.TaskInventory) 494 if (part != null)
492 { 495 {
493 if (!Part.TaskInventory.ContainsKey(ItemID)) 496 int permsMask;
497 UUID permsGranter;
498 part.TaskInventory.LockItemsForRead(true);
499 if (!part.TaskInventory.ContainsKey(ItemID))
500 {
501 part.TaskInventory.LockItemsForRead(false);
494 return; 502 return;
503 }
504 permsGranter = part.TaskInventory[ItemID].PermsGranter;
505 permsMask = part.TaskInventory[ItemID].PermsMask;
506 part.TaskInventory.LockItemsForRead(false);
495 507
496 permsGranter = Part.TaskInventory[ItemID].PermsGranter; 508 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
497 permsMask = Part.TaskInventory[ItemID].PermsMask; 509 {
498 } 510 ScenePresence presence = Engine.World.GetScenePresence(permsGranter);
499 511 if (presence != null)
500 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) 512 presence.UnRegisterControlEventsToScript(LocalID, ItemID);
501 { 513 }
502 ScenePresence presence = Engine.World.GetScenePresence(permsGranter);
503 if (presence != null)
504 presence.UnRegisterControlEventsToScript(LocalID, ItemID);
505 } 514 }
506 } 515 }
507 516
@@ -656,6 +665,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
656 return true; 665 return true;
657 } 666 }
658 667
668 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
659 public void SetState(string state) 669 public void SetState(string state)
660 { 670 {
661 if (state == State) 671 if (state == State)
@@ -667,7 +677,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
667 new DetectParams[0])); 677 new DetectParams[0]));
668 PostEvent(new EventParams("state_entry", new Object[0], 678 PostEvent(new EventParams("state_entry", new Object[0],
669 new DetectParams[0])); 679 new DetectParams[0]));
670 680
671 throw new EventAbortException(); 681 throw new EventAbortException();
672 } 682 }
673 683
@@ -757,57 +767,60 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
757 /// <returns></returns> 767 /// <returns></returns>
758 public object EventProcessor() 768 public object EventProcessor()
759 { 769 {
770 EventParams data = null;
760 // We check here as the thread stopping this instance from running may itself hold the m_Script lock. 771 // We check here as the thread stopping this instance from running may itself hold the m_Script lock.
761 if (!Running) 772 if (!Running)
762 return 0; 773 return 0;
763 774
764 lock (m_Script)
765 {
766// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName); 775// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
767 776
768 if (Suspended) 777 if (Suspended)
769 return 0; 778 return 0;
770
771 EventParams data = null;
772 779
773 lock (EventQueue) 780 lock (EventQueue)
781 {
782 data = (EventParams) EventQueue.Dequeue();
783 if (data == null) // Shouldn't happen
774 { 784 {
775 data = (EventParams)EventQueue.Dequeue(); 785 if (EventQueue.Count > 0 && Running && !ShuttingDown)
776 if (data == null) // Shouldn't happen
777 { 786 {
778 if (EventQueue.Count > 0 && Running && !ShuttingDown) 787 m_CurrentWorkItem = Engine.QueueEventHandler(this);
779 {
780 m_CurrentWorkItem = Engine.QueueEventHandler(this);
781 }
782 else
783 {
784 m_CurrentWorkItem = null;
785 }
786 return 0;
787 } 788 }
788 789 else
789 if (data.EventName == "timer")
790 m_TimerQueued = false;
791 if (data.EventName == "control")
792 { 790 {
793 if (m_ControlEventsInQueue > 0) 791 m_CurrentWorkItem = null;
794 m_ControlEventsInQueue--;
795 } 792 }
796 if (data.EventName == "collision") 793 return 0;
797 m_CollisionInQueue = false;
798 } 794 }
799 795
796 if (data.EventName == "timer")
797 m_TimerQueued = false;
798 if (data.EventName == "control")
799 {
800 if (m_ControlEventsInQueue > 0)
801 m_ControlEventsInQueue--;
802 }
803 if (data.EventName == "collision")
804 m_CollisionInQueue = false;
805 }
806
807 lock(m_Script)
808 {
809
810// m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
811 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
812
800 if (DebugLevel >= 2) 813 if (DebugLevel >= 2)
801 m_log.DebugFormat( 814 m_log.DebugFormat(
802 "[SCRIPT INSTANCE]: Processing event {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}", 815 "[SCRIPT INSTANCE]: Processing event {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}",
803 data.EventName, 816 data.EventName,
804 ScriptName, 817 ScriptName,
805 Part.Name, 818 part.Name,
806 Part.LocalId, 819 part.LocalId,
807 Part.ParentGroup.Name, 820 part.ParentGroup.Name,
808 Part.ParentGroup.UUID, 821 part.ParentGroup.UUID,
809 Part.AbsolutePosition, 822 part.AbsolutePosition,
810 Part.ParentGroup.Scene.Name); 823 part.ParentGroup.Scene.Name);
811 824
812 m_DetectParams = data.DetectParams; 825 m_DetectParams = data.DetectParams;
813 826
@@ -820,17 +833,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
820 "[SCRIPT INSTANCE]: Changing state to {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}", 833 "[SCRIPT INSTANCE]: Changing state to {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}",
821 State, 834 State,
822 ScriptName, 835 ScriptName,
823 Part.Name, 836 part.Name,
824 Part.LocalId, 837 part.LocalId,
825 Part.ParentGroup.Name, 838 part.ParentGroup.Name,
826 Part.ParentGroup.UUID, 839 part.ParentGroup.UUID,
827 Part.AbsolutePosition, 840 part.AbsolutePosition,
828 Part.ParentGroup.Scene.Name); 841 part.ParentGroup.Scene.Name);
829 842
830 AsyncCommandManager.RemoveScript(Engine, 843 AsyncCommandManager.RemoveScript(Engine,
831 LocalID, ItemID); 844 LocalID, ItemID);
832 845
833 Part.SetScriptEvents(ItemID, (int)m_Script.GetStateEventFlags(State)); 846 if (part != null)
847 {
848 part.SetScriptEvents(ItemID,
849 (int)m_Script.GetStateEventFlags(State));
850 }
834 } 851 }
835 else 852 else
836 { 853 {
@@ -893,17 +910,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
893 text = text.Substring(0, 1000); 910 text = text.Substring(0, 1000);
894 Engine.World.SimChat(Utils.StringToBytes(text), 911 Engine.World.SimChat(Utils.StringToBytes(text),
895 ChatTypeEnum.DebugChannel, 2147483647, 912 ChatTypeEnum.DebugChannel, 2147483647,
896 Part.AbsolutePosition, 913 part.AbsolutePosition,
897 Part.Name, Part.UUID, false); 914 part.Name, part.UUID, false);
898 915
899 916
900 m_log.DebugFormat( 917 m_log.DebugFormat(
901 "[SCRIPT INSTANCE]: Runtime error in script {0}, part {1} {2} at {3} in {4}, displayed error {5}, actual exception {6}", 918 "[SCRIPT INSTANCE]: Runtime error in script {0}, part {1} {2} at {3} in {4}, displayed error {5}, actual exception {6}",
902 ScriptName, 919 ScriptName,
903 PrimName, 920 PrimName,
904 Part.UUID, 921 part.UUID,
905 Part.AbsolutePosition, 922 part.AbsolutePosition,
906 Part.ParentGroup.Scene.Name, 923 part.ParentGroup.Scene.Name,
907 text.Replace("\n", "\\n"), 924 text.Replace("\n", "\\n"),
908 e.InnerException); 925 e.InnerException);
909 } 926 }
@@ -923,12 +940,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
923 else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) 940 else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
924 { 941 {
925 m_InSelfDelete = true; 942 m_InSelfDelete = true;
926 Engine.World.DeleteSceneObject(Part.ParentGroup, false); 943 if (part != null)
944 Engine.World.DeleteSceneObject(part.ParentGroup, false);
927 } 945 }
928 else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException)) 946 else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException))
929 { 947 {
930 m_InSelfDelete = true; 948 m_InSelfDelete = true;
931 Part.Inventory.RemoveInventoryItem(ItemID); 949 if (part != null)
950 part.Inventory.RemoveInventoryItem(ItemID);
932 } 951 }
933 else if ((e is TargetInvocationException) && (e.InnerException is ScriptCoopStopException)) 952 else if ((e is TargetInvocationException) && (e.InnerException is ScriptCoopStopException))
934 { 953 {
@@ -982,14 +1001,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
982 ReleaseControls(); 1001 ReleaseControls();
983 1002
984 Stop(timeout); 1003 Stop(timeout);
985 Part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; 1004 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
986 Part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; 1005 part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
1006 part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
1007 part.CollisionSound = UUID.Zero;
987 AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); 1008 AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID);
988 EventQueue.Clear(); 1009 EventQueue.Clear();
989 m_Script.ResetVars(); 1010 m_Script.ResetVars();
990 State = "default"; 1011 State = "default";
991 1012
992 Part.SetScriptEvents(ItemID, 1013 part.SetScriptEvents(ItemID,
993 (int)m_Script.GetStateEventFlags(State)); 1014 (int)m_Script.GetStateEventFlags(State));
994 if (running) 1015 if (running)
995 Start(); 1016 Start();
@@ -998,6 +1019,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
998 new Object[0], new DetectParams[0])); 1019 new Object[0], new DetectParams[0]));
999 } 1020 }
1000 1021
1022 [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
1001 public void ApiResetScript() 1023 public void ApiResetScript()
1002 { 1024 {
1003 // bool running = Running; 1025 // bool running = Running;
@@ -1006,15 +1028,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
1006 ReleaseControls(); 1028 ReleaseControls();
1007 1029
1008 m_Script.ResetVars(); 1030 m_Script.ResetVars();
1009 Part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; 1031 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
1010 Part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; 1032 part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
1033 part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
1034 part.CollisionSound = UUID.Zero;
1011 AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); 1035 AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID);
1012 1036
1013 EventQueue.Clear(); 1037 EventQueue.Clear();
1014 m_Script.ResetVars(); 1038 m_Script.ResetVars();
1015 State = "default"; 1039 State = "default";
1016 1040
1017 Part.SetScriptEvents(ItemID, 1041 part.SetScriptEvents(ItemID,
1018 (int)m_Script.GetStateEventFlags(State)); 1042 (int)m_Script.GetStateEventFlags(State));
1019 1043
1020 if (m_CurrentEvent != "state_entry") 1044 if (m_CurrentEvent != "state_entry")
@@ -1028,10 +1052,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
1028 1052
1029 public Dictionary<string, object> GetVars() 1053 public Dictionary<string, object> GetVars()
1030 { 1054 {
1031 if (m_Script != null) 1055 return m_Script.GetVars();
1032 return m_Script.GetVars();
1033 else
1034 return new Dictionary<string, object>();
1035 } 1056 }
1036 1057
1037 public void SetVars(Dictionary<string, object> vars) 1058 public void SetVars(Dictionary<string, object> vars)
@@ -1220,4 +1241,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
1220 return null; 1241 return null;
1221 } 1242 }
1222 } 1243 }
1223} \ No newline at end of file 1244}
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 50f9377..4ba0e64 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -102,19 +102,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
102 102
103 public override string ToString() 103 public override string ToString()
104 { 104 {
105 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", x, y, z); 105 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", x, y, z);
106 return s; 106 return s;
107 } 107 }
108 108
109 public static explicit operator LSLString(Vector3 vec) 109 public static explicit operator LSLString(Vector3 vec)
110 { 110 {
111 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 111 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
112 return new LSLString(s); 112 return new LSLString(s);
113 } 113 }
114 114
115 public static explicit operator string(Vector3 vec) 115 public static explicit operator string(Vector3 vec)
116 { 116 {
117 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 117 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
118 return s; 118 return s;
119 } 119 }
120 120
@@ -414,19 +414,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
414 414
415 public override string ToString() 415 public override string ToString()
416 { 416 {
417 string st=String.Format(Culture.FormatProvider, "<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", x, y, z, s); 417 string st=String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", x, y, z, s);
418 return st; 418 return st;
419 } 419 }
420 420
421 public static explicit operator string(Quaternion r) 421 public static explicit operator string(Quaternion r)
422 { 422 {
423 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 423 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
424 return s; 424 return s;
425 } 425 }
426 426
427 public static explicit operator LSLString(Quaternion r) 427 public static explicit operator LSLString(Quaternion r)
428 { 428 {
429 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 429 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
430 return new LSLString(s); 430 return new LSLString(s);
431 } 431 }
432 432
@@ -537,7 +537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
537 else if (o is LSL_Types.LSLFloat) 537 else if (o is LSL_Types.LSLFloat)
538 size += 8; 538 size += 8;
539 else if (o is LSL_Types.LSLString) 539 else if (o is LSL_Types.LSLString)
540 size += ((LSL_Types.LSLString)o).m_string.Length; 540 size += ((LSL_Types.LSLString)o).m_string == null ? 0 : ((LSL_Types.LSLString)o).m_string.Length;
541 else if (o is LSL_Types.key) 541 else if (o is LSL_Types.key)
542 size += ((LSL_Types.key)o).value.Length; 542 size += ((LSL_Types.key)o).value.Length;
543 else if (o is LSL_Types.Vector3) 543 else if (o is LSL_Types.Vector3)
@@ -546,6 +546,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
546 size += 64; 546 size += 64;
547 else if (o is int) 547 else if (o is int)
548 size += 4; 548 size += 4;
549 else if (o is uint)
550 size += 4;
549 else if (o is string) 551 else if (o is string)
550 size += ((string)o).Length; 552 size += ((string)o).Length;
551 else if (o is float) 553 else if (o is float)
@@ -736,24 +738,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
736 738
737 public static bool operator ==(list a, list b) 739 public static bool operator ==(list a, list b)
738 { 740 {
739 int la = -1; 741 int la = a.Length;
740 int lb = -1; 742 int lb = b.Length;
741 try { la = a.Length; }
742 catch (NullReferenceException) { }
743 try { lb = b.Length; }
744 catch (NullReferenceException) { }
745 743
746 return la == lb; 744 return la == lb;
747 } 745 }
748 746
749 public static bool operator !=(list a, list b) 747 public static bool operator !=(list a, list b)
750 { 748 {
751 int la = -1; 749 int la = a.Length;
752 int lb = -1; 750 int lb = b.Length;
753 try { la = a.Length; }
754 catch (NullReferenceException) { }
755 try {lb = b.Length;}
756 catch (NullReferenceException) { }
757 751
758 return la != lb; 752 return la != lb;
759 } 753 }
@@ -987,7 +981,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
987 ret = Math.Sign(Quaternion.Mag(l) - Quaternion.Mag(r)); 981 ret = Math.Sign(Quaternion.Mag(l) - Quaternion.Mag(r));
988 } 982 }
989 983
990 if (ascending == 0) 984 if (ascending != 1)
991 { 985 {
992 ret = 0 - ret; 986 ret = 0 - ret;
993 } 987 }
@@ -1020,6 +1014,9 @@ namespace OpenSim.Region.ScriptEngine.Shared
1020 stride = 1; 1014 stride = 1;
1021 } 1015 }
1022 1016
1017 if ((Data.Length % stride) != 0)
1018 return new list(ret);
1019
1023 // we can optimize here in the case where stride == 1 and the list 1020 // we can optimize here in the case where stride == 1 and the list
1024 // consists of homogeneous types 1021 // consists of homogeneous types
1025 1022
@@ -1039,7 +1036,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1039 if (homogeneous) 1036 if (homogeneous)
1040 { 1037 {
1041 Array.Sort(ret, new HomogeneousComparer()); 1038 Array.Sort(ret, new HomogeneousComparer());
1042 if (ascending == 0) 1039 if (ascending != 1)
1043 { 1040 {
1044 Array.Reverse(ret); 1041 Array.Reverse(ret);
1045 } 1042 }
generated by cgit v1.1 at 2024-12-27 00:11:46 +0000