aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/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.cs3502
-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.cs22
-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.cs14
-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.cs11
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs70
-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.cs172
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs39
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs363
21 files changed, 3311 insertions, 1421 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 c48285a..c315d03 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,6 +1616,48 @@ 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
@@ -1482,6 +1666,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1482 1666
1483 public void SetTexGen(SceneObjectPart part, int face,int style) 1667 public void SetTexGen(SceneObjectPart part, int face,int style)
1484 { 1668 {
1669 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1670 return;
1671
1485 Primitive.TextureEntry tex = part.Shape.Textures; 1672 Primitive.TextureEntry tex = part.Shape.Textures;
1486 MappingType textype; 1673 MappingType textype;
1487 textype = MappingType.Default; 1674 textype = MappingType.Default;
@@ -1512,6 +1699,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1512 1699
1513 public void SetGlow(SceneObjectPart part, int face, float glow) 1700 public void SetGlow(SceneObjectPart part, int face, float glow)
1514 { 1701 {
1702 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1703 return;
1704
1515 Primitive.TextureEntry tex = part.Shape.Textures; 1705 Primitive.TextureEntry tex = part.Shape.Textures;
1516 if (face >= 0 && face < GetNumberOfSides(part)) 1706 if (face >= 0 && face < GetNumberOfSides(part))
1517 { 1707 {
@@ -1537,6 +1727,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1537 1727
1538 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1728 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1539 { 1729 {
1730 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1731 return;
1540 1732
1541 Shininess sval = new Shininess(); 1733 Shininess sval = new Shininess();
1542 1734
@@ -1587,6 +1779,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1587 1779
1588 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1780 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1589 { 1781 {
1782 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1783 return;
1784
1590 Primitive.TextureEntry tex = part.Shape.Textures; 1785 Primitive.TextureEntry tex = part.Shape.Textures;
1591 if (face >= 0 && face < GetNumberOfSides(part)) 1786 if (face >= 0 && face < GetNumberOfSides(part))
1592 { 1787 {
@@ -1647,13 +1842,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1647 m_host.AddScriptLPS(1); 1842 m_host.AddScriptLPS(1);
1648 1843
1649 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1844 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1650 1845 if (parts.Count > 0)
1651 foreach (SceneObjectPart part in parts) 1846 {
1652 SetAlpha(part, alpha, face); 1847 try
1848 {
1849 foreach (SceneObjectPart part in parts)
1850 SetAlpha(part, alpha, face);
1851 }
1852 finally
1853 {
1854 }
1855 }
1653 } 1856 }
1654 1857
1655 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1858 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1656 { 1859 {
1860 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1861 return;
1862
1657 Primitive.TextureEntry tex = part.Shape.Textures; 1863 Primitive.TextureEntry tex = part.Shape.Textures;
1658 Color4 texcolor; 1864 Color4 texcolor;
1659 if (face >= 0 && face < GetNumberOfSides(part)) 1865 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1706,7 +1912,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1706 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1912 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1707 float wind, float tension, LSL_Vector Force) 1913 float wind, float tension, LSL_Vector Force)
1708 { 1914 {
1709 if (part == null) 1915 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1710 return; 1916 return;
1711 1917
1712 if (flexi) 1918 if (flexi)
@@ -1747,7 +1953,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1747 /// <param name="falloff"></param> 1953 /// <param name="falloff"></param>
1748 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 1954 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1749 { 1955 {
1750 if (part == null) 1956 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1751 return; 1957 return;
1752 1958
1753 if (light) 1959 if (light)
@@ -1780,11 +1986,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1780 Primitive.TextureEntry tex = part.Shape.Textures; 1986 Primitive.TextureEntry tex = part.Shape.Textures;
1781 Color4 texcolor; 1987 Color4 texcolor;
1782 LSL_Vector rgb = new LSL_Vector(); 1988 LSL_Vector rgb = new LSL_Vector();
1989 int nsides = GetNumberOfSides(part);
1990
1783 if (face == ScriptBaseClass.ALL_SIDES) 1991 if (face == ScriptBaseClass.ALL_SIDES)
1784 { 1992 {
1785 int i; 1993 int i;
1786 1994 for (i = 0; i < nsides; i++)
1787 for (i = 0 ; i < GetNumberOfSides(part); i++)
1788 { 1995 {
1789 texcolor = tex.GetFace((uint)i).RGBA; 1996 texcolor = tex.GetFace((uint)i).RGBA;
1790 rgb.x += texcolor.R; 1997 rgb.x += texcolor.R;
@@ -1792,14 +1999,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1792 rgb.z += texcolor.B; 1999 rgb.z += texcolor.B;
1793 } 2000 }
1794 2001
1795 rgb.x /= (float)GetNumberOfSides(part); 2002 float invnsides = 1.0f / (float)nsides;
1796 rgb.y /= (float)GetNumberOfSides(part); 2003
1797 rgb.z /= (float)GetNumberOfSides(part); 2004 rgb.x *= invnsides;
2005 rgb.y *= invnsides;
2006 rgb.z *= invnsides;
1798 2007
1799 return rgb; 2008 return rgb;
1800 } 2009 }
1801 2010 if (face >= 0 && face < nsides)
1802 if (face >= 0 && face < GetNumberOfSides(part))
1803 { 2011 {
1804 texcolor = tex.GetFace((uint)face).RGBA; 2012 texcolor = tex.GetFace((uint)face).RGBA;
1805 rgb.x = texcolor.R; 2013 rgb.x = texcolor.R;
@@ -1826,15 +2034,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1826 m_host.AddScriptLPS(1); 2034 m_host.AddScriptLPS(1);
1827 2035
1828 List<SceneObjectPart> parts = GetLinkParts(linknumber); 2036 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1829 2037 if (parts.Count > 0)
1830 foreach (SceneObjectPart part in parts) 2038 {
1831 SetTexture(part, texture, face); 2039 try
1832 2040 {
2041 foreach (SceneObjectPart part in parts)
2042 SetTexture(part, texture, face);
2043 }
2044 finally
2045 {
2046 }
2047 }
1833 ScriptSleep(200); 2048 ScriptSleep(200);
1834 } 2049 }
1835 2050
1836 protected void SetTexture(SceneObjectPart part, string texture, int face) 2051 protected void SetTexture(SceneObjectPart part, string texture, int face)
1837 { 2052 {
2053 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2054 return;
2055
1838 UUID textureID = new UUID(); 2056 UUID textureID = new UUID();
1839 2057
1840 textureID = ScriptUtils.GetAssetIdFromItemName(m_host, texture, (int)AssetType.Texture); 2058 textureID = ScriptUtils.GetAssetIdFromItemName(m_host, texture, (int)AssetType.Texture);
@@ -1879,6 +2097,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1879 2097
1880 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 2098 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1881 { 2099 {
2100 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2101 return;
2102
1882 Primitive.TextureEntry tex = part.Shape.Textures; 2103 Primitive.TextureEntry tex = part.Shape.Textures;
1883 if (face >= 0 && face < GetNumberOfSides(part)) 2104 if (face >= 0 && face < GetNumberOfSides(part))
1884 { 2105 {
@@ -1915,6 +2136,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1915 2136
1916 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 2137 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1917 { 2138 {
2139 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2140 return;
2141
1918 Primitive.TextureEntry tex = part.Shape.Textures; 2142 Primitive.TextureEntry tex = part.Shape.Textures;
1919 if (face >= 0 && face < GetNumberOfSides(part)) 2143 if (face >= 0 && face < GetNumberOfSides(part))
1920 { 2144 {
@@ -1951,6 +2175,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1951 2175
1952 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 2176 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
1953 { 2177 {
2178 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2179 return;
2180
1954 Primitive.TextureEntry tex = part.Shape.Textures; 2181 Primitive.TextureEntry tex = part.Shape.Textures;
1955 if (face >= 0 && face < GetNumberOfSides(part)) 2182 if (face >= 0 && face < GetNumberOfSides(part))
1956 { 2183 {
@@ -2092,7 +2319,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2092 return end; 2319 return end;
2093 } 2320 }
2094 2321
2095 protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos) 2322 protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos, bool adjust)
2096 { 2323 {
2097 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) 2324 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2098 return fromPos; 2325 return fromPos;
@@ -2108,9 +2335,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2108 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0) 2335 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
2109 targetPos.z = ground; 2336 targetPos.z = ground;
2110 } 2337 }
2111 LSL_Vector real_vec = SetPosAdjust(fromPos, targetPos); 2338 if (adjust)
2339 return SetPosAdjust(fromPos, targetPos);
2112 2340
2113 return real_vec; 2341 return targetPos;
2114 } 2342 }
2115 2343
2116 /// <summary> 2344 /// <summary>
@@ -2121,27 +2349,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2121 /// <param name="adjust">if TRUE, will cap the distance to 10m.</param> 2349 /// <param name="adjust">if TRUE, will cap the distance to 10m.</param>
2122 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos, bool adjust) 2350 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos, bool adjust)
2123 { 2351 {
2124 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2352 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2353 return;
2354
2125 LSL_Vector currentPos = GetPartLocalPos(part); 2355 LSL_Vector currentPos = GetPartLocalPos(part);
2356 LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos, adjust);
2126 2357
2127 float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y);
2128 bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true);
2129 2358
2130 if (part.ParentGroup.RootPart == part) 2359 if (part.ParentGroup.RootPart == part)
2131 { 2360 {
2132 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
2133 targetPos.z = ground;
2134 SceneObjectGroup parent = part.ParentGroup; 2361 SceneObjectGroup parent = part.ParentGroup;
2135 parent.UpdateGroupPosition(!adjust ? targetPos : 2362 if (!World.Permissions.CanObjectEntry(parent.UUID, false, (Vector3)toPos))
2136 SetPosAdjust(currentPos, targetPos)); 2363 return;
2364 Util.FireAndForget(delegate(object x) {
2365 parent.UpdateGroupPosition((Vector3)toPos);
2366 });
2137 } 2367 }
2138 else 2368 else
2139 { 2369 {
2140 part.OffsetPosition = !adjust ? targetPos : 2370 part.OffsetPosition = (Vector3)toPos;
2141 SetPosAdjust(currentPos, targetPos); 2371// SceneObjectGroup parent = part.ParentGroup;
2142 SceneObjectGroup parent = part.ParentGroup; 2372// parent.HasGroupChanged = true;
2143 parent.HasGroupChanged = true; 2373// parent.ScheduleGroupForTerseUpdate();
2144 parent.ScheduleGroupForTerseUpdate(); 2374 part.ScheduleTerseUpdate();
2145 } 2375 }
2146 } 2376 }
2147 2377
@@ -2170,13 +2400,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2170 else 2400 else
2171 { 2401 {
2172 if (part.ParentGroup.IsAttachment) 2402 if (part.ParentGroup.IsAttachment)
2173 {
2174 pos = part.AttachedPos; 2403 pos = part.AttachedPos;
2175 }
2176 else 2404 else
2177 {
2178 pos = part.AbsolutePosition; 2405 pos = part.AbsolutePosition;
2179 }
2180 } 2406 }
2181 2407
2182// m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos); 2408// m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos);
@@ -2188,8 +2414,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2188 { 2414 {
2189 m_host.AddScriptLPS(1); 2415 m_host.AddScriptLPS(1);
2190 2416
2417
2418 // 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
2419 // which is then treated like a child prim rotation and it's offset gets cumulatively multiplied against.
2420 // 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.
2421 // RootPart != null should shortcircuit
2422
2191 // try to let this work as in SL... 2423 // try to let this work as in SL...
2192 if (m_host.ParentID == 0) 2424 if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart))
2193 { 2425 {
2194 // special case: If we are root, rotate complete SOG to new rotation 2426 // special case: If we are root, rotate complete SOG to new rotation
2195 SetRot(m_host, rot); 2427 SetRot(m_host, rot);
@@ -2216,25 +2448,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2216 2448
2217 protected void SetRot(SceneObjectPart part, Quaternion rot) 2449 protected void SetRot(SceneObjectPart part, Quaternion rot)
2218 { 2450 {
2219 part.UpdateRotation(rot); 2451 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2220 // Update rotation does not move the object in the physics scene if it's a linkset. 2452 return;
2221 2453
2222//KF: Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type 2454 bool isroot = (part == part.ParentGroup.RootPart);
2223// part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; 2455 bool isphys;
2224 2456
2225 // So, after thinking about this for a bit, the issue with the part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition line
2226 // is it isn't compatible with vehicles because it causes the vehicle body to have to be broken down and rebuilt
2227 // It's perfectly okay when the object is not an active physical body though.
2228 // So, part.ParentGroup.ResetChildPrimPhysicsPositions(); does the thing that Kitto is warning against
2229 // but only if the object is not physial and active. This is important for rotating doors.
2230 // without the absoluteposition = absoluteposition happening, the doors do not move in the physics
2231 // scene
2232 PhysicsActor pa = part.PhysActor; 2457 PhysicsActor pa = part.PhysActor;
2233 2458
2234 if (pa != null && !pa.IsPhysical) 2459 // keep using physactor ideia of isphysical
2460 // it should be SOP ideia of that
2461 // not much of a issue with ubitODE
2462 if (pa != null && pa.IsPhysical)
2463 isphys = true;
2464 else
2465 isphys = false;
2466
2467 // SL doesn't let scripts rotate root of physical linksets
2468 if (isroot && isphys)
2469 return;
2470
2471 part.UpdateRotation(rot);
2472
2473 // Update rotation does not move the object in the physics engine if it's a non physical linkset
2474 // so do a nasty update of parts positions if is a root part rotation
2475 if (isroot && pa != null) // with if above implies non physical root part
2235 { 2476 {
2236 part.ParentGroup.ResetChildPrimPhysicsPositions(); 2477 part.ParentGroup.ResetChildPrimPhysicsPositions();
2237 } 2478 }
2479 else // fix sitting avatars. This is only needed bc of how we link avas to child parts, not root part
2480 {
2481 List<ScenePresence> sittingavas = part.ParentGroup.GetLinkedAvatars();
2482 if (sittingavas.Count > 0)
2483 {
2484 foreach (ScenePresence av in sittingavas)
2485 {
2486 if (isroot || part.LocalId == av.ParentID)
2487 av.SendTerseUpdateToAllClients();
2488 }
2489 }
2490 }
2238 } 2491 }
2239 2492
2240 /// <summary> 2493 /// <summary>
@@ -2251,6 +2504,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2251 2504
2252 m_host.AddScriptLPS(1); 2505 m_host.AddScriptLPS(1);
2253 Quaternion q = m_host.GetWorldRotation(); 2506 Quaternion q = m_host.GetWorldRotation();
2507
2508 if (m_host.ParentGroup != null && m_host.ParentGroup.AttachmentPoint != 0)
2509 {
2510 ScenePresence avatar = World.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
2511 if (avatar != null)
2512 {
2513 if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
2514 q = avatar.CameraRotation * q; // Mouselook
2515 else
2516 q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
2517 }
2518 }
2519
2254 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 2520 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2255 } 2521 }
2256 2522
@@ -2278,14 +2544,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2278 return new LSL_Rotation(q); 2544 return new LSL_Rotation(q);
2279 } 2545 }
2280 2546
2281 return new LSL_Rotation(part.GetWorldRotation()); 2547 q = part.GetWorldRotation();
2548 if (part.ParentGroup.AttachmentPoint != 0)
2549 {
2550 ScenePresence avatar = World.GetScenePresence(part.ParentGroup.AttachedAvatar);
2551 if (avatar != null)
2552 {
2553 if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
2554 q = avatar.CameraRotation * q; // Mouselook
2555 else
2556 q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
2557 }
2558 }
2559
2560 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2282 } 2561 }
2283 2562
2284 public LSL_Rotation llGetLocalRot() 2563 public LSL_Rotation llGetLocalRot()
2285 { 2564 {
2286 m_host.AddScriptLPS(1); 2565 return GetPartLocalRot(m_host);
2566 }
2287 2567
2288 return new LSL_Rotation(m_host.RotationOffset); 2568 private LSL_Rotation GetPartLocalRot(SceneObjectPart part)
2569 {
2570 m_host.AddScriptLPS(1);
2571 Quaternion rot = part.RotationOffset;
2572 return new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W);
2289 } 2573 }
2290 2574
2291 public void llSetForce(LSL_Vector force, int local) 2575 public void llSetForce(LSL_Vector force, int local)
@@ -2365,16 +2649,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2365 m_host.ApplyImpulse(v, local != 0); 2649 m_host.ApplyImpulse(v, local != 0);
2366 } 2650 }
2367 2651
2652
2368 public void llApplyRotationalImpulse(LSL_Vector force, int local) 2653 public void llApplyRotationalImpulse(LSL_Vector force, int local)
2369 { 2654 {
2370 m_host.AddScriptLPS(1); 2655 m_host.AddScriptLPS(1);
2371 m_host.ApplyAngularImpulse(force, local != 0); 2656 m_host.ParentGroup.RootPart.ApplyAngularImpulse(force, local != 0);
2372 } 2657 }
2373 2658
2374 public void llSetTorque(LSL_Vector torque, int local) 2659 public void llSetTorque(LSL_Vector torque, int local)
2375 { 2660 {
2376 m_host.AddScriptLPS(1); 2661 m_host.AddScriptLPS(1);
2377 m_host.SetAngularImpulse(torque, local != 0); 2662 m_host.ParentGroup.RootPart.SetAngularImpulse(torque, local != 0);
2378 } 2663 }
2379 2664
2380 public LSL_Vector llGetTorque() 2665 public LSL_Vector llGetTorque()
@@ -2391,20 +2676,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2391 llSetTorque(torque, local); 2676 llSetTorque(torque, local);
2392 } 2677 }
2393 2678
2679 public void llSetVelocity(LSL_Vector vel, int local)
2680 {
2681 m_host.AddScriptLPS(1);
2682 m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0);
2683 }
2684
2394 public LSL_Vector llGetVel() 2685 public LSL_Vector llGetVel()
2395 { 2686 {
2396 m_host.AddScriptLPS(1); 2687 m_host.AddScriptLPS(1);
2397 2688
2398 Vector3 vel; 2689 Vector3 vel = Vector3.Zero;
2399 2690
2400 if (m_host.ParentGroup.IsAttachment) 2691 if (m_host.ParentGroup.IsAttachment)
2401 { 2692 {
2402 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar); 2693 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
2403 vel = avatar.Velocity; 2694 if (avatar != null)
2695 vel = avatar.Velocity;
2404 } 2696 }
2405 else 2697 else
2406 { 2698 {
2407 vel = m_host.Velocity; 2699 vel = m_host.ParentGroup.RootPart.Velocity;
2408 } 2700 }
2409 2701
2410 return new LSL_Vector(vel); 2702 return new LSL_Vector(vel);
@@ -2417,11 +2709,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2417 return new LSL_Vector(m_host.Acceleration); 2709 return new LSL_Vector(m_host.Acceleration);
2418 } 2710 }
2419 2711
2420 public LSL_Vector llGetOmega() 2712 public void llSetAngularVelocity(LSL_Vector avel, int local)
2421 { 2713 {
2422 m_host.AddScriptLPS(1); 2714 m_host.AddScriptLPS(1);
2715 m_host.SetAngularVelocity(new Vector3((float)avel.x, (float)avel.y, (float)avel.z), local != 0);
2716 }
2423 2717
2424 return new LSL_Vector(m_host.AngularVelocity); 2718 public LSL_Vector llGetOmega()
2719 {
2720 m_host.AddScriptLPS(1);
2721 Vector3 avel = m_host.AngularVelocity;
2722 return new LSL_Vector(avel.X, avel.Y, avel.Z);
2425 } 2723 }
2426 2724
2427 public LSL_Float llGetTimeOfDay() 2725 public LSL_Float llGetTimeOfDay()
@@ -2782,7 +3080,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2782 return src.ToLower(); 3080 return src.ToLower();
2783 } 3081 }
2784 3082
2785 public void llGiveMoney(string destination, int amount) 3083 public LSL_Integer llGiveMoney(string destination, int amount)
2786 { 3084 {
2787 Util.FireAndForget(x => 3085 Util.FireAndForget(x =>
2788 { 3086 {
@@ -2814,8 +3112,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2814 } 3112 }
2815 3113
2816 money.ObjectGiveMoney( 3114 money.ObjectGiveMoney(
2817 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); 3115 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero);
2818 }); 3116 });
3117
3118 return 0;
2819 } 3119 }
2820 3120
2821 public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) 3121 public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
@@ -2894,13 +3194,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2894 new_group.RootPart.UUID.ToString()) }, 3194 new_group.RootPart.UUID.ToString()) },
2895 new DetectParams[0])); 3195 new DetectParams[0]));
2896 3196
2897 float groupmass = new_group.GetMass(); 3197 // do recoil
3198 SceneObjectGroup hostgrp = m_host.ParentGroup;
3199 if (hostgrp == null)
3200 return;
3201
3202 if (hostgrp.IsAttachment) // don't recoil avatars
3203 return;
2898 3204
2899 PhysicsActor pa = new_group.RootPart.PhysActor; 3205 PhysicsActor pa = new_group.RootPart.PhysActor;
2900 3206
2901 //Recoil. 3207 //Recoil.
2902 if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero) 3208 if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero)
2903 { 3209 {
3210 float groupmass = new_group.GetMass();
2904 Vector3 recoil = -vel * groupmass * m_recoilScaleFactor; 3211 Vector3 recoil = -vel * groupmass * m_recoilScaleFactor;
2905 if (recoil != Vector3.Zero) 3212 if (recoil != Vector3.Zero)
2906 { 3213 {
@@ -2908,6 +3215,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2908 } 3215 }
2909 } 3216 }
2910 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) 3217 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
3218 return;
3219
2911 }); 3220 });
2912 3221
2913 //ScriptSleep((int)((groupmass * velmag) / 10)); 3222 //ScriptSleep((int)((groupmass * velmag) / 10));
@@ -2922,35 +3231,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2922 public void llLookAt(LSL_Vector target, double strength, double damping) 3231 public void llLookAt(LSL_Vector target, double strength, double damping)
2923 { 3232 {
2924 m_host.AddScriptLPS(1); 3233 m_host.AddScriptLPS(1);
2925 // Determine where we are looking from
2926 LSL_Vector from = llGetPos();
2927 3234
2928 // Work out the normalised vector from the source to the target 3235 // Get the normalized vector to the target
2929 LSL_Vector delta = llVecNorm(target - from); 3236 LSL_Vector d1 = llVecNorm(target - llGetPos());
2930 LSL_Vector angle = new LSL_Vector(0,0,0);
2931 3237
2932 // Calculate the yaw 3238 // Get the bearing (yaw)
2933 // subtracting PI_BY_TWO is required to compensate for the odd SL co-ordinate system 3239 LSL_Vector a1 = new LSL_Vector(0,0,0);
2934 angle.x = llAtan2(delta.z, delta.y) - ScriptBaseClass.PI_BY_TWO; 3240 a1.z = llAtan2(d1.y, d1.x);
2935 3241
2936 // Calculate pitch 3242 // Get the elevation (pitch)
2937 angle.y = llAtan2(delta.x, llSqrt((delta.y * delta.y) + (delta.z * delta.z))); 3243 LSL_Vector a2 = new LSL_Vector(0,0,0);
3244 a2.y= -llAtan2(d1.z, llSqrt((d1.x * d1.x) + (d1.y * d1.y)));
2938 3245
2939 // we need to convert from a vector describing 3246 LSL_Rotation r1 = llEuler2Rot(a1);
2940 // the angles of rotation in radians into rotation value 3247 LSL_Rotation r2 = llEuler2Rot(a2);
2941 LSL_Rotation rot = llEuler2Rot(angle); 3248 LSL_Rotation r3 = new LSL_Rotation(0.000000, 0.707107, 0.000000, 0.707107);
2942
2943 // Per discussion with Melanie, for non-physical objects llLookAt appears to simply
2944 // set the rotation of the object, copy that behavior
2945 PhysicsActor pa = m_host.PhysActor;
2946 3249
2947 if (strength == 0 || pa == null || !pa.IsPhysical) 3250 if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
2948 { 3251 {
2949 llSetRot(rot); 3252 // Do nothing if either value is 0 (this has been checked in SL)
3253 if (strength <= 0.0 || damping <= 0.0)
3254 return;
3255
3256 llSetRot(r3 * r2 * r1);
2950 } 3257 }
2951 else 3258 else
2952 { 3259 {
2953 m_host.StartLookAt(rot, (float)strength, (float)damping); 3260 if (strength == 0)
3261 {
3262 llSetRot(r3 * r2 * r1);
3263 return;
3264 }
3265
3266 m_host.StartLookAt((Quaternion)(r3 * r2 * r1), (float)strength, (float)damping);
2954 } 3267 }
2955 } 3268 }
2956 3269
@@ -2997,17 +3310,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2997 } 3310 }
2998 else 3311 else
2999 { 3312 {
3000 if (m_host.IsRoot) 3313 // new SL always returns object mass
3001 { 3314// if (m_host.IsRoot)
3315// {
3002 return m_host.ParentGroup.GetMass(); 3316 return m_host.ParentGroup.GetMass();
3003 } 3317// }
3004 else 3318// else
3005 { 3319// {
3006 return m_host.GetMass(); 3320// return m_host.GetMass();
3007 } 3321// }
3008 } 3322 }
3009 } 3323 }
3010 3324
3325
3326 public LSL_Float llGetMassMKS()
3327 {
3328 return 100f * llGetMass();
3329 }
3330
3011 public void llCollisionFilter(string name, string id, int accept) 3331 public void llCollisionFilter(string name, string id, int accept)
3012 { 3332 {
3013 m_host.AddScriptLPS(1); 3333 m_host.AddScriptLPS(1);
@@ -3055,8 +3375,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3055 { 3375 {
3056 // Unregister controls from Presence 3376 // Unregister controls from Presence
3057 presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID); 3377 presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID);
3058 // Remove Take Control permission.
3059 m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
3060 } 3378 }
3061 } 3379 }
3062 } 3380 }
@@ -3084,7 +3402,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3084 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; 3402 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
3085 3403
3086 if (attachmentsModule != null) 3404 if (attachmentsModule != null)
3087 return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, true); 3405 return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, false, true);
3088 else 3406 else
3089 return false; 3407 return false;
3090 } 3408 }
@@ -3114,9 +3432,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3114 { 3432 {
3115 m_host.AddScriptLPS(1); 3433 m_host.AddScriptLPS(1);
3116 3434
3117// if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
3118// return;
3119
3120 if (m_item.PermsGranter != m_host.OwnerID) 3435 if (m_item.PermsGranter != m_host.OwnerID)
3121 return; 3436 return;
3122 3437
@@ -3159,6 +3474,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3159 3474
3160 public void llInstantMessage(string user, string message) 3475 public void llInstantMessage(string user, string message)
3161 { 3476 {
3477 UUID result;
3478 if (!UUID.TryParse(user, out result) || result == UUID.Zero)
3479 {
3480 ShoutError("An invalid key was passed to llInstantMessage");
3481 ScriptSleep(2000);
3482 return;
3483 }
3484
3485
3162 m_host.AddScriptLPS(1); 3486 m_host.AddScriptLPS(1);
3163 3487
3164 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3488 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -3173,14 +3497,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3173 UUID friendTransactionID = UUID.Random(); 3497 UUID friendTransactionID = UUID.Random();
3174 3498
3175 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3499 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3176 3500
3177 GridInstantMessage msg = new GridInstantMessage(); 3501 GridInstantMessage msg = new GridInstantMessage();
3178 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3502 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3179 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3503 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3180 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3504 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3181// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3505// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3182// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3506// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3183 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 3507// DateTime dt = DateTime.UtcNow;
3508//
3509// // Ticks from UtcNow, but make it look like local. Evil, huh?
3510// dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3511//
3512// try
3513// {
3514// // Convert that to the PST timezone
3515// TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3516// dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3517// }
3518// catch
3519// {
3520// // No logging here, as it could be VERY spammy
3521// }
3522//
3523// // And make it look local again to fool the unix time util
3524// dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3525
3526 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
3527
3184 //if (client != null) 3528 //if (client != null)
3185 //{ 3529 //{
3186 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3530 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3194,10 +3538,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3194 msg.message = message.Substring(0, 1024); 3538 msg.message = message.Substring(0, 1024);
3195 else 3539 else
3196 msg.message = message; 3540 msg.message = message;
3197 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3541 msg.dialog = (byte)19; // MessageFromObject
3198 msg.fromGroup = false;// fromGroup; 3542 msg.fromGroup = false;// fromGroup;
3199 msg.offline = (byte)0; //offline; 3543 msg.offline = (byte)0; //offline;
3200 msg.ParentEstateID = 0; //ParentEstateID; 3544 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3201 msg.Position = new Vector3(m_host.AbsolutePosition); 3545 msg.Position = new Vector3(m_host.AbsolutePosition);
3202 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3546 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
3203 3547
@@ -3229,7 +3573,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3229 } 3573 }
3230 3574
3231 emailModule.SendEmail(m_host.UUID, address, subject, message); 3575 emailModule.SendEmail(m_host.UUID, address, subject, message);
3232 llSleep(EMAIL_PAUSE_TIME); 3576 ScriptSleep(EMAIL_PAUSE_TIME * 1000);
3233 } 3577 }
3234 3578
3235 public void llGetNextEmail(string address, string subject) 3579 public void llGetNextEmail(string address, string subject)
@@ -3475,7 +3819,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3475 implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 3819 implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
3476 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3820 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
3477 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3821 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
3822 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
3478 ScriptBaseClass.PERMISSION_ATTACH; 3823 ScriptBaseClass.PERMISSION_ATTACH;
3824
3479 } 3825 }
3480 else 3826 else
3481 { 3827 {
@@ -3492,15 +3838,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3492 if (World.GetExtraSetting("auto_grant_attach_perms") == "true") 3838 if (World.GetExtraSetting("auto_grant_attach_perms") == "true")
3493 implicitPerms = ScriptBaseClass.PERMISSION_ATTACH; 3839 implicitPerms = ScriptBaseClass.PERMISSION_ATTACH;
3494 } 3840 }
3841 if (World.GetExtraSetting("auto_grant_all_perms") == "true")
3842 {
3843 implicitPerms = perm;
3844 }
3495 } 3845 }
3496 3846
3497 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3847 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3498 { 3848 {
3499 lock (m_host.TaskInventory) 3849 m_host.TaskInventory.LockItemsForWrite(true);
3500 { 3850 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
3501 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; 3851 m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
3502 m_host.TaskInventory[m_item.ItemID].PermsMask = perm; 3852 m_host.TaskInventory.LockItemsForWrite(false);
3503 }
3504 3853
3505 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( 3854 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
3506 "run_time_permissions", new Object[] { 3855 "run_time_permissions", new Object[] {
@@ -3543,11 +3892,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3543 3892
3544 if (!m_waitingForScriptAnswer) 3893 if (!m_waitingForScriptAnswer)
3545 { 3894 {
3546 lock (m_host.TaskInventory) 3895 m_host.TaskInventory.LockItemsForWrite(true);
3547 { 3896 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
3548 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; 3897 m_host.TaskInventory[m_item.ItemID].PermsMask = 0;
3549 m_host.TaskInventory[m_item.ItemID].PermsMask = 0; 3898 m_host.TaskInventory.LockItemsForWrite(false);
3550 }
3551 3899
3552 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3900 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3553 m_waitingForScriptAnswer=true; 3901 m_waitingForScriptAnswer=true;
@@ -3576,14 +3924,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3576 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3924 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3577 llReleaseControls(); 3925 llReleaseControls();
3578 3926
3579 lock (m_host.TaskInventory) 3927 m_host.TaskInventory.LockItemsForWrite(true);
3580 { 3928 m_host.TaskInventory[m_item.ItemID].PermsMask = answer;
3581 m_host.TaskInventory[m_item.ItemID].PermsMask = answer; 3929 m_host.TaskInventory.LockItemsForWrite(false);
3582 } 3930
3583 3931 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
3584 m_ScriptEngine.PostScriptEvent( 3932 "run_time_permissions", new Object[] {
3585 m_item.ItemID, 3933 new LSL_Integer(answer) },
3586 new EventParams("run_time_permissions", new Object[] { new LSL_Integer(answer) }, new DetectParams[0])); 3934 new DetectParams[0]));
3587 } 3935 }
3588 3936
3589 public LSL_String llGetPermissionsKey() 3937 public LSL_String llGetPermissionsKey()
@@ -3622,14 +3970,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3622 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 3970 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3623 { 3971 {
3624 List<SceneObjectPart> parts = GetLinkParts(linknumber); 3972 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3625 3973 if (parts.Count > 0)
3626 foreach (SceneObjectPart part in parts) 3974 {
3627 part.SetFaceColorAlpha(face, color, null); 3975 try
3976 {
3977 foreach (SceneObjectPart part in parts)
3978 part.SetFaceColorAlpha(face, color, null);
3979 }
3980 finally
3981 {
3982 }
3983 }
3628 } 3984 }
3629 3985
3630 public void llCreateLink(string target, int parent) 3986 public void llCreateLink(string target, int parent)
3631 { 3987 {
3632 m_host.AddScriptLPS(1); 3988 m_host.AddScriptLPS(1);
3989
3633 UUID targetID; 3990 UUID targetID;
3634 3991
3635 if (!UUID.TryParse(target, out targetID)) 3992 if (!UUID.TryParse(target, out targetID))
@@ -3735,10 +4092,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3735 // Restructuring Multiple Prims. 4092 // Restructuring Multiple Prims.
3736 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); 4093 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
3737 parts.Remove(parentPrim.RootPart); 4094 parts.Remove(parentPrim.RootPart);
3738 foreach (SceneObjectPart part in parts) 4095 if (parts.Count > 0)
3739 { 4096 {
3740 parentPrim.DelinkFromGroup(part.LocalId, true); 4097 try
4098 {
4099 foreach (SceneObjectPart part in parts)
4100 {
4101 parentPrim.DelinkFromGroup(part.LocalId, true);
4102 }
4103 }
4104 finally
4105 {
4106 }
3741 } 4107 }
4108
3742 parentPrim.HasGroupChanged = true; 4109 parentPrim.HasGroupChanged = true;
3743 parentPrim.ScheduleGroupForFullUpdate(); 4110 parentPrim.ScheduleGroupForFullUpdate();
3744 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 4111 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3747,12 +4114,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3747 { 4114 {
3748 SceneObjectPart newRoot = parts[0]; 4115 SceneObjectPart newRoot = parts[0];
3749 parts.Remove(newRoot); 4116 parts.Remove(newRoot);
3750 foreach (SceneObjectPart part in parts) 4117
4118 try
3751 { 4119 {
3752 // Required for linking 4120 foreach (SceneObjectPart part in parts)
3753 part.ClearUpdateSchedule(); 4121 {
3754 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 4122 part.ClearUpdateSchedule();
4123 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
4124 }
3755 } 4125 }
4126 finally
4127 {
4128 }
4129
4130
3756 newRoot.ParentGroup.HasGroupChanged = true; 4131 newRoot.ParentGroup.HasGroupChanged = true;
3757 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 4132 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3758 } 4133 }
@@ -3772,6 +4147,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3772 public void llBreakAllLinks() 4147 public void llBreakAllLinks()
3773 { 4148 {
3774 m_host.AddScriptLPS(1); 4149 m_host.AddScriptLPS(1);
4150
4151 TaskInventoryItem item = m_item;
4152
4153 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
4154 && !m_automaticLinkPermission)
4155 {
4156 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
4157 return;
4158 }
4159
3775 SceneObjectGroup parentPrim = m_host.ParentGroup; 4160 SceneObjectGroup parentPrim = m_host.ParentGroup;
3776 if (parentPrim.AttachmentPoint != 0) 4161 if (parentPrim.AttachmentPoint != 0)
3777 return; // Fail silently if attached 4162 return; // Fail silently if attached
@@ -3791,13 +4176,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3791 public LSL_String llGetLinkKey(int linknum) 4176 public LSL_String llGetLinkKey(int linknum)
3792 { 4177 {
3793 m_host.AddScriptLPS(1); 4178 m_host.AddScriptLPS(1);
4179 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
4180 if (part != null)
4181 {
4182 return part.UUID.ToString();
4183 }
4184 else
4185 {
4186 if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1))
4187 {
4188 linknum -= (m_host.ParentGroup.PrimCount) + 1;
3794 4189
3795 ISceneEntity entity = GetLinkEntity(linknum); 4190 if (linknum < 0)
4191 return UUID.Zero.ToString();
3796 4192
3797 if (entity != null) 4193 List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
3798 return entity.UUID.ToString(); 4194 if (avatars.Count > linknum)
3799 else 4195 {
3800 return ScriptBaseClass.NULL_KEY; 4196 return avatars[linknum].UUID.ToString();
4197 }
4198 }
4199 return UUID.Zero.ToString();
4200 }
3801 } 4201 }
3802 4202
3803 /// <summary> 4203 /// <summary>
@@ -3856,17 +4256,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3856 m_host.AddScriptLPS(1); 4256 m_host.AddScriptLPS(1);
3857 int count = 0; 4257 int count = 0;
3858 4258
3859 lock (m_host.TaskInventory) 4259 m_host.TaskInventory.LockItemsForRead(true);
4260 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3860 { 4261 {
3861 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4262 if (inv.Value.Type == type || type == -1)
3862 { 4263 {
3863 if (inv.Value.Type == type || type == -1) 4264 count = count + 1;
3864 {
3865 count = count + 1;
3866 }
3867 } 4265 }
3868 } 4266 }
3869 4267
4268 m_host.TaskInventory.LockItemsForRead(false);
3870 return count; 4269 return count;
3871 } 4270 }
3872 4271
@@ -3875,16 +4274,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3875 m_host.AddScriptLPS(1); 4274 m_host.AddScriptLPS(1);
3876 ArrayList keys = new ArrayList(); 4275 ArrayList keys = new ArrayList();
3877 4276
3878 lock (m_host.TaskInventory) 4277 m_host.TaskInventory.LockItemsForRead(true);
4278 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3879 { 4279 {
3880 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4280 if (inv.Value.Type == type || type == -1)
3881 { 4281 {
3882 if (inv.Value.Type == type || type == -1) 4282 keys.Add(inv.Value.Name);
3883 {
3884 keys.Add(inv.Value.Name);
3885 }
3886 } 4283 }
3887 } 4284 }
4285 m_host.TaskInventory.LockItemsForRead(false);
3888 4286
3889 if (keys.Count == 0) 4287 if (keys.Count == 0)
3890 { 4288 {
@@ -3922,7 +4320,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3922 if (item == null) 4320 if (item == null)
3923 { 4321 {
3924 llSay(0, String.Format("Could not find object '{0}'", inventory)); 4322 llSay(0, String.Format("Could not find object '{0}'", inventory));
3925 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4323 return;
4324// throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
3926 } 4325 }
3927 4326
3928 UUID objId = item.ItemID; 4327 UUID objId = item.ItemID;
@@ -3950,33 +4349,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3950 return; 4349 return;
3951 } 4350 }
3952 } 4351 }
4352
3953 // destination is an avatar 4353 // destination is an avatar
3954 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4354 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
3955 4355
3956 if (agentItem == null) 4356 if (agentItem == null)
3957 return; 4357 return;
3958 4358
3959 if (m_TransferModule != null) 4359 byte[] bucket = new byte[1];
3960 { 4360 bucket[0] = (byte)item.Type;
3961 byte[] bucket = new byte[1]; 4361 //byte[] objBytes = agentItem.ID.GetBytes();
3962 bucket[0] = (byte)item.Type; 4362 //Array.Copy(objBytes, 0, bucket, 1, 16);
3963 4363
3964 GridInstantMessage msg = new GridInstantMessage(World, 4364 GridInstantMessage msg = new GridInstantMessage(World,
3965 m_host.OwnerID, m_host.Name, destId, 4365 m_host.OwnerID, m_host.Name, destId,
3966 (byte)InstantMessageDialog.TaskInventoryOffered, 4366 (byte)InstantMessageDialog.TaskInventoryOffered,
3967 false, item.Name+". "+m_host.Name+" is located at "+ 4367 false, item.Name+". "+m_host.Name+" is located at "+
3968 World.RegionInfo.RegionName+" "+ 4368 World.RegionInfo.RegionName+" "+
3969 m_host.AbsolutePosition.ToString(), 4369 m_host.AbsolutePosition.ToString(),
3970 agentItem.ID, true, m_host.AbsolutePosition, 4370 agentItem.ID, true, m_host.AbsolutePosition,
3971 bucket, true); 4371 bucket, true);
3972 4372
3973 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4373 ScenePresence sp;
3974 }
3975 4374
4375 if (World.TryGetScenePresence(destId, out sp))
4376 {
4377 sp.ControllingClient.SendInstantMessage(msg);
4378 }
4379 else
4380 {
4381 if (m_TransferModule != null)
4382 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4383 }
4384
4385 //This delay should only occur when giving inventory to avatars.
3976 ScriptSleep(3000); 4386 ScriptSleep(3000);
3977 } 4387 }
3978 } 4388 }
3979 4389
4390 [DebuggerNonUserCode]
3980 public void llRemoveInventory(string name) 4391 public void llRemoveInventory(string name)
3981 { 4392 {
3982 m_host.AddScriptLPS(1); 4393 m_host.AddScriptLPS(1);
@@ -4031,109 +4442,115 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4031 { 4442 {
4032 m_host.AddScriptLPS(1); 4443 m_host.AddScriptLPS(1);
4033 4444
4034 UUID uuid = (UUID)id; 4445 UUID uuid;
4035 PresenceInfo pinfo = null; 4446 if (UUID.TryParse(id, out uuid))
4036 UserAccount account;
4037
4038 UserInfoCacheEntry ce;
4039 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4040 { 4447 {
4041 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); 4448 PresenceInfo pinfo = null;
4042 if (account == null) 4449 UserAccount account;
4450
4451 UserInfoCacheEntry ce;
4452 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4043 { 4453 {
4044 m_userInfoCache[uuid] = null; // Cache negative 4454 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
4045 return UUID.Zero.ToString(); 4455 if (account == null)
4046 } 4456 {
4457 m_userInfoCache[uuid] = null; // Cache negative
4458 return UUID.Zero.ToString();
4459 }
4047 4460
4048 4461
4049 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); 4462 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4050 if (pinfos != null && pinfos.Length > 0) 4463 if (pinfos != null && pinfos.Length > 0)
4051 {
4052 foreach (PresenceInfo p in pinfos)
4053 { 4464 {
4054 if (p.RegionID != UUID.Zero) 4465 foreach (PresenceInfo p in pinfos)
4055 { 4466 {
4056 pinfo = p; 4467 if (p.RegionID != UUID.Zero)
4468 {
4469 pinfo = p;
4470 }
4057 } 4471 }
4058 } 4472 }
4059 }
4060 4473
4061 ce = new UserInfoCacheEntry(); 4474 ce = new UserInfoCacheEntry();
4062 ce.time = Util.EnvironmentTickCount(); 4475 ce.time = Util.EnvironmentTickCount();
4063 ce.account = account; 4476 ce.account = account;
4064 ce.pinfo = pinfo; 4477 ce.pinfo = pinfo;
4065 } 4478 m_userInfoCache[uuid] = ce;
4066 else 4479 }
4067 { 4480 else
4068 if (ce == null) 4481 {
4069 return UUID.Zero.ToString(); 4482 if (ce == null)
4483 return UUID.Zero.ToString();
4070 4484
4071 account = ce.account; 4485 account = ce.account;
4072 pinfo = ce.pinfo; 4486 pinfo = ce.pinfo;
4073 } 4487 }
4074 4488
4075 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) 4489 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
4076 {
4077 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4078 if (pinfos != null && pinfos.Length > 0)
4079 { 4490 {
4080 foreach (PresenceInfo p in pinfos) 4491 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4492 if (pinfos != null && pinfos.Length > 0)
4081 { 4493 {
4082 if (p.RegionID != UUID.Zero) 4494 foreach (PresenceInfo p in pinfos)
4083 { 4495 {
4084 pinfo = p; 4496 if (p.RegionID != UUID.Zero)
4497 {
4498 pinfo = p;
4499 }
4085 } 4500 }
4086 } 4501 }
4087 } 4502 else
4088 else 4503 pinfo = null;
4089 pinfo = null;
4090 4504
4091 ce.time = Util.EnvironmentTickCount(); 4505 ce.time = Util.EnvironmentTickCount();
4092 ce.pinfo = pinfo; 4506 ce.pinfo = pinfo;
4093 } 4507 }
4094 4508
4095 string reply = String.Empty; 4509 string reply = String.Empty;
4096 4510
4097 switch (data) 4511 switch (data)
4098 { 4512 {
4099 case 1: // DATA_ONLINE (0|1) 4513 case 1: // DATA_ONLINE (0|1)
4100 if (pinfo != null && pinfo.RegionID != UUID.Zero) 4514 if (pinfo != null && pinfo.RegionID != UUID.Zero)
4101 reply = "1"; 4515 reply = "1";
4102 else 4516 else
4103 reply = "0"; 4517 reply = "0";
4104 break; 4518 break;
4105 case 2: // DATA_NAME (First Last) 4519 case 2: // DATA_NAME (First Last)
4106 reply = account.FirstName + " " + account.LastName; 4520 reply = account.FirstName + " " + account.LastName;
4107 break; 4521 break;
4108 case 3: // DATA_BORN (YYYY-MM-DD) 4522 case 3: // DATA_BORN (YYYY-MM-DD)
4109 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); 4523 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
4110 born = born.AddSeconds(account.Created); 4524 born = born.AddSeconds(account.Created);
4111 reply = born.ToString("yyyy-MM-dd"); 4525 reply = born.ToString("yyyy-MM-dd");
4112 break; 4526 break;
4113 case 4: // DATA_RATING (0,0,0,0,0,0) 4527 case 4: // DATA_RATING (0,0,0,0,0,0)
4114 reply = "0,0,0,0,0,0"; 4528 reply = "0,0,0,0,0,0";
4115 break; 4529 break;
4116 case 7: // DATA_USERLEVEL (integer) 4530 case 8: // DATA_PAYINFO (0|1|2|3)
4117 reply = account.UserLevel.ToString(); 4531 reply = "0";
4118 break; 4532 break;
4119 case 8: // DATA_PAYINFO (0|1|2|3) 4533 default:
4120 reply = "0"; 4534 return UUID.Zero.ToString(); // Raise no event
4121 break; 4535 }
4122 default:
4123 return UUID.Zero.ToString(); // Raise no event
4124 }
4125 4536
4126 UUID rq = UUID.Random(); 4537 UUID rq = UUID.Random();
4127 4538
4128 UUID tid = AsyncCommands. 4539 UUID tid = AsyncCommands.
4129 DataserverPlugin.RegisterRequest(m_host.LocalId, 4540 DataserverPlugin.RegisterRequest(m_host.LocalId,
4130 m_item.ItemID, rq.ToString()); 4541 m_item.ItemID, rq.ToString());
4131 4542
4132 AsyncCommands. 4543 AsyncCommands.
4133 DataserverPlugin.DataserverReply(rq.ToString(), reply); 4544 DataserverPlugin.DataserverReply(rq.ToString(), reply);
4134 4545
4135 ScriptSleep(100); 4546 ScriptSleep(100);
4136 return tid.ToString(); 4547 return tid.ToString();
4548 }
4549 else
4550 {
4551 ShoutError("Invalid UUID passed to llRequestAgentData.");
4552 }
4553 return "";
4137 } 4554 }
4138 4555
4139 public LSL_String llRequestInventoryData(string name) 4556 public LSL_String llRequestInventoryData(string name)
@@ -4190,12 +4607,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4190 if (UUID.TryParse(agent, out agentId)) 4607 if (UUID.TryParse(agent, out agentId))
4191 { 4608 {
4192 ScenePresence presence = World.GetScenePresence(agentId); 4609 ScenePresence presence = World.GetScenePresence(agentId);
4193 if (presence != null) 4610 if (presence != null && presence.PresenceType != PresenceType.Npc)
4194 { 4611 {
4612 // agent must not be a god
4613 if (presence.UserLevel >= 200) return;
4614
4195 // agent must be over the owners land 4615 // agent must be over the owners land
4196 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID) 4616 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID)
4197 { 4617 {
4198 World.TeleportClientHome(agentId, presence.ControllingClient); 4618 if (!World.TeleportClientHome(agentId, presence.ControllingClient))
4619 {
4620 // They can't be teleported home for some reason
4621 GridRegion regionInfo = World.GridService.GetRegionByUUID(UUID.Zero, new UUID("2b02daac-e298-42fa-9a75-f488d37896e6"));
4622 if (regionInfo != null)
4623 {
4624 World.RequestTeleportLocation(
4625 presence.ControllingClient, regionInfo.RegionHandle, new Vector3(128, 128, 23), Vector3.Zero,
4626 (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
4627 }
4628 }
4199 } 4629 }
4200 } 4630 }
4201 } 4631 }
@@ -4213,20 +4643,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4213 ScenePresence presence = World.GetScenePresence(agentId); 4643 ScenePresence presence = World.GetScenePresence(agentId);
4214 if (presence != null && presence.PresenceType != PresenceType.Npc) 4644 if (presence != null && presence.PresenceType != PresenceType.Npc)
4215 { 4645 {
4216 // agent must not be a god
4217 if (presence.GodLevel >= 200) return;
4218
4219 if (destination == String.Empty) 4646 if (destination == String.Empty)
4220 destination = World.RegionInfo.RegionName; 4647 destination = World.RegionInfo.RegionName;
4221 4648
4222 // agent must be over the owners land 4649 if (m_item.PermsGranter == agentId)
4223 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID) 4650 {
4651 if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TELEPORT) != 0)
4652 {
4653 DoLLTeleport(presence, destination, targetPos, targetLookAt);
4654 }
4655 }
4656
4657 // agent must be wearing the object
4658 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.OwnerID == presence.UUID)
4224 { 4659 {
4225 DoLLTeleport(presence, destination, targetPos, targetLookAt); 4660 DoLLTeleport(presence, destination, targetPos, targetLookAt);
4226 } 4661 }
4227 else // or must be wearing the prim 4662 else
4228 { 4663 {
4229 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.OwnerID == presence.UUID) 4664 // agent must not be a god
4665 if (presence.GodLevel >= 200) return;
4666
4667 // agent must be over the owners land
4668 ILandObject agentLand = World.LandChannel.GetLandObject(presence.AbsolutePosition);
4669 ILandObject objectLand = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
4670 if (m_host.OwnerID == objectLand.LandData.OwnerID && m_host.OwnerID == agentLand.LandData.OwnerID)
4230 { 4671 {
4231 DoLLTeleport(presence, destination, targetPos, targetLookAt); 4672 DoLLTeleport(presence, destination, targetPos, targetLookAt);
4232 } 4673 }
@@ -4240,24 +4681,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4240 m_host.AddScriptLPS(1); 4681 m_host.AddScriptLPS(1);
4241 UUID agentId = new UUID(); 4682 UUID agentId = new UUID();
4242 4683
4243 ulong regionHandle = Utils.UIntsToLong((uint)global_coords.x, (uint)global_coords.y); 4684 ulong regionHandle = Utils.UIntsToLong((uint)(global_coords.x / 256) * 256, (uint)(global_coords.y / 256) * 256);
4244 4685
4245 if (UUID.TryParse(agent, out agentId)) 4686 if (UUID.TryParse(agent, out agentId))
4246 { 4687 {
4688 // This function is owner only!
4689 if (m_host.OwnerID != agentId)
4690 return;
4691
4247 ScenePresence presence = World.GetScenePresence(agentId); 4692 ScenePresence presence = World.GetScenePresence(agentId);
4693
4694 // Can't TP sitting avatars
4695 if (presence.ParentID != 0) // Sitting
4696 return;
4697
4248 if (presence != null && presence.PresenceType != PresenceType.Npc) 4698 if (presence != null && presence.PresenceType != PresenceType.Npc)
4249 { 4699 {
4250 // agent must not be a god 4700 if (m_item.PermsGranter == agentId)
4251 if (presence.GodLevel >= 200) return;
4252
4253 // agent must be over the owners land
4254 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID)
4255 { 4701 {
4256 World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation); 4702 // If attached using llAttachToAvatarTemp, cowardly refuse
4257 } 4703 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.ParentGroup.FromItemID == UUID.Zero)
4258 else // or must be wearing the prim 4704 return;
4259 { 4705
4260 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.OwnerID == presence.UUID) 4706 if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TELEPORT) != 0)
4261 { 4707 {
4262 World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation); 4708 World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation);
4263 } 4709 }
@@ -4301,7 +4747,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4301 UUID av = new UUID(); 4747 UUID av = new UUID();
4302 if (!UUID.TryParse(agent,out av)) 4748 if (!UUID.TryParse(agent,out av))
4303 { 4749 {
4304 LSLError("First parameter to llDialog needs to be a key");
4305 return; 4750 return;
4306 } 4751 }
4307 4752
@@ -4334,9 +4779,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4334 { 4779 {
4335 m_host.AddScriptLPS(1); 4780 m_host.AddScriptLPS(1);
4336 4781
4782 if(impact_sound == "")
4783 {
4784 m_host.CollisionSoundVolume = (float)impact_volume;
4785 m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
4786 m_host.CollisionSoundType = 0;
4787 return;
4788 }
4337 // TODO: Parameter check logic required. 4789 // TODO: Parameter check logic required.
4338 m_host.CollisionSound = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound); 4790 m_host.CollisionSound = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound);
4339 m_host.CollisionSoundVolume = (float)impact_volume; 4791 m_host.CollisionSoundVolume = (float)impact_volume;
4792 m_host.CollisionSoundType = 1;
4340 } 4793 }
4341 4794
4342 public LSL_String llGetAnimation(string id) 4795 public LSL_String llGetAnimation(string id)
@@ -4350,14 +4803,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4350 4803
4351 if (m_host.RegionHandle == presence.RegionHandle) 4804 if (m_host.RegionHandle == presence.RegionHandle)
4352 { 4805 {
4353 Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames;
4354
4355 if (presence != null) 4806 if (presence != null)
4356 { 4807 {
4357 AnimationSet currentAnims = presence.Animator.Animations; 4808 if (presence.SitGround)
4358 string currentAnimationState = String.Empty; 4809 return "Sitting on Ground";
4359 if (animationstateNames.TryGetValue(currentAnims.ImplicitDefaultAnimation.AnimID, out currentAnimationState)) 4810 if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero)
4360 return currentAnimationState; 4811 return "Sitting";
4812
4813 string movementAnimation = presence.Animator.CurrentMovementAnimation;
4814 string lslMovementAnimation;
4815
4816 if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation))
4817 return lslMovementAnimation;
4361 } 4818 }
4362 } 4819 }
4363 4820
@@ -4505,7 +4962,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4505 { 4962 {
4506 float distance = (PusheePos - m_host.AbsolutePosition).Length(); 4963 float distance = (PusheePos - m_host.AbsolutePosition).Length();
4507 float distance_term = distance * distance * distance; // Script Energy 4964 float distance_term = distance * distance * distance; // Script Energy
4508 float pusher_mass = m_host.GetMass(); 4965 // use total object mass and not part
4966 float pusher_mass = m_host.ParentGroup.GetMass();
4509 4967
4510 float PUSH_ATTENUATION_DISTANCE = 17f; 4968 float PUSH_ATTENUATION_DISTANCE = 17f;
4511 float PUSH_ATTENUATION_SCALE = 5f; 4969 float PUSH_ATTENUATION_SCALE = 5f;
@@ -4746,6 +5204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4746 { 5204 {
4747 return item.AssetID.ToString(); 5205 return item.AssetID.ToString();
4748 } 5206 }
5207 m_host.TaskInventory.LockItemsForRead(false);
4749 5208
4750 return UUID.Zero.ToString(); 5209 return UUID.Zero.ToString();
4751 } 5210 }
@@ -4898,14 +5357,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4898 { 5357 {
4899 m_host.AddScriptLPS(1); 5358 m_host.AddScriptLPS(1);
4900 5359
4901 if (src == null) 5360 return src.Length;
4902 {
4903 return 0;
4904 }
4905 else
4906 {
4907 return src.Length;
4908 }
4909 } 5361 }
4910 5362
4911 public LSL_Integer llList2Integer(LSL_List src, int index) 5363 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -4976,7 +5428,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4976 else if (src.Data[index] is LSL_Float) 5428 else if (src.Data[index] is LSL_Float)
4977 return Convert.ToDouble(((LSL_Float)src.Data[index]).value); 5429 return Convert.ToDouble(((LSL_Float)src.Data[index]).value);
4978 else if (src.Data[index] is LSL_String) 5430 else if (src.Data[index] is LSL_String)
4979 return Convert.ToDouble(((LSL_String)src.Data[index]).m_string); 5431 {
5432 string str = ((LSL_String) src.Data[index]).m_string;
5433 Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)");
5434 if (m != Match.Empty)
5435 {
5436 str = m.Value;
5437 double d = 0.0;
5438 if (!Double.TryParse(str, out d))
5439 return 0.0;
5440
5441 return d;
5442 }
5443 return 0.0;
5444 }
4980 return Convert.ToDouble(src.Data[index]); 5445 return Convert.ToDouble(src.Data[index]);
4981 } 5446 }
4982 catch (FormatException) 5447 catch (FormatException)
@@ -5018,7 +5483,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5018 // for completion and should LSL_Key ever be implemented 5483 // for completion and should LSL_Key ever be implemented
5019 // as it's own struct 5484 // as it's own struct
5020 else if (!(src.Data[index] is LSL_String || 5485 else if (!(src.Data[index] is LSL_String ||
5021 src.Data[index] is LSL_Key)) 5486 src.Data[index] is LSL_Key ||
5487 src.Data[index] is String))
5022 { 5488 {
5023 return ""; 5489 return "";
5024 } 5490 }
@@ -5276,7 +5742,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5276 } 5742 }
5277 } 5743 }
5278 } 5744 }
5279 else { 5745 else
5746 {
5280 object[] array = new object[src.Length]; 5747 object[] array = new object[src.Length];
5281 Array.Copy(src.Data, 0, array, 0, src.Length); 5748 Array.Copy(src.Data, 0, array, 0, src.Length);
5282 result = new LSL_List(array); 5749 result = new LSL_List(array);
@@ -5383,7 +5850,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5383 public LSL_Integer llGetRegionAgentCount() 5850 public LSL_Integer llGetRegionAgentCount()
5384 { 5851 {
5385 m_host.AddScriptLPS(1); 5852 m_host.AddScriptLPS(1);
5386 return new LSL_Integer(World.GetRootAgentCount()); 5853
5854 int count = 0;
5855 World.ForEachRootScenePresence(delegate(ScenePresence sp) {
5856 count++;
5857 });
5858
5859 return new LSL_Integer(count);
5387 } 5860 }
5388 5861
5389 public LSL_Vector llGetRegionCorner() 5862 public LSL_Vector llGetRegionCorner()
@@ -5624,6 +6097,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5624 flags |= ScriptBaseClass.AGENT_AWAY; 6097 flags |= ScriptBaseClass.AGENT_AWAY;
5625 } 6098 }
5626 6099
6100 UUID busy = new UUID("efcf670c-2d18-8128-973a-034ebc806b67");
6101 UUID[] anims = agent.Animator.GetAnimationArray();
6102 if (Array.Exists<UUID>(anims, a => { return a == busy; }))
6103 {
6104 flags |= ScriptBaseClass.AGENT_BUSY;
6105 }
6106
5627 // seems to get unset, even if in mouselook, when avatar is sitting on a prim??? 6107 // seems to get unset, even if in mouselook, when avatar is sitting on a prim???
5628 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0) 6108 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
5629 { 6109 {
@@ -5671,6 +6151,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5671 flags |= ScriptBaseClass.AGENT_SITTING; 6151 flags |= ScriptBaseClass.AGENT_SITTING;
5672 } 6152 }
5673 6153
6154 if (agent.Appearance.VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MALE] > 0)
6155 {
6156 flags |= ScriptBaseClass.AGENT_MALE;
6157 }
6158
5674 return flags; 6159 return flags;
5675 } 6160 }
5676 6161
@@ -5816,9 +6301,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5816 6301
5817 List<SceneObjectPart> parts = GetLinkParts(linknumber); 6302 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5818 6303
5819 foreach (SceneObjectPart part in parts) 6304 try
6305 {
6306 foreach (SceneObjectPart part in parts)
6307 {
6308 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
6309 }
6310 }
6311 finally
5820 { 6312 {
5821 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
5822 } 6313 }
5823 } 6314 }
5824 6315
@@ -5872,13 +6363,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5872 6363
5873 if (m_host.OwnerID == land.LandData.OwnerID) 6364 if (m_host.OwnerID == land.LandData.OwnerID)
5874 { 6365 {
5875 World.TeleportClientHome(agentID, presence.ControllingClient); 6366 Vector3 p = World.GetNearestAllowedPosition(presence, land);
6367 presence.TeleportWithMomentum(p, null);
6368 presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
5876 } 6369 }
5877 } 6370 }
5878 } 6371 }
5879 ScriptSleep(5000); 6372 ScriptSleep(5000);
5880 } 6373 }
5881 6374
6375 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
6376 {
6377 return ParseString2List(str, separators, in_spacers, false);
6378 }
6379
5882 public LSL_Integer llOverMyLand(string id) 6380 public LSL_Integer llOverMyLand(string id)
5883 { 6381 {
5884 m_host.AddScriptLPS(1); 6382 m_host.AddScriptLPS(1);
@@ -5931,26 +6429,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5931 } 6429 }
5932 else 6430 else
5933 { 6431 {
5934 agentSize = GetAgentSize(avatar); 6432// agentSize = new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight);
6433 Vector3 s = avatar.Appearance.AvatarSize;
6434 agentSize = new LSL_Vector(s.X, s.Y, s.Z);
5935 } 6435 }
5936
5937 return agentSize; 6436 return agentSize;
5938 } 6437 }
5939 6438
5940 public LSL_Integer llSameGroup(string agent) 6439 public LSL_Integer llSameGroup(string id)
5941 { 6440 {
5942 m_host.AddScriptLPS(1); 6441 m_host.AddScriptLPS(1);
5943 UUID agentId = new UUID(); 6442 UUID uuid = new UUID();
5944 if (!UUID.TryParse(agent, out agentId)) 6443 if (!UUID.TryParse(id, out uuid))
5945 return new LSL_Integer(0); 6444 return new LSL_Integer(0);
5946 ScenePresence presence = World.GetScenePresence(agentId); 6445
5947 if (presence == null || presence.IsChildAgent) // Return flase for child agents 6446 // Check if it's a group key
5948 return new LSL_Integer(0); 6447 if (uuid == m_host.ParentGroup.RootPart.GroupID)
5949 IClientAPI client = presence.ControllingClient;
5950 if (m_host.GroupID == client.ActiveGroupId)
5951 return new LSL_Integer(1); 6448 return new LSL_Integer(1);
5952 else 6449
6450 // We got passed a UUID.Zero
6451 if (uuid == UUID.Zero)
6452 return new LSL_Integer(0);
6453
6454 // Handle the case where id names an avatar
6455 ScenePresence presence = World.GetScenePresence(uuid);
6456 if (presence != null)
6457 {
6458 if (presence.IsChildAgent)
6459 return new LSL_Integer(0);
6460
6461 IClientAPI client = presence.ControllingClient;
6462 if (m_host.ParentGroup.RootPart.GroupID == client.ActiveGroupId)
6463 return new LSL_Integer(1);
6464
6465 return new LSL_Integer(0);
6466 }
6467
6468 // Handle object case
6469 SceneObjectPart part = World.GetSceneObjectPart(uuid);
6470 if (part != null)
6471 {
6472 // This will handle both deed and non-deed and also the no
6473 // group case
6474 if (part.ParentGroup.RootPart.GroupID == m_host.ParentGroup.RootPart.GroupID)
6475 return new LSL_Integer(1);
6476
5953 return new LSL_Integer(0); 6477 return new LSL_Integer(0);
6478 }
6479
6480 return new LSL_Integer(0);
5954 } 6481 }
5955 6482
5956 public void llUnSit(string id) 6483 public void llUnSit(string id)
@@ -6509,6 +7036,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6509 7036
6510 protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot) 7037 protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot)
6511 { 7038 {
7039 // LSL quaternions can normalize to 0, normal Quaternions can't.
7040 if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0)
7041 rot.s = 1; // ZERO_ROTATION = 0,0,0,1
7042
6512 part.SitTargetPosition = offset; 7043 part.SitTargetPosition = offset;
6513 part.SitTargetOrientation = rot; 7044 part.SitTargetOrientation = rot;
6514 part.ParentGroup.HasGroupChanged = true; 7045 part.ParentGroup.HasGroupChanged = true;
@@ -6695,30 +7226,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6695 UUID av = new UUID(); 7226 UUID av = new UUID();
6696 if (!UUID.TryParse(avatar,out av)) 7227 if (!UUID.TryParse(avatar,out av))
6697 { 7228 {
6698 LSLError("First parameter to llDialog needs to be a key"); 7229 //LSLError("First parameter to llDialog needs to be a key");
6699 return; 7230 return;
6700 } 7231 }
6701 if (buttons.Length < 1) 7232 if (buttons.Length < 1)
6702 { 7233 {
6703 LSLError("No less than 1 button can be shown"); 7234 buttons.Add("OK");
6704 return;
6705 } 7235 }
6706 if (buttons.Length > 12) 7236 if (buttons.Length > 12)
6707 { 7237 {
6708 LSLError("No more than 12 buttons can be shown"); 7238 ShoutError("button list too long, must be 12 or fewer entries");
6709 return;
6710 } 7239 }
6711 string[] buts = new string[buttons.Length]; 7240 int length = buttons.Length;
6712 for (int i = 0; i < buttons.Length; i++) 7241 if (length > 12)
7242 length = 12;
7243
7244 string[] buts = new string[length];
7245 for (int i = 0; i < length; i++)
6713 { 7246 {
6714 if (buttons.Data[i].ToString() == String.Empty) 7247 if (buttons.Data[i].ToString() == String.Empty)
6715 { 7248 {
6716 LSLError("button label cannot be blank"); 7249 ShoutError("button label cannot be blank");
6717 return; 7250 return;
6718 } 7251 }
6719 if (buttons.Data[i].ToString().Length > 24) 7252 if (buttons.Data[i].ToString().Length > 24)
6720 { 7253 {
6721 LSLError("button label cannot be longer than 24 characters"); 7254 ShoutError("button label cannot be longer than 24 characters");
6722 return; 7255 return;
6723 } 7256 }
6724 buts[i] = buttons.Data[i].ToString(); 7257 buts[i] = buttons.Data[i].ToString();
@@ -6785,9 +7318,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6785 return; 7318 return;
6786 } 7319 }
6787 7320
6788 // the rest of the permission checks are done in RezScript, so check the pin there as well 7321 SceneObjectPart dest = World.GetSceneObjectPart(destId);
6789 World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); 7322 if (dest != null)
7323 {
7324 if ((item.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID)
7325 {
7326 // the rest of the permission checks are done in RezScript, so check the pin there as well
7327 World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param);
6790 7328
7329 if ((item.BasePermissions & (uint)PermissionMask.Copy) == 0)
7330 m_host.Inventory.RemoveInventoryItem(item.ItemID);
7331 }
7332 }
6791 // this will cause the delay even if the script pin or permissions were wrong - seems ok 7333 // this will cause the delay even if the script pin or permissions were wrong - seems ok
6792 ScriptSleep(3000); 7334 ScriptSleep(3000);
6793 } 7335 }
@@ -6861,19 +7403,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6861 public LSL_String llMD5String(string src, int nonce) 7403 public LSL_String llMD5String(string src, int nonce)
6862 { 7404 {
6863 m_host.AddScriptLPS(1); 7405 m_host.AddScriptLPS(1);
6864 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString())); 7406 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()), Encoding.UTF8);
6865 } 7407 }
6866 7408
6867 public LSL_String llSHA1String(string src) 7409 public LSL_String llSHA1String(string src)
6868 { 7410 {
6869 m_host.AddScriptLPS(1); 7411 m_host.AddScriptLPS(1);
6870 return Util.SHA1Hash(src).ToLower(); 7412 return Util.SHA1Hash(src, Encoding.UTF8).ToLower();
6871 } 7413 }
6872 7414
6873 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) 7415 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve)
6874 { 7416 {
6875 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7417 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6876 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7418 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7419 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7420 return shapeBlock;
6877 7421
6878 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 7422 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6879 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 7423 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6978,6 +7522,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6978 // Prim type box, cylinder and prism. 7522 // Prim type box, cylinder and prism.
6979 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) 7523 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)
6980 { 7524 {
7525 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7526 return;
7527
6981 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7528 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6982 ObjectShapePacket.ObjectDataBlock shapeBlock; 7529 ObjectShapePacket.ObjectDataBlock shapeBlock;
6983 7530
@@ -7031,6 +7578,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7031 // Prim type sphere. 7578 // Prim type sphere.
7032 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve) 7579 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve)
7033 { 7580 {
7581 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7582 return;
7583
7034 ObjectShapePacket.ObjectDataBlock shapeBlock; 7584 ObjectShapePacket.ObjectDataBlock shapeBlock;
7035 7585
7036 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve); 7586 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve);
@@ -7072,6 +7622,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7072 // Prim type torus, tube and ring. 7622 // Prim type torus, tube and ring.
7073 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) 7623 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)
7074 { 7624 {
7625 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7626 return;
7627
7075 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7628 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
7076 ObjectShapePacket.ObjectDataBlock shapeBlock; 7629 ObjectShapePacket.ObjectDataBlock shapeBlock;
7077 7630
@@ -7207,6 +7760,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7207 // Prim type sculpt. 7760 // Prim type sculpt.
7208 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve) 7761 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve)
7209 { 7762 {
7763 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7764 return;
7765
7210 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7766 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7211 UUID sculptId; 7767 UUID sculptId;
7212 7768
@@ -7229,7 +7785,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7229 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag)) 7785 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag))
7230 { 7786 {
7231 // default 7787 // default
7232 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7788 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
7233 } 7789 }
7234 7790
7235 part.Shape.SetSculptProperties((byte)type, sculptId); 7791 part.Shape.SetSculptProperties((byte)type, sculptId);
@@ -7246,15 +7802,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7246 ScriptSleep(200); 7802 ScriptSleep(200);
7247 } 7803 }
7248 7804
7249 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7250 {
7251 m_host.AddScriptLPS(1);
7252
7253 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
7254
7255 ScriptSleep(200);
7256 }
7257
7258 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7805 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
7259 { 7806 {
7260 m_host.AddScriptLPS(1); 7807 m_host.AddScriptLPS(1);
@@ -7262,172 +7809,135 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7262 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast"); 7809 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast");
7263 } 7810 }
7264 7811
7265 protected void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc) 7812 private void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc)
7266 { 7813 {
7267 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7814 List<object> parts = new List<object>();
7815 List<SceneObjectPart> prims = GetLinkParts(linknumber);
7816 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7817 foreach (SceneObjectPart p in prims)
7818 parts.Add(p);
7819 foreach (ScenePresence p in avatars)
7820 parts.Add(p);
7268 7821
7269 LSL_List remaining = null; 7822 LSL_List remaining = null;
7270 uint rulesParsed = 0; 7823 uint rulesParsed = 0;
7271 7824
7272 foreach (SceneObjectPart part in parts) 7825 if (parts.Count > 0)
7273 remaining = SetPrimParams(part, rules, originFunc, ref rulesParsed);
7274
7275 while (remaining != null && remaining.Length > 2)
7276 {
7277 linknumber = remaining.GetLSLIntegerItem(0);
7278 rules = remaining.GetSublist(1, -1);
7279 parts = GetLinkParts(linknumber);
7280
7281 foreach (SceneObjectPart part in parts)
7282 remaining = SetPrimParams(part, rules, originFunc, ref rulesParsed);
7283 }
7284 }
7285
7286 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
7287 {
7288 SceneObjectGroup group = m_host.ParentGroup;
7289
7290 if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
7291 return;
7292 if (group.IsAttachment)
7293 return;
7294
7295 if (frames.Data.Length > 0) // We are getting a new motion
7296 { 7826 {
7297 if (group.RootPart.KeyframeMotion != null) 7827 foreach (object part in parts)
7298 group.RootPart.KeyframeMotion.Delete();
7299 group.RootPart.KeyframeMotion = null;
7300
7301 int idx = 0;
7302
7303 KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
7304 KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
7305
7306 while (idx < options.Data.Length)
7307 { 7828 {
7308 int option = (int)options.GetLSLIntegerItem(idx++); 7829 if (part is SceneObjectPart)
7309 int remain = options.Data.Length - idx; 7830 remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
7831 else
7832 remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
7833 }
7310 7834
7311 switch (option) 7835 while ((object)remaining != null && remaining.Length > 2)
7836 {
7837 linknumber = remaining.GetLSLIntegerItem(0);
7838 rules = remaining.GetSublist(1, -1);
7839 parts.Clear();
7840 prims = GetLinkParts(linknumber);
7841 avatars = GetLinkAvatars(linknumber);
7842 foreach (SceneObjectPart p in prims)
7843 parts.Add(p);
7844 foreach (ScenePresence p in avatars)
7845 parts.Add(p);
7846
7847 remaining = null;
7848 foreach (object part in parts)
7312 { 7849 {
7313 case ScriptBaseClass.KFM_MODE: 7850 if (part is SceneObjectPart)
7314 if (remain < 1) 7851 remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
7315 break; 7852 else
7316 int modeval = (int)options.GetLSLIntegerItem(idx++); 7853 remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
7317 switch(modeval)
7318 {
7319 case ScriptBaseClass.KFM_FORWARD:
7320 mode = KeyframeMotion.PlayMode.Forward;
7321 break;
7322 case ScriptBaseClass.KFM_REVERSE:
7323 mode = KeyframeMotion.PlayMode.Reverse;
7324 break;
7325 case ScriptBaseClass.KFM_LOOP:
7326 mode = KeyframeMotion.PlayMode.Loop;
7327 break;
7328 case ScriptBaseClass.KFM_PING_PONG:
7329 mode = KeyframeMotion.PlayMode.PingPong;
7330 break;
7331 }
7332 break;
7333 case ScriptBaseClass.KFM_DATA:
7334 if (remain < 1)
7335 break;
7336 int dataval = (int)options.GetLSLIntegerItem(idx++);
7337 data = (KeyframeMotion.DataFormat)dataval;
7338 break;
7339 } 7854 }
7340 } 7855 }
7856 }
7857 }
7341 7858
7342 group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data); 7859 public LSL_List llGetPhysicsMaterial()
7860 {
7861 LSL_List result = new LSL_List();
7343 7862
7344 idx = 0; 7863 result.Add(new LSL_Float(m_host.GravityModifier));
7864 result.Add(new LSL_Float(m_host.Restitution));
7865 result.Add(new LSL_Float(m_host.Friction));
7866 result.Add(new LSL_Float(m_host.Density));
7345 7867
7346 int elemLength = 2; 7868 return result;
7347 if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation)) 7869 }
7348 elemLength = 3;
7349 7870
7350 List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>(); 7871 private void SetPhysicsMaterial(SceneObjectPart part, int material_bits,
7351 while (idx < frames.Data.Length) 7872 float material_density, float material_friction,
7352 { 7873 float material_restitution, float material_gravity_modifier)
7353 int remain = frames.Data.Length - idx; 7874 {
7875 ExtraPhysicsData physdata = new ExtraPhysicsData();
7876 physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType;
7877 physdata.Density = part.Density;
7878 physdata.Friction = part.Friction;
7879 physdata.Bounce = part.Restitution;
7880 physdata.GravitationModifier = part.GravityModifier;
7354 7881
7355 if (remain < elemLength) 7882 if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0)
7356 break; 7883 physdata.Density = material_density;
7884 if ((material_bits & (int)ScriptBaseClass.FRICTION) != 0)
7885 physdata.Friction = material_friction;
7886 if ((material_bits & (int)ScriptBaseClass.RESTITUTION) != 0)
7887 physdata.Bounce = material_restitution;
7888 if ((material_bits & (int)ScriptBaseClass.GRAVITY_MULTIPLIER) != 0)
7889 physdata.GravitationModifier = material_gravity_modifier;
7357 7890
7358 KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe(); 7891 part.UpdateExtraPhysics(physdata);
7359 frame.Position = null; 7892 }
7360 frame.Rotation = null;
7361 7893
7362 if ((data & KeyframeMotion.DataFormat.Translation) != 0) 7894 public void llSetPhysicsMaterial(int material_bits,
7363 { 7895 float material_gravity_modifier, float material_restitution,
7364 LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++); 7896 float material_friction, float material_density)
7365 frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z); 7897 {
7366 } 7898 SetPhysicsMaterial(m_host, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
7367 if ((data & KeyframeMotion.DataFormat.Rotation) != 0) 7899 }
7368 {
7369 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
7370 Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
7371 q.Normalize();
7372 frame.Rotation = q;
7373 }
7374 7900
7375 float tempf = (float)frames.GetLSLFloatItem(idx++); 7901 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7376 frame.TimeMS = (int)(tempf * 1000.0f); 7902 {
7903 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
7904 llSetLinkPrimitiveParamsFast(linknumber, rules);
7905 ScriptSleep(200);
7906 }
7377 7907
7378 keyframes.Add(frame); 7908 // vector up using libomv (c&p from sop )
7379 } 7909 // vector up rotated by r
7910 private Vector3 Zrot(Quaternion r)
7911 {
7912 double x, y, z, m;
7380 7913
7381 group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray()); 7914 m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
7382 group.RootPart.KeyframeMotion.Start(); 7915 if (Math.Abs(1.0 - m) > 0.000001)
7383 }
7384 else
7385 { 7916 {
7386 if (group.RootPart.KeyframeMotion == null) 7917 m = 1.0 / Math.Sqrt(m);
7387 return; 7918 r.X *= (float)m;
7388 7919 r.Y *= (float)m;
7389 if (options.Data.Length == 0) 7920 r.Z *= (float)m;
7390 { 7921 r.W *= (float)m;
7391 group.RootPart.KeyframeMotion.Stop(); 7922 }
7392 return;
7393 }
7394
7395 int code = (int)options.GetLSLIntegerItem(0);
7396
7397 int idx = 0;
7398 7923
7399 while (idx < options.Data.Length) 7924 x = 2 * (r.X * r.Z + r.Y * r.W);
7400 { 7925 y = 2 * (-r.X * r.W + r.Y * r.Z);
7401 int option = (int)options.GetLSLIntegerItem(idx++); 7926 z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
7402 int remain = options.Data.Length - idx;
7403 7927
7404 switch (option) 7928 return new Vector3((float)x, (float)y, (float)z);
7405 {
7406 case ScriptBaseClass.KFM_COMMAND:
7407 int cmd = (int)options.GetLSLIntegerItem(idx++);
7408 switch (cmd)
7409 {
7410 case ScriptBaseClass.KFM_CMD_PLAY:
7411 group.RootPart.KeyframeMotion.Start();
7412 break;
7413 case ScriptBaseClass.KFM_CMD_STOP:
7414 group.RootPart.KeyframeMotion.Stop();
7415 break;
7416 case ScriptBaseClass.KFM_CMD_PAUSE:
7417 group.RootPart.KeyframeMotion.Pause();
7418 break;
7419 }
7420 break;
7421 }
7422 }
7423 }
7424 } 7929 }
7425 7930
7426 protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules, string originFunc, ref uint rulesParsed) 7931 protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules, string originFunc, ref uint rulesParsed)
7427 { 7932 {
7933 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7934 return null;
7935
7428 int idx = 0; 7936 int idx = 0;
7429 int idxStart = 0; 7937 int idxStart = 0;
7430 7938
7939 SceneObjectGroup parentgrp = part.ParentGroup;
7940
7431 bool positionChanged = false; 7941 bool positionChanged = false;
7432 LSL_Vector currentPosition = GetPartLocalPos(part); 7942 LSL_Vector currentPosition = GetPartLocalPos(part);
7433 7943
@@ -7452,8 +7962,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7452 return null; 7962 return null;
7453 7963
7454 v=rules.GetVector3Item(idx++); 7964 v=rules.GetVector3Item(idx++);
7965 if (part.IsRoot && !part.ParentGroup.IsAttachment)
7966 currentPosition = GetSetPosTarget(part, v, currentPosition, true);
7967 else
7968 currentPosition = GetSetPosTarget(part, v, currentPosition, false);
7455 positionChanged = true; 7969 positionChanged = true;
7456 currentPosition = GetSetPosTarget(part, v, currentPosition);
7457 7970
7458 break; 7971 break;
7459 case (int)ScriptBaseClass.PRIM_SIZE: 7972 case (int)ScriptBaseClass.PRIM_SIZE:
@@ -7470,7 +7983,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7470 7983
7471 LSL_Rotation q = rules.GetQuaternionItem(idx++); 7984 LSL_Rotation q = rules.GetQuaternionItem(idx++);
7472 // try to let this work as in SL... 7985 // try to let this work as in SL...
7473 if (part.ParentID == 0) 7986 if (part.ParentID == 0 || (part.ParentGroup != null && part == part.ParentGroup.RootPart))
7474 { 7987 {
7475 // special case: If we are root, rotate complete SOG to new rotation 7988 // special case: If we are root, rotate complete SOG to new rotation
7476 SetRot(part, q); 7989 SetRot(part, q);
@@ -7730,7 +8243,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7730 return null; 8243 return null;
7731 8244
7732 string ph = rules.Data[idx++].ToString(); 8245 string ph = rules.Data[idx++].ToString();
7733 m_host.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1")); 8246 parentgrp.ScriptSetPhantomStatus(ph.Equals("1"));
7734 8247
7735 break; 8248 break;
7736 8249
@@ -7764,12 +8277,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7764 8277
7765 break; 8278 break;
7766 8279
8280 case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
8281 if (remain < 5)
8282 return null;
8283
8284 int material_bits = rules.GetLSLIntegerItem(idx++);
8285 float material_density = (float)rules.GetLSLFloatItem(idx++);
8286 float material_friction = (float)rules.GetLSLFloatItem(idx++);
8287 float material_restitution = (float)rules.GetLSLFloatItem(idx++);
8288 float material_gravity_modifier = (float)rules.GetLSLFloatItem(idx++);
8289
8290 SetPhysicsMaterial(part, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
8291
8292 break;
8293
7767 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ: 8294 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
7768 if (remain < 1) 8295 if (remain < 1)
7769 return null; 8296 return null;
7770 string temp = rules.Data[idx++].ToString(); 8297 string temp = rules.Data[idx++].ToString();
7771 8298
7772 m_host.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1")); 8299 parentgrp.ScriptSetTemporaryStatus(temp.Equals("1"));
7773 8300
7774 break; 8301 break;
7775 8302
@@ -7843,14 +8370,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7843 if (part.ParentGroup.RootPart == part) 8370 if (part.ParentGroup.RootPart == part)
7844 { 8371 {
7845 SceneObjectGroup parent = part.ParentGroup; 8372 SceneObjectGroup parent = part.ParentGroup;
7846 parent.UpdateGroupPosition(currentPosition); 8373 Util.FireAndForget(delegate(object x) {
8374 parent.UpdateGroupPosition(currentPosition);
8375 });
7847 } 8376 }
7848 else 8377 else
7849 { 8378 {
7850 part.OffsetPosition = currentPosition; 8379 part.OffsetPosition = currentPosition;
7851 SceneObjectGroup parent = part.ParentGroup; 8380// SceneObjectGroup parent = part.ParentGroup;
7852 parent.HasGroupChanged = true; 8381// parent.HasGroupChanged = true;
7853 parent.ScheduleGroupForTerseUpdate(); 8382// parent.ScheduleGroupForTerseUpdate();
8383 part.ScheduleTerseUpdate();
7854 } 8384 }
7855 } 8385 }
7856 } 8386 }
@@ -7888,10 +8418,91 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7888 8418
7889 public LSL_String llXorBase64Strings(string str1, string str2) 8419 public LSL_String llXorBase64Strings(string str1, string str2)
7890 { 8420 {
7891 m_host.AddScriptLPS(1); 8421 string b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
7892 Deprecated("llXorBase64Strings"); 8422
7893 ScriptSleep(300); 8423 ScriptSleep(300);
7894 return String.Empty; 8424 m_host.AddScriptLPS(1);
8425
8426 if (str1 == String.Empty)
8427 return String.Empty;
8428 if (str2 == String.Empty)
8429 return str1;
8430
8431 int len = str2.Length;
8432 if ((len % 4) != 0) // LL is EVIL!!!!
8433 {
8434 while (str2.EndsWith("="))
8435 str2 = str2.Substring(0, str2.Length - 1);
8436
8437 len = str2.Length;
8438 int mod = len % 4;
8439
8440 if (mod == 1)
8441 str2 = str2.Substring(0, str2.Length - 1);
8442 else if (mod == 2)
8443 str2 += "==";
8444 else if (mod == 3)
8445 str2 += "=";
8446 }
8447
8448 byte[] data1;
8449 byte[] data2;
8450 try
8451 {
8452 data1 = Convert.FromBase64String(str1);
8453 data2 = Convert.FromBase64String(str2);
8454 }
8455 catch (Exception)
8456 {
8457 return new LSL_String(String.Empty);
8458 }
8459
8460 // For cases where the decoded length of s2 is greater
8461 // than the decoded length of s1, simply perform a normal
8462 // decode and XOR
8463 //
8464 if (data2.Length >= data1.Length)
8465 {
8466 for (int pos = 0 ; pos < data1.Length ; pos++ )
8467 data1[pos] ^= data2[pos];
8468
8469 return Convert.ToBase64String(data1);
8470 }
8471
8472 // Remove padding
8473 while (str1.EndsWith("="))
8474 str1 = str1.Substring(0, str1.Length - 1);
8475 while (str2.EndsWith("="))
8476 str2 = str2.Substring(0, str2.Length - 1);
8477
8478 byte[] d1 = new byte[str1.Length];
8479 byte[] d2 = new byte[str2.Length];
8480
8481 for (int i = 0 ; i < str1.Length ; i++)
8482 {
8483 int idx = b64.IndexOf(str1.Substring(i, 1));
8484 if (idx == -1)
8485 idx = 0;
8486 d1[i] = (byte)idx;
8487 }
8488
8489 for (int i = 0 ; i < str2.Length ; i++)
8490 {
8491 int idx = b64.IndexOf(str2.Substring(i, 1));
8492 if (idx == -1)
8493 idx = 0;
8494 d2[i] = (byte)idx;
8495 }
8496
8497 string output = String.Empty;
8498
8499 for (int pos = 0 ; pos < d1.Length ; pos++)
8500 output += b64[d1[pos] ^ d2[pos % d2.Length]];
8501
8502 while (output.Length % 3 > 0)
8503 output += "=";
8504
8505 return output;
7895 } 8506 }
7896 8507
7897 public void llRemoteDataSetRegion() 8508 public void llRemoteDataSetRegion()
@@ -8016,8 +8627,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8016 public LSL_Integer llGetNumberOfPrims() 8627 public LSL_Integer llGetNumberOfPrims()
8017 { 8628 {
8018 m_host.AddScriptLPS(1); 8629 m_host.AddScriptLPS(1);
8019 8630 int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
8020 return m_host.ParentGroup.PrimCount + m_host.ParentGroup.GetSittingAvatarsCount(); 8631
8632 return m_host.ParentGroup.PrimCount + avatarCount;
8021 } 8633 }
8022 8634
8023 /// <summary> 8635 /// <summary>
@@ -8032,55 +8644,114 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8032 m_host.AddScriptLPS(1); 8644 m_host.AddScriptLPS(1);
8033 UUID objID = UUID.Zero; 8645 UUID objID = UUID.Zero;
8034 LSL_List result = new LSL_List(); 8646 LSL_List result = new LSL_List();
8647
8648 // If the ID is not valid, return null result
8035 if (!UUID.TryParse(obj, out objID)) 8649 if (!UUID.TryParse(obj, out objID))
8036 { 8650 {
8037 result.Add(new LSL_Vector()); 8651 result.Add(new LSL_Vector());
8038 result.Add(new LSL_Vector()); 8652 result.Add(new LSL_Vector());
8039 return result; 8653 return result;
8040 } 8654 }
8655
8656 // Check if this is an attached prim. If so, replace
8657 // the UUID with the avatar UUID and report it's bounding box
8658 SceneObjectPart part = World.GetSceneObjectPart(objID);
8659 if (part != null && part.ParentGroup.IsAttachment)
8660 objID = part.ParentGroup.AttachedAvatar;
8661
8662 // Find out if this is an avatar ID. If so, return it's box
8041 ScenePresence presence = World.GetScenePresence(objID); 8663 ScenePresence presence = World.GetScenePresence(objID);
8042 if (presence != null) 8664 if (presence != null)
8043 { 8665 {
8044 if (presence.ParentID == 0) // not sat on an object 8666 // As per LSL Wiki, there is no difference between sitting
8667 // and standing avatar since server 1.36
8668 LSL_Vector lower;
8669 LSL_Vector upper;
8670
8671 Vector3 box = presence.Appearance.AvatarBoxSize * 0.5f;
8672
8673 if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID
8674 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
8675/*
8045 { 8676 {
8046 LSL_Vector lower; 8677 // This is for ground sitting avatars
8047 LSL_Vector upper; 8678 float height = presence.Appearance.AvatarHeight / 2.66666667f;
8048 if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID 8679 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
8049 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 8680 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
8050 { 8681 }
8051 // This is for ground sitting avatars 8682 else
8052 float height = presence.Appearance.AvatarHeight / 2.66666667f; 8683 {
8053 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f); 8684 // This is for standing/flying avatars
8054 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f); 8685 float height = presence.Appearance.AvatarHeight / 2.0f;
8055 } 8686 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
8056 else 8687 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
8057 { 8688 }
8058 // This is for standing/flying avatars 8689
8059 float height = presence.Appearance.AvatarHeight / 2.0f; 8690 // Adjust to the documented error offsets (see LSL Wiki)
8060 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f); 8691 lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
8061 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f); 8692 upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
8062 } 8693*/
8063 result.Add(lower); 8694 {
8064 result.Add(upper); 8695 // This is for ground sitting avatars TODO!
8065 return result; 8696 lower = new LSL_Vector(-box.X - 0.1125, -box.Y, box.Z * -1.0f);
8697 upper = new LSL_Vector(box.X + 0.1125, box.Y, box.Z * -1.0f);
8066 } 8698 }
8067 else 8699 else
8068 { 8700 {
8069 // sitting on an object so we need the bounding box of that 8701 // This is for standing/flying avatars
8070 // which should include the avatar so set the UUID to the 8702 lower = new LSL_Vector(-box.X, -box.Y, -box.Z);
8071 // UUID of the object the avatar is sat on and allow it to fall through 8703 upper = new LSL_Vector(box.X, box.Y, box.Z);
8072 // to processing an object
8073 SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
8074 objID = p.UUID;
8075 } 8704 }
8705
8706 if (lower.x > upper.x)
8707 lower.x = upper.x;
8708 if (lower.y > upper.y)
8709 lower.y = upper.y;
8710 if (lower.z > upper.z)
8711 lower.z = upper.z;
8712
8713 result.Add(lower);
8714 result.Add(upper);
8715 return result;
8076 } 8716 }
8077 SceneObjectPart part = World.GetSceneObjectPart(objID); 8717
8718 part = World.GetSceneObjectPart(objID);
8078 // Currently only works for single prims without a sitting avatar 8719 // Currently only works for single prims without a sitting avatar
8079 if (part != null) 8720 if (part != null)
8080 { 8721 {
8081 Vector3 halfSize = part.Scale / 2.0f; 8722 float minX;
8082 LSL_Vector lower = (new LSL_Vector(halfSize)) * -1.0f; 8723 float maxX;
8083 LSL_Vector upper = new LSL_Vector(halfSize); 8724 float minY;
8725 float maxY;
8726 float minZ;
8727 float maxZ;
8728
8729 // This BBox is in sim coordinates, with the offset being
8730 // a contained point.
8731 Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
8732 out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
8733
8734 minX -= offsets[0].X;
8735 maxX -= offsets[0].X;
8736 minY -= offsets[0].Y;
8737 maxY -= offsets[0].Y;
8738 minZ -= offsets[0].Z;
8739 maxZ -= offsets[0].Z;
8740
8741 LSL_Vector lower;
8742 LSL_Vector upper;
8743
8744 // Adjust to the documented error offsets (see LSL Wiki)
8745 lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
8746 upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
8747
8748 if (lower.x > upper.x)
8749 lower.x = upper.x;
8750 if (lower.y > upper.y)
8751 lower.y = upper.y;
8752 if (lower.z > upper.z)
8753 lower.z = upper.z;
8754
8084 result.Add(lower); 8755 result.Add(lower);
8085 result.Add(upper); 8756 result.Add(upper);
8086 return result; 8757 return result;
@@ -8097,224 +8768,74 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8097 return new LSL_Vector(m_host.GetGeometricCenter()); 8768 return new LSL_Vector(m_host.GetGeometricCenter());
8098 } 8769 }
8099 8770
8100 public LSL_List GetEntityParams(ISceneEntity entity, LSL_List rules) 8771 public LSL_List llGetPrimitiveParams(LSL_List rules)
8101 { 8772 {
8102 LSL_List result = new LSL_List(); 8773 m_host.AddScriptLPS(1);
8103 LSL_List remaining = null;
8104 8774
8105 while (true) 8775 LSL_List result = new LSL_List();
8106 {
8107 if (entity is SceneObjectPart)
8108 remaining = GetPrimParams((SceneObjectPart)entity, rules, ref result);
8109 else
8110 remaining = GetAgentParams((ScenePresence)entity, rules, ref result);
8111 8776
8112 if (remaining == null || remaining.Length <= 2) 8777 LSL_List remaining = GetPrimParams(m_host, rules, ref result);
8113 return result;
8114 8778
8779 while ((object)remaining != null && remaining.Length > 2)
8780 {
8115 int linknumber = remaining.GetLSLIntegerItem(0); 8781 int linknumber = remaining.GetLSLIntegerItem(0);
8116 rules = remaining.GetSublist(1, -1); 8782 rules = remaining.GetSublist(1, -1);
8117 entity = GetLinkEntity(linknumber); 8783 List<SceneObjectPart> parts = GetLinkParts(linknumber);
8118 }
8119 }
8120 8784
8121 public LSL_List llGetPrimitiveParams(LSL_List rules) 8785 foreach (SceneObjectPart part in parts)
8122 { 8786 remaining = GetPrimParams(part, rules, ref result);
8123 m_host.AddScriptLPS(1); 8787 }
8124 8788
8125 return GetEntityParams(m_host, rules); 8789 return result;
8126 } 8790 }
8127 8791
8128 public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules) 8792 public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules)
8129 { 8793 {
8130 m_host.AddScriptLPS(1); 8794 m_host.AddScriptLPS(1);
8131 8795
8132 return GetEntityParams(GetLinkEntity(linknumber), rules); 8796 // acording to SL wiki this must indicate a single link number or link_root or link_this.
8133 } 8797 // keep other options as before
8134 8798
8135 public LSL_Vector GetAgentSize(ScenePresence sp) 8799 List<SceneObjectPart> parts;
8136 { 8800 List<ScenePresence> avatars;
8137 return new LSL_Vector(0.45, 0.6, sp.Appearance.AvatarHeight); 8801
8138 } 8802 LSL_List res = new LSL_List();
8803 LSL_List remaining = null;
8139 8804
8140 /// <summary> 8805 while (rules.Length > 0)
8141 /// Gets params for a seated avatar in a linkset.
8142 /// </summary>
8143 /// <returns></returns>
8144 /// <param name='sp'></param>
8145 /// <param name='rules'></param>
8146 /// <param name='res'></param>
8147 public LSL_List GetAgentParams(ScenePresence sp, LSL_List rules, ref LSL_List res)
8148 {
8149 int idx = 0;
8150 while (idx < rules.Length)
8151 { 8806 {
8152 int code = (int)rules.GetLSLIntegerItem(idx++); 8807 parts = GetLinkParts(linknumber);
8153 int remain = rules.Length-idx; 8808 avatars = GetLinkAvatars(linknumber);
8154 8809
8155 switch (code) 8810 remaining = null;
8811 foreach (SceneObjectPart part in parts)
8156 { 8812 {
8157 case (int)ScriptBaseClass.PRIM_MATERIAL: 8813 remaining = GetPrimParams(part, rules, ref res);
8158 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_MATERIAL_FLESH)); 8814 }
8159 break; 8815 foreach (ScenePresence avatar in avatars)
8160 8816 {
8161 case (int)ScriptBaseClass.PRIM_PHYSICS: 8817 remaining = GetPrimParams(avatar, rules, ref res);
8162 res.Add(ScriptBaseClass.FALSE); 8818 }
8163 break;
8164
8165 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
8166 res.Add(ScriptBaseClass.FALSE);
8167 break;
8168
8169 case (int)ScriptBaseClass.PRIM_PHANTOM:
8170 res.Add(ScriptBaseClass.FALSE);
8171 break;
8172
8173 case (int)ScriptBaseClass.PRIM_POSITION:
8174 res.Add(new LSL_Vector(sp.AbsolutePosition));
8175 break;
8176
8177 case (int)ScriptBaseClass.PRIM_SIZE:
8178 res.Add(GetAgentSize(sp));
8179 break;
8180
8181 case (int)ScriptBaseClass.PRIM_ROTATION:
8182 res.Add(sp.GetWorldRotation());
8183 break;
8184
8185 case (int)ScriptBaseClass.PRIM_TYPE:
8186 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
8187 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
8188 res.Add(new LSL_Vector(0, 1, 0));
8189 res.Add(new LSL_Float(0));
8190 res.Add(new LSL_Vector(0, 0, 0));
8191 res.Add(new LSL_Vector(1, 1, 0));
8192 res.Add(new LSL_Vector(0, 0, 0));
8193 break;
8194
8195 case (int)ScriptBaseClass.PRIM_TEXTURE:
8196 if (remain < 1)
8197 return null;
8198
8199 int face = (int)rules.GetLSLIntegerItem(idx++);
8200 if (face > 21)
8201 break;
8202
8203 res.Add(new LSL_String(""));
8204 res.Add(ScriptBaseClass.ZERO_VECTOR);
8205 res.Add(ScriptBaseClass.ZERO_VECTOR);
8206 res.Add(new LSL_Float(0));
8207 break;
8208
8209 case (int)ScriptBaseClass.PRIM_COLOR:
8210 if (remain < 1)
8211 return null;
8212
8213 face = (int)rules.GetLSLIntegerItem(idx++);
8214 if (face > 21)
8215 break;
8216
8217 res.Add(ScriptBaseClass.ZERO_VECTOR);
8218 res.Add(new LSL_Float(0));
8219 break;
8220
8221 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
8222 if (remain < 1)
8223 return null;
8224
8225 face = (int)rules.GetLSLIntegerItem(idx++);
8226 if (face > 21)
8227 break;
8228
8229 res.Add(ScriptBaseClass.PRIM_SHINY_NONE);
8230 res.Add(ScriptBaseClass.PRIM_BUMP_NONE);
8231 break;
8232
8233 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
8234 if (remain < 1)
8235 return null;
8236
8237 face = (int)rules.GetLSLIntegerItem(idx++);
8238 if (face > 21)
8239 break;
8240
8241 res.Add(ScriptBaseClass.FALSE);
8242 break;
8243
8244 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
8245 res.Add(ScriptBaseClass.FALSE);
8246 res.Add(new LSL_Integer(0));
8247 res.Add(new LSL_Float(0));
8248 res.Add(new LSL_Float(0));
8249 res.Add(new LSL_Float(0));
8250 res.Add(new LSL_Float(0));
8251 res.Add(ScriptBaseClass.ZERO_VECTOR);
8252 break;
8253
8254 case (int)ScriptBaseClass.PRIM_TEXGEN:
8255 if (remain < 1)
8256 return null;
8257
8258 face = (int)rules.GetLSLIntegerItem(idx++);
8259 if (face > 21)
8260 break;
8261
8262 res.Add(ScriptBaseClass.PRIM_TEXGEN_DEFAULT);
8263 break;
8264
8265 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
8266 res.Add(ScriptBaseClass.FALSE);
8267 res.Add(ScriptBaseClass.ZERO_VECTOR);
8268 res.Add(ScriptBaseClass.ZERO_VECTOR);
8269 break;
8270
8271 case (int)ScriptBaseClass.PRIM_GLOW:
8272 if (remain < 1)
8273 return null;
8274
8275 face = (int)rules.GetLSLIntegerItem(idx++);
8276 if (face > 21)
8277 break;
8278
8279 res.Add(new LSL_Float(0));
8280 break;
8281
8282 case (int)ScriptBaseClass.PRIM_TEXT:
8283 res.Add(new LSL_String(""));
8284 res.Add(ScriptBaseClass.ZERO_VECTOR);
8285 res.Add(new LSL_Float(1));
8286 break;
8287
8288 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
8289 res.Add(new LSL_Rotation(sp.Rotation));
8290 break;
8291
8292 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
8293 res.Add(new LSL_Vector(sp.OffsetPosition));
8294 break;
8295
8296 case (int)ScriptBaseClass.PRIM_SLICE:
8297 res.Add(new LSL_Vector(0, 1, 0));
8298 break;
8299
8300 case (int)ScriptBaseClass.PRIM_LINK_TARGET:
8301 if(remain < 3)
8302 return null;
8303 8819
8304 return rules.GetSublist(idx, -1); 8820 if ((object)remaining != null && remaining.Length > 0)
8821 {
8822 linknumber = remaining.GetLSLIntegerItem(0);
8823 rules = remaining.GetSublist(1, -1);
8305 } 8824 }
8825 else
8826 break;
8306 } 8827 }
8307 8828
8308 return null; 8829 return res;
8309 } 8830 }
8310 8831
8311 public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules, ref LSL_List res) 8832 public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules, ref LSL_List res)
8312 { 8833 {
8313 int idx = 0; 8834 int idx=0;
8314 while (idx < rules.Length) 8835 while (idx < rules.Length)
8315 { 8836 {
8316 int code = (int)rules.GetLSLIntegerItem(idx++); 8837 int code=(int)rules.GetLSLIntegerItem(idx++);
8317 int remain = rules.Length-idx; 8838 int remain=rules.Length-idx;
8318 8839
8319 switch (code) 8840 switch (code)
8320 { 8841 {
@@ -8344,19 +8865,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8344 break; 8865 break;
8345 8866
8346 case (int)ScriptBaseClass.PRIM_POSITION: 8867 case (int)ScriptBaseClass.PRIM_POSITION:
8347 LSL_Vector v = new LSL_Vector(part.AbsolutePosition); 8868 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
8348 8869 part.AbsolutePosition.Y,
8349 // For some reason, the part.AbsolutePosition.* values do not change if the 8870 part.AbsolutePosition.Z);
8350 // linkset is rotated; they always reflect the child prim's world position
8351 // as though the linkset is unrotated. This is incompatible behavior with SL's
8352 // implementation, so will break scripts imported from there (not to mention it
8353 // makes it more difficult to determine a child prim's actual inworld position).
8354 if (!part.IsRoot)
8355 {
8356 LSL_Vector rootPos = new LSL_Vector(m_host.ParentGroup.AbsolutePosition);
8357 v = ((v - rootPos) * llGetRootRotation()) + rootPos;
8358 }
8359
8360 res.Add(v); 8871 res.Add(v);
8361 break; 8872 break;
8362 8873
@@ -8526,30 +9037,56 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8526 if (remain < 1) 9037 if (remain < 1)
8527 return null; 9038 return null;
8528 9039
8529 face=(int)rules.GetLSLIntegerItem(idx++); 9040 face = (int)rules.GetLSLIntegerItem(idx++);
8530 9041
8531 tex = part.Shape.Textures; 9042 tex = part.Shape.Textures;
9043 int shiny;
8532 if (face == ScriptBaseClass.ALL_SIDES) 9044 if (face == ScriptBaseClass.ALL_SIDES)
8533 { 9045 {
8534 for (face = 0; face < GetNumberOfSides(part); face++) 9046 for (face = 0; face < GetNumberOfSides(part); face++)
8535 { 9047 {
8536 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9048 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8537 // Convert Shininess to PRIM_SHINY_* 9049 if (shinyness == Shininess.High)
8538 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 9050 {
8539 // PRIM_BUMP_* 9051 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8540 res.Add(new LSL_Integer((int)texface.Bump)); 9052 }
9053 else if (shinyness == Shininess.Medium)
9054 {
9055 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
9056 }
9057 else if (shinyness == Shininess.Low)
9058 {
9059 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
9060 }
9061 else
9062 {
9063 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
9064 }
9065 res.Add(new LSL_Integer(shiny));
9066 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8541 } 9067 }
8542 } 9068 }
8543 else 9069 else
8544 { 9070 {
8545 if (face >= 0 && face < GetNumberOfSides(part)) 9071 Shininess shinyness = tex.GetFace((uint)face).Shiny;
9072 if (shinyness == Shininess.High)
8546 { 9073 {
8547 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9074 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8548 // Convert Shininess to PRIM_SHINY_* 9075 }
8549 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 9076 else if (shinyness == Shininess.Medium)
8550 // PRIM_BUMP_* 9077 {
8551 res.Add(new LSL_Integer((int)texface.Bump)); 9078 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8552 } 9079 }
9080 else if (shinyness == Shininess.Low)
9081 {
9082 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
9083 }
9084 else
9085 {
9086 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
9087 }
9088 res.Add(new LSL_Integer(shiny));
9089 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8553 } 9090 }
8554 break; 9091 break;
8555 9092
@@ -8560,21 +9097,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8560 face = (int)rules.GetLSLIntegerItem(idx++); 9097 face = (int)rules.GetLSLIntegerItem(idx++);
8561 9098
8562 tex = part.Shape.Textures; 9099 tex = part.Shape.Textures;
9100 int fullbright;
8563 if (face == ScriptBaseClass.ALL_SIDES) 9101 if (face == ScriptBaseClass.ALL_SIDES)
8564 { 9102 {
8565 for (face = 0; face < GetNumberOfSides(part); face++) 9103 for (face = 0; face < GetNumberOfSides(part); face++)
8566 { 9104 {
8567 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9105 if (tex.GetFace((uint)face).Fullbright == true)
8568 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 9106 {
9107 fullbright = ScriptBaseClass.TRUE;
9108 }
9109 else
9110 {
9111 fullbright = ScriptBaseClass.FALSE;
9112 }
9113 res.Add(new LSL_Integer(fullbright));
8569 } 9114 }
8570 } 9115 }
8571 else 9116 else
8572 { 9117 {
8573 if (face >= 0 && face < GetNumberOfSides(part)) 9118 if (tex.GetFace((uint)face).Fullbright == true)
8574 { 9119 {
8575 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9120 fullbright = ScriptBaseClass.TRUE;
8576 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0));
8577 } 9121 }
9122 else
9123 {
9124 fullbright = ScriptBaseClass.FALSE;
9125 }
9126 res.Add(new LSL_Integer(fullbright));
8578 } 9127 }
8579 break; 9128 break;
8580 9129
@@ -8596,27 +9145,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8596 break; 9145 break;
8597 9146
8598 case (int)ScriptBaseClass.PRIM_TEXGEN: 9147 case (int)ScriptBaseClass.PRIM_TEXGEN:
9148 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
8599 if (remain < 1) 9149 if (remain < 1)
8600 return null; 9150 return null;
8601 9151
8602 face=(int)rules.GetLSLIntegerItem(idx++); 9152 face = (int)rules.GetLSLIntegerItem(idx++);
8603 9153
8604 tex = part.Shape.Textures; 9154 tex = part.Shape.Textures;
8605 if (face == ScriptBaseClass.ALL_SIDES) 9155 if (face == ScriptBaseClass.ALL_SIDES)
8606 { 9156 {
8607 for (face = 0; face < GetNumberOfSides(part); face++) 9157 for (face = 0; face < GetNumberOfSides(part); face++)
8608 { 9158 {
8609 MappingType texgen = tex.GetFace((uint)face).TexMapType; 9159 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8610 // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc. 9160 {
8611 res.Add(new LSL_Integer((uint)texgen >> 1)); 9161 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
9162 }
9163 else
9164 {
9165 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
9166 }
8612 } 9167 }
8613 } 9168 }
8614 else 9169 else
8615 { 9170 {
8616 if (face >= 0 && face < GetNumberOfSides(part)) 9171 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8617 { 9172 {
8618 MappingType texgen = tex.GetFace((uint)face).TexMapType; 9173 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8619 res.Add(new LSL_Integer((uint)texgen >> 1)); 9174 }
9175 else
9176 {
9177 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8620 } 9178 }
8621 } 9179 }
8622 break; 9180 break;
@@ -8640,24 +9198,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8640 if (remain < 1) 9198 if (remain < 1)
8641 return null; 9199 return null;
8642 9200
8643 face=(int)rules.GetLSLIntegerItem(idx++); 9201 face = (int)rules.GetLSLIntegerItem(idx++);
8644 9202
8645 tex = part.Shape.Textures; 9203 tex = part.Shape.Textures;
9204 float primglow;
8646 if (face == ScriptBaseClass.ALL_SIDES) 9205 if (face == ScriptBaseClass.ALL_SIDES)
8647 { 9206 {
8648 for (face = 0; face < GetNumberOfSides(part); face++) 9207 for (face = 0; face < GetNumberOfSides(part); face++)
8649 { 9208 {
8650 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9209 primglow = tex.GetFace((uint)face).Glow;
8651 res.Add(new LSL_Float(texface.Glow)); 9210 res.Add(new LSL_Float(primglow));
8652 } 9211 }
8653 } 9212 }
8654 else 9213 else
8655 { 9214 {
8656 if (face >= 0 && face < GetNumberOfSides(part)) 9215 primglow = tex.GetFace((uint)face).Glow;
8657 { 9216 res.Add(new LSL_Float(primglow));
8658 Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
8659 res.Add(new LSL_Float(texface.Glow));
8660 }
8661 } 9217 }
8662 break; 9218 break;
8663 9219
@@ -8669,15 +9225,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8669 textColor.B)); 9225 textColor.B));
8670 res.Add(new LSL_Float(textColor.A)); 9226 res.Add(new LSL_Float(textColor.A));
8671 break; 9227 break;
9228
8672 case (int)ScriptBaseClass.PRIM_NAME: 9229 case (int)ScriptBaseClass.PRIM_NAME:
8673 res.Add(new LSL_String(part.Name)); 9230 res.Add(new LSL_String(part.Name));
8674 break; 9231 break;
9232
8675 case (int)ScriptBaseClass.PRIM_DESC: 9233 case (int)ScriptBaseClass.PRIM_DESC:
8676 res.Add(new LSL_String(part.Description)); 9234 res.Add(new LSL_String(part.Description));
8677 break; 9235 break;
8678 case (int)ScriptBaseClass.PRIM_ROT_LOCAL: 9236 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
8679 res.Add(new LSL_Rotation(part.RotationOffset)); 9237 res.Add(new LSL_Rotation(part.RotationOffset));
8680 break; 9238 break;
9239
8681 case (int)ScriptBaseClass.PRIM_POS_LOCAL: 9240 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
8682 res.Add(new LSL_Vector(GetPartLocalPos(part))); 9241 res.Add(new LSL_Vector(GetPartLocalPos(part)));
8683 break; 9242 break;
@@ -9288,8 +9847,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9288 // The function returns an ordered list 9847 // The function returns an ordered list
9289 // representing the tokens found in the supplied 9848 // representing the tokens found in the supplied
9290 // sources string. If two successive tokenizers 9849 // sources string. If two successive tokenizers
9291 // are encountered, then a NULL entry is added 9850 // are encountered, then a null-string entry is
9292 // to the list. 9851 // added to the list.
9293 // 9852 //
9294 // It is a precondition that the source and 9853 // It is a precondition that the source and
9295 // toekizer lisst are non-null. If they are null, 9854 // toekizer lisst are non-null. If they are null,
@@ -9297,7 +9856,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9297 // while their lengths are being determined. 9856 // while their lengths are being determined.
9298 // 9857 //
9299 // A small amount of working memoryis required 9858 // A small amount of working memoryis required
9300 // of approximately 8*#tokenizers. 9859 // of approximately 8*#tokenizers + 8*srcstrlen.
9301 // 9860 //
9302 // There are many ways in which this function 9861 // There are many ways in which this function
9303 // can be implemented, this implementation is 9862 // can be implemented, this implementation is
@@ -9313,155 +9872,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9313 // and eliminates redundant tokenizers as soon 9872 // and eliminates redundant tokenizers as soon
9314 // as is possible. 9873 // as is possible.
9315 // 9874 //
9316 // The implementation tries to avoid any copying 9875 // The implementation tries to minimize temporary
9317 // of arrays or other objects. 9876 // garbage generation.
9318 // </remarks> 9877 // </remarks>
9319 9878
9320 private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) 9879 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
9321 { 9880 {
9322 int beginning = 0; 9881 return ParseString2List(src, separators, spacers, true);
9323 int srclen = src.Length; 9882 }
9324 int seplen = separators.Length;
9325 object[] separray = separators.Data;
9326 int spclen = spacers.Length;
9327 object[] spcarray = spacers.Data;
9328 int mlen = seplen+spclen;
9329
9330 int[] offset = new int[mlen+1];
9331 bool[] active = new bool[mlen];
9332
9333 int best;
9334 int j;
9335
9336 // Initial capacity reduces resize cost
9337 9883
9338 LSL_List tokens = new LSL_List(); 9884 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
9885 {
9886 int srclen = src.Length;
9887 int seplen = separators.Length;
9888 object[] separray = separators.Data;
9889 int spclen = spacers.Length;
9890 object[] spcarray = spacers.Data;
9891 int dellen = 0;
9892 string[] delarray = new string[seplen+spclen];
9339 9893
9340 // All entries are initially valid 9894 int outlen = 0;
9895 string[] outarray = new string[srclen*2+1];
9341 9896
9342 for (int i = 0; i < mlen; i++) 9897 int i, j;
9343 active[i] = true; 9898 string d;
9344 9899
9345 offset[mlen] = srclen; 9900 m_host.AddScriptLPS(1);
9346 9901
9347 while (beginning < srclen) 9902 /*
9903 * Convert separator and spacer lists to C# strings.
9904 * Also filter out null strings so we don't hang.
9905 */
9906 for (i = 0; i < seplen; i ++)
9348 { 9907 {
9908 d = separray[i].ToString();
9909 if (d.Length > 0)
9910 {
9911 delarray[dellen++] = d;
9912 }
9913 }
9914 seplen = dellen;
9349 9915
9350 best = mlen; // as bad as it gets 9916 for (i = 0; i < spclen; i ++)
9917 {
9918 d = spcarray[i].ToString();
9919 if (d.Length > 0)
9920 {
9921 delarray[dellen++] = d;
9922 }
9923 }
9351 9924
9352 // Scan for separators 9925 /*
9926 * Scan through source string from beginning to end.
9927 */
9928 for (i = 0;;)
9929 {
9353 9930
9354 for (j = 0; j < seplen; j++) 9931 /*
9932 * Find earliest delimeter in src starting at i (if any).
9933 */
9934 int earliestDel = -1;
9935 int earliestSrc = srclen;
9936 string earliestStr = null;
9937 for (j = 0; j < dellen; j ++)
9355 { 9938 {
9356 if (separray[j].ToString() == String.Empty) 9939 d = delarray[j];
9357 active[j] = false; 9940 if (d != null)
9358
9359 if (active[j])
9360 { 9941 {
9361 // scan all of the markers 9942 int index = src.IndexOf(d, i);
9362 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) 9943 if (index < 0)
9363 { 9944 {
9364 // not present at all 9945 delarray[j] = null; // delim nowhere in src, don't check it anymore
9365 active[j] = false;
9366 } 9946 }
9367 else 9947 else if (index < earliestSrc)
9368 { 9948 {
9369 // present and correct 9949 earliestSrc = index; // where delimeter starts in source string
9370 if (offset[j] < offset[best]) 9950 earliestDel = j; // where delimeter is in delarray[]
9371 { 9951 earliestStr = d; // the delimeter string from delarray[]
9372 // closest so far 9952 if (index == i) break; // can't do any better than found at beg of string
9373 best = j;
9374 if (offset[best] == beginning)
9375 break;
9376 }
9377 } 9953 }
9378 } 9954 }
9379 } 9955 }
9380 9956
9381 // Scan for spacers 9957 /*
9382 9958 * Output source string starting at i through start of earliest delimeter.
9383 if (offset[best] != beginning) 9959 */
9960 if (keepNulls || (earliestSrc > i))
9384 { 9961 {
9385 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 9962 outarray[outlen++] = src.Substring(i, earliestSrc - i);
9386 {
9387 if (spcarray[j-seplen].ToString() == String.Empty)
9388 active[j] = false;
9389
9390 if (active[j])
9391 {
9392 // scan all of the markers
9393 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
9394 {
9395 // not present at all
9396 active[j] = false;
9397 }
9398 else
9399 {
9400 // present and correct
9401 if (offset[j] < offset[best])
9402 {
9403 // closest so far
9404 best = j;
9405 }
9406 }
9407 }
9408 }
9409 } 9963 }
9410 9964
9411 // This is the normal exit from the scanning loop 9965 /*
9966 * If no delimeter found at or after i, we're done scanning.
9967 */
9968 if (earliestDel < 0) break;
9412 9969
9413 if (best == mlen) 9970 /*
9971 * If delimeter was a spacer, output the spacer.
9972 */
9973 if (earliestDel >= seplen)
9414 { 9974 {
9415 // no markers were found on this pass 9975 outarray[outlen++] = earliestStr;
9416 // so we're pretty much done
9417 if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
9418 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
9419 break;
9420 } 9976 }
9421 9977
9422 // Otherwise we just add the newly delimited token 9978 /*
9423 // and recalculate where the search should continue. 9979 * Look at rest of src string following delimeter.
9424 if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) 9980 */
9425 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 9981 i = earliestSrc + earliestStr.Length;
9426
9427 if (best < seplen)
9428 {
9429 beginning = offset[best] + (separray[best].ToString()).Length;
9430 }
9431 else
9432 {
9433 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
9434 string str = spcarray[best - seplen].ToString();
9435 if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
9436 tokens.Add(new LSL_String(str));
9437 }
9438 } 9982 }
9439 9983
9440 // This an awkward an not very intuitive boundary case. If the 9984 /*
9441 // last substring is a tokenizer, then there is an implied trailing 9985 * Make up an exact-sized output array suitable for an LSL_List object.
9442 // null list entry. Hopefully the single comparison will not be too 9986 */
9443 // arduous. Alternatively the 'break' could be replced with a return 9987 object[] outlist = new object[outlen];
9444 // but that's shabby programming. 9988 for (i = 0; i < outlen; i ++)
9445
9446 if ((beginning == srclen) && (keepNulls))
9447 { 9989 {
9448 if (srclen != 0) 9990 outlist[i] = new LSL_String(outarray[i]);
9449 tokens.Add(new LSL_String(""));
9450 } 9991 }
9451 9992 return new LSL_List(outlist);
9452 return tokens;
9453 }
9454
9455 public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
9456 {
9457 m_host.AddScriptLPS(1);
9458 return this.ParseString(src, separators, spacers, false);
9459 }
9460
9461 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
9462 {
9463 m_host.AddScriptLPS(1);
9464 return this.ParseString(src, separators, spacers, true);
9465 } 9993 }
9466 9994
9467 public LSL_Integer llGetObjectPermMask(int mask) 9995 public LSL_Integer llGetObjectPermMask(int mask)
@@ -9556,6 +10084,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9556 case 4: 10084 case 4:
9557 return (int)item.NextPermissions; 10085 return (int)item.NextPermissions;
9558 } 10086 }
10087 m_host.TaskInventory.LockItemsForRead(false);
9559 10088
9560 return -1; 10089 return -1;
9561 } 10090 }
@@ -9759,31 +10288,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9759 UUID key = new UUID(); 10288 UUID key = new UUID();
9760 if (UUID.TryParse(id, out key)) 10289 if (UUID.TryParse(id, out key))
9761 { 10290 {
9762 try 10291 // return total object mass
9763 { 10292 SceneObjectPart part = World.GetSceneObjectPart(key);
9764 SceneObjectPart obj = World.GetSceneObjectPart(World.Entities[key].LocalId); 10293 if (part != null)
9765 if (obj != null) 10294 return part.ParentGroup.GetMass();
9766 return (double)obj.GetMass(); 10295
9767 // the object is null so the key is for an avatar 10296 // the object is null so the key is for an avatar
9768 ScenePresence avatar = World.GetScenePresence(key); 10297 ScenePresence avatar = World.GetScenePresence(key);
9769 if (avatar != null) 10298 if (avatar != null)
9770 if (avatar.IsChildAgent)
9771 // reference http://www.lslwiki.net/lslwiki/wakka.php?wakka=llGetObjectMass
9772 // child agents have a mass of 1.0
9773 return 1;
9774 else
9775 return (double)avatar.GetMass();
9776 }
9777 catch (KeyNotFoundException)
9778 { 10299 {
9779 return 0; // The Object/Agent not in the region so just return zero 10300 if (avatar.IsChildAgent)
10301 {
10302 // reference http://www.lslwiki.net/lslwiki/wakka.php?wakka=llGetObjectMass
10303 // child agents have a mass of 1.0
10304 return 1;
10305 }
10306 else
10307 {
10308 return (double)avatar.GetMass();
10309 }
9780 } 10310 }
9781 } 10311 }
9782 return 0; 10312 return 0;
9783 } 10313 }
9784 10314
9785 /// <summary> 10315 /// <summary>
9786 /// illListReplaceList removes the sub-list defined by the inclusive indices 10316 /// llListReplaceList removes the sub-list defined by the inclusive indices
9787 /// start and end and inserts the src list in its place. The inclusive 10317 /// start and end and inserts the src list in its place. The inclusive
9788 /// nature of the indices means that at least one element must be deleted 10318 /// nature of the indices means that at least one element must be deleted
9789 /// if the indices are within the bounds of the existing list. I.e. 2,2 10319 /// if the indices are within the bounds of the existing list. I.e. 2,2
@@ -9840,16 +10370,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9840 // based upon end. Note that if end exceeds the upper 10370 // based upon end. Note that if end exceeds the upper
9841 // bound in this case, the entire destination list 10371 // bound in this case, the entire destination list
9842 // is removed. 10372 // is removed.
9843 else 10373 else if (start == 0)
9844 { 10374 {
9845 if (end + 1 < dest.Length) 10375 if (end + 1 < dest.Length)
9846 {
9847 return src + dest.GetSublist(end + 1, -1); 10376 return src + dest.GetSublist(end + 1, -1);
9848 }
9849 else 10377 else
9850 {
9851 return src; 10378 return src;
9852 } 10379 }
10380 else // Start < 0
10381 {
10382 if (end + 1 < dest.Length)
10383 return dest.GetSublist(end + 1, -1);
10384 else
10385 return new LSL_List();
9853 } 10386 }
9854 } 10387 }
9855 // Finally, if start > end, we strip away a prefix and 10388 // Finally, if start > end, we strip away a prefix and
@@ -9900,17 +10433,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9900 int width = 0; 10433 int width = 0;
9901 int height = 0; 10434 int height = 0;
9902 10435
9903 ParcelMediaCommandEnum? commandToSend = null; 10436 uint commandToSend = 0;
9904 float time = 0.0f; // default is from start 10437 float time = 0.0f; // default is from start
9905 10438
9906 ScenePresence presence = null; 10439 ScenePresence presence = null;
9907 10440
9908 for (int i = 0; i < commandList.Data.Length; i++) 10441 for (int i = 0; i < commandList.Data.Length; i++)
9909 { 10442 {
9910 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 10443 uint command = (uint)(commandList.GetLSLIntegerItem(i));
9911 switch (command) 10444 switch (command)
9912 { 10445 {
9913 case ParcelMediaCommandEnum.Agent: 10446 case (uint)ParcelMediaCommandEnum.Agent:
9914 // we send only to one agent 10447 // we send only to one agent
9915 if ((i + 1) < commandList.Length) 10448 if ((i + 1) < commandList.Length)
9916 { 10449 {
@@ -9927,25 +10460,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9927 } 10460 }
9928 break; 10461 break;
9929 10462
9930 case ParcelMediaCommandEnum.Loop: 10463 case (uint)ParcelMediaCommandEnum.Loop:
9931 loop = 1; 10464 loop = 1;
9932 commandToSend = command; 10465 commandToSend = command;
9933 update = true; //need to send the media update packet to set looping 10466 update = true; //need to send the media update packet to set looping
9934 break; 10467 break;
9935 10468
9936 case ParcelMediaCommandEnum.Play: 10469 case (uint)ParcelMediaCommandEnum.Play:
9937 loop = 0; 10470 loop = 0;
9938 commandToSend = command; 10471 commandToSend = command;
9939 update = true; //need to send the media update packet to make sure it doesn't loop 10472 update = true; //need to send the media update packet to make sure it doesn't loop
9940 break; 10473 break;
9941 10474
9942 case ParcelMediaCommandEnum.Pause: 10475 case (uint)ParcelMediaCommandEnum.Pause:
9943 case ParcelMediaCommandEnum.Stop: 10476 case (uint)ParcelMediaCommandEnum.Stop:
9944 case ParcelMediaCommandEnum.Unload: 10477 case (uint)ParcelMediaCommandEnum.Unload:
9945 commandToSend = command; 10478 commandToSend = command;
9946 break; 10479 break;
9947 10480
9948 case ParcelMediaCommandEnum.Url: 10481 case (uint)ParcelMediaCommandEnum.Url:
9949 if ((i + 1) < commandList.Length) 10482 if ((i + 1) < commandList.Length)
9950 { 10483 {
9951 if (commandList.Data[i + 1] is LSL_String) 10484 if (commandList.Data[i + 1] is LSL_String)
@@ -9958,7 +10491,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9958 } 10491 }
9959 break; 10492 break;
9960 10493
9961 case ParcelMediaCommandEnum.Texture: 10494 case (uint)ParcelMediaCommandEnum.Texture:
9962 if ((i + 1) < commandList.Length) 10495 if ((i + 1) < commandList.Length)
9963 { 10496 {
9964 if (commandList.Data[i + 1] is LSL_String) 10497 if (commandList.Data[i + 1] is LSL_String)
@@ -9971,7 +10504,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9971 } 10504 }
9972 break; 10505 break;
9973 10506
9974 case ParcelMediaCommandEnum.Time: 10507 case (uint)ParcelMediaCommandEnum.Time:
9975 if ((i + 1) < commandList.Length) 10508 if ((i + 1) < commandList.Length)
9976 { 10509 {
9977 if (commandList.Data[i + 1] is LSL_Float) 10510 if (commandList.Data[i + 1] is LSL_Float)
@@ -9983,7 +10516,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9983 } 10516 }
9984 break; 10517 break;
9985 10518
9986 case ParcelMediaCommandEnum.AutoAlign: 10519 case (uint)ParcelMediaCommandEnum.AutoAlign:
9987 if ((i + 1) < commandList.Length) 10520 if ((i + 1) < commandList.Length)
9988 { 10521 {
9989 if (commandList.Data[i + 1] is LSL_Integer) 10522 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9997,7 +10530,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9997 } 10530 }
9998 break; 10531 break;
9999 10532
10000 case ParcelMediaCommandEnum.Type: 10533 case (uint)ParcelMediaCommandEnum.Type:
10001 if ((i + 1) < commandList.Length) 10534 if ((i + 1) < commandList.Length)
10002 { 10535 {
10003 if (commandList.Data[i + 1] is LSL_String) 10536 if (commandList.Data[i + 1] is LSL_String)
@@ -10010,7 +10543,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10010 } 10543 }
10011 break; 10544 break;
10012 10545
10013 case ParcelMediaCommandEnum.Desc: 10546 case (uint)ParcelMediaCommandEnum.Desc:
10014 if ((i + 1) < commandList.Length) 10547 if ((i + 1) < commandList.Length)
10015 { 10548 {
10016 if (commandList.Data[i + 1] is LSL_String) 10549 if (commandList.Data[i + 1] is LSL_String)
@@ -10023,7 +10556,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10023 } 10556 }
10024 break; 10557 break;
10025 10558
10026 case ParcelMediaCommandEnum.Size: 10559 case (uint)ParcelMediaCommandEnum.Size:
10027 if ((i + 2) < commandList.Length) 10560 if ((i + 2) < commandList.Length)
10028 { 10561 {
10029 if (commandList.Data[i + 1] is LSL_Integer) 10562 if (commandList.Data[i + 1] is LSL_Integer)
@@ -10093,7 +10626,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10093 } 10626 }
10094 } 10627 }
10095 10628
10096 if (commandToSend != null) 10629 if (commandToSend != 0)
10097 { 10630 {
10098 // the commandList contained a start/stop/... command, too 10631 // the commandList contained a start/stop/... command, too
10099 if (presence == null) 10632 if (presence == null)
@@ -10130,7 +10663,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10130 10663
10131 if (aList.Data[i] != null) 10664 if (aList.Data[i] != null)
10132 { 10665 {
10133 switch ((ParcelMediaCommandEnum) aList.Data[i]) 10666 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
10134 { 10667 {
10135 case ParcelMediaCommandEnum.Url: 10668 case ParcelMediaCommandEnum.Url:
10136 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition).MediaURL)); 10669 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition).MediaURL));
@@ -10187,15 +10720,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10187 10720
10188 if (quick_pay_buttons.Data.Length < 4) 10721 if (quick_pay_buttons.Data.Length < 4)
10189 { 10722 {
10190 LSLError("List must have at least 4 elements"); 10723 int x;
10191 return; 10724 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
10725 {
10726 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
10727 }
10192 } 10728 }
10193 m_host.ParentGroup.RootPart.PayPrice[0]=price; 10729 int[] nPrice = new int[5];
10194 10730 nPrice[0] = price;
10195 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 10731 nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
10196 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 10732 nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
10197 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 10733 nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
10198 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 10734 nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
10735 m_host.ParentGroup.RootPart.PayPrice = nPrice;
10199 m_host.ParentGroup.HasGroupChanged = true; 10736 m_host.ParentGroup.HasGroupChanged = true;
10200 } 10737 }
10201 10738
@@ -10212,7 +10749,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10212 return Vector3.Zero; 10749 return Vector3.Zero;
10213 } 10750 }
10214 10751
10215 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10752// ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
10753 ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
10216 if (presence != null) 10754 if (presence != null)
10217 { 10755 {
10218 LSL_Vector pos = new LSL_Vector(presence.CameraPosition); 10756 LSL_Vector pos = new LSL_Vector(presence.CameraPosition);
@@ -10235,7 +10773,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10235 return Quaternion.Identity; 10773 return Quaternion.Identity;
10236 } 10774 }
10237 10775
10238 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10776// ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
10777 ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
10239 if (presence != null) 10778 if (presence != null)
10240 { 10779 {
10241 return new LSL_Rotation(presence.CameraRotation); 10780 return new LSL_Rotation(presence.CameraRotation);
@@ -10295,14 +10834,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10295 { 10834 {
10296 m_host.AddScriptLPS(1); 10835 m_host.AddScriptLPS(1);
10297 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0); 10836 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0);
10298 if (detectedParams == null) return; // only works on the first detected avatar 10837 if (detectedParams == null)
10299 10838 {
10839 if (m_host.ParentGroup.IsAttachment == true)
10840 {
10841 detectedParams = new DetectParams();
10842 detectedParams.Key = m_host.OwnerID;
10843 }
10844 else
10845 {
10846 return;
10847 }
10848 }
10849
10300 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 10850 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
10301 if (avatar != null) 10851 if (avatar != null)
10302 { 10852 {
10303 avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, 10853 avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name,
10304 simname, pos, lookAt); 10854 simname, pos, lookAt);
10305 } 10855 }
10856
10306 ScriptSleep(1000); 10857 ScriptSleep(1000);
10307 } 10858 }
10308 10859
@@ -10426,12 +10977,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10426 10977
10427 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 10978 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
10428 object[] data = rules.Data; 10979 object[] data = rules.Data;
10429 for (int i = 0; i < data.Length; ++i) { 10980 for (int i = 0; i < data.Length; ++i)
10981 {
10430 int type = Convert.ToInt32(data[i++].ToString()); 10982 int type = Convert.ToInt32(data[i++].ToString());
10431 if (i >= data.Length) break; // odd number of entries => ignore the last 10983 if (i >= data.Length) break; // odd number of entries => ignore the last
10432 10984
10433 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 10985 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
10434 switch (type) { 10986 switch (type)
10987 {
10435 case ScriptBaseClass.CAMERA_FOCUS: 10988 case ScriptBaseClass.CAMERA_FOCUS:
10436 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 10989 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
10437 case ScriptBaseClass.CAMERA_POSITION: 10990 case ScriptBaseClass.CAMERA_POSITION:
@@ -10536,19 +11089,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10536 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 11089 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
10537 { 11090 {
10538 m_host.AddScriptLPS(1); 11091 m_host.AddScriptLPS(1);
10539 string ret = String.Empty; 11092
10540 string src1 = llBase64ToString(str1); 11093 if (str1 == String.Empty)
10541 string src2 = llBase64ToString(str2); 11094 return String.Empty;
10542 int c = 0; 11095 if (str2 == String.Empty)
10543 for (int i = 0; i < src1.Length; i++) 11096 return str1;
11097
11098 int len = str2.Length;
11099 if ((len % 4) != 0) // LL is EVIL!!!!
10544 { 11100 {
10545 ret += (char) (src1[i] ^ src2[c]); 11101 while (str2.EndsWith("="))
11102 str2 = str2.Substring(0, str2.Length - 1);
10546 11103
10547 c++; 11104 len = str2.Length;
10548 if (c >= src2.Length) 11105 int mod = len % 4;
10549 c = 0; 11106
11107 if (mod == 1)
11108 str2 = str2.Substring(0, str2.Length - 1);
11109 else if (mod == 2)
11110 str2 += "==";
11111 else if (mod == 3)
11112 str2 += "=";
11113 }
11114
11115 byte[] data1;
11116 byte[] data2;
11117 try
11118 {
11119 data1 = Convert.FromBase64String(str1);
11120 data2 = Convert.FromBase64String(str2);
11121 }
11122 catch (Exception)
11123 {
11124 return new LSL_String(String.Empty);
11125 }
11126
11127 byte[] d2 = new Byte[data1.Length];
11128 int pos = 0;
11129
11130 if (data1.Length <= data2.Length)
11131 {
11132 Array.Copy(data2, 0, d2, 0, data1.Length);
11133 }
11134 else
11135 {
11136 while (pos < data1.Length)
11137 {
11138 len = data1.Length - pos;
11139 if (len > data2.Length)
11140 len = data2.Length;
11141
11142 Array.Copy(data2, 0, d2, pos, len);
11143 pos += len;
11144 }
10550 } 11145 }
10551 return llStringToBase64(ret); 11146
11147 for (pos = 0 ; pos < data1.Length ; pos++ )
11148 data1[pos] ^= d2[pos];
11149
11150 return Convert.ToBase64String(data1);
10552 } 11151 }
10553 11152
10554 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 11153 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -10652,16 +11251,72 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10652 if (userAgent != null) 11251 if (userAgent != null)
10653 httpHeaders["User-Agent"] = userAgent; 11252 httpHeaders["User-Agent"] = userAgent;
10654 11253
11254 // See if the URL contains any header hacks
11255 string[] urlParts = url.Split(new char[] {'\n'});
11256 if (urlParts.Length > 1)
11257 {
11258 // Iterate the passed headers and parse them
11259 for (int i = 1 ; i < urlParts.Length ; i++ )
11260 {
11261 // The rest of those would be added to the body in SL.
11262 // Let's not do that.
11263 if (urlParts[i] == String.Empty)
11264 break;
11265
11266 // See if this could be a valid header
11267 string[] headerParts = urlParts[i].Split(new char[] {':'}, 2);
11268 if (headerParts.Length != 2)
11269 continue;
11270
11271 string headerName = headerParts[0].Trim();
11272 string headerValue = headerParts[1].Trim();
11273
11274 // Filter out headers that could be used to abuse
11275 // another system or cloak the request
11276 if (headerName.ToLower() == "x-secondlife-shard" ||
11277 headerName.ToLower() == "x-secondlife-object-name" ||
11278 headerName.ToLower() == "x-secondlife-object-key" ||
11279 headerName.ToLower() == "x-secondlife-region" ||
11280 headerName.ToLower() == "x-secondlife-local-position" ||
11281 headerName.ToLower() == "x-secondlife-local-velocity" ||
11282 headerName.ToLower() == "x-secondlife-local-rotation" ||
11283 headerName.ToLower() == "x-secondlife-owner-name" ||
11284 headerName.ToLower() == "x-secondlife-owner-key" ||
11285 headerName.ToLower() == "connection" ||
11286 headerName.ToLower() == "content-length" ||
11287 headerName.ToLower() == "from" ||
11288 headerName.ToLower() == "host" ||
11289 headerName.ToLower() == "proxy-authorization" ||
11290 headerName.ToLower() == "referer" ||
11291 headerName.ToLower() == "trailer" ||
11292 headerName.ToLower() == "transfer-encoding" ||
11293 headerName.ToLower() == "via" ||
11294 headerName.ToLower() == "authorization")
11295 continue;
11296
11297 httpHeaders[headerName] = headerValue;
11298 }
11299
11300 // Finally, strip any protocol specifier from the URL
11301 url = urlParts[0].Trim();
11302 int idx = url.IndexOf(" HTTP/");
11303 if (idx != -1)
11304 url = url.Substring(0, idx);
11305 }
11306
10655 string authregex = @"^(https?:\/\/)(\w+):(\w+)@(.*)$"; 11307 string authregex = @"^(https?:\/\/)(\w+):(\w+)@(.*)$";
10656 Regex r = new Regex(authregex); 11308 Regex r = new Regex(authregex);
10657 int[] gnums = r.GetGroupNumbers(); 11309 int[] gnums = r.GetGroupNumbers();
10658 Match m = r.Match(url); 11310 Match m = r.Match(url);
10659 if (m.Success) { 11311 if (m.Success)
10660 for (int i = 1; i < gnums.Length; i++) { 11312 {
11313 for (int i = 1; i < gnums.Length; i++)
11314 {
10661 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 11315 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
10662 //CaptureCollection cc = g.Captures; 11316 //CaptureCollection cc = g.Captures;
10663 } 11317 }
10664 if (m.Groups.Count == 5) { 11318 if (m.Groups.Count == 5)
11319 {
10665 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 11320 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
10666 url = m.Groups[1].ToString() + m.Groups[4].ToString(); 11321 url = m.Groups[1].ToString() + m.Groups[4].ToString();
10667 } 11322 }
@@ -10864,6 +11519,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10864 11519
10865 LSL_List ret = new LSL_List(); 11520 LSL_List ret = new LSL_List();
10866 UUID key = new UUID(); 11521 UUID key = new UUID();
11522
11523
10867 if (UUID.TryParse(id, out key)) 11524 if (UUID.TryParse(id, out key))
10868 { 11525 {
10869 ScenePresence av = World.GetScenePresence(key); 11526 ScenePresence av = World.GetScenePresence(key);
@@ -10881,13 +11538,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10881 ret.Add(new LSL_String("")); 11538 ret.Add(new LSL_String(""));
10882 break; 11539 break;
10883 case ScriptBaseClass.OBJECT_POS: 11540 case ScriptBaseClass.OBJECT_POS:
10884 ret.Add(new LSL_Vector((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z)); 11541 Vector3 avpos;
11542
11543 if (av.ParentID != 0 && av.ParentPart != null)
11544 {
11545 avpos = av.OffsetPosition;
11546
11547 Vector3 sitOffset = (Zrot(av.Rotation)) * (av.Appearance.AvatarHeight * 0.02638f *2.0f);
11548 avpos -= sitOffset;
11549
11550 avpos = av.ParentPart.GetWorldPosition() + avpos * av.ParentPart.GetWorldRotation();
11551 }
11552 else
11553 avpos = av.AbsolutePosition;
11554
11555 ret.Add(new LSL_Vector((double)avpos.X, (double)avpos.Y, (double)avpos.Z));
10885 break; 11556 break;
10886 case ScriptBaseClass.OBJECT_ROT: 11557 case ScriptBaseClass.OBJECT_ROT:
10887 ret.Add(new LSL_Rotation(av.GetWorldRotation())); 11558 Quaternion avrot = av.Rotation;
11559 if (av.ParentID != 0 && av.ParentPart != null)
11560 {
11561 avrot = av.ParentPart.GetWorldRotation() * avrot;
11562 }
11563 ret.Add(new LSL_Rotation((double)avrot.X, (double)avrot.Y, (double)avrot.Z, (double)avrot.W));
10888 break; 11564 break;
10889 case ScriptBaseClass.OBJECT_VELOCITY: 11565 case ScriptBaseClass.OBJECT_VELOCITY:
10890 ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z)); 11566 Vector3 avvel = av.Velocity;
11567 ret.Add(new LSL_Vector((double)avvel.X, (double)avvel.Y, (double)avvel.Z));
10891 break; 11568 break;
10892 case ScriptBaseClass.OBJECT_OWNER: 11569 case ScriptBaseClass.OBJECT_OWNER:
10893 ret.Add(new LSL_String(id)); 11570 ret.Add(new LSL_String(id));
@@ -10972,11 +11649,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10972 case ScriptBaseClass.OBJECT_NAME: 11649 case ScriptBaseClass.OBJECT_NAME:
10973 ret.Add(new LSL_String(obj.Name)); 11650 ret.Add(new LSL_String(obj.Name));
10974 break; 11651 break;
10975 case ScriptBaseClass.OBJECT_DESC: 11652 case ScriptBaseClass.OBJECT_DESC:
10976 ret.Add(new LSL_String(obj.Description)); 11653 ret.Add(new LSL_String(obj.Description));
10977 break; 11654 break;
10978 case ScriptBaseClass.OBJECT_POS: 11655 case ScriptBaseClass.OBJECT_POS:
10979 ret.Add(new LSL_Vector(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z)); 11656 Vector3 opos = obj.AbsolutePosition;
11657 ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z));
10980 break; 11658 break;
10981 case ScriptBaseClass.OBJECT_ROT: 11659 case ScriptBaseClass.OBJECT_ROT:
10982 { 11660 {
@@ -11026,9 +11704,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11026 // The value returned in SL for normal prims is prim count 11704 // The value returned in SL for normal prims is prim count
11027 ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount)); 11705 ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount));
11028 break; 11706 break;
11029 // The following 3 costs I have intentionaly coded to return zero. They are part of 11707
11030 // "Land Impact" calculations. These calculations are probably not applicable 11708 // costs below may need to be diferent for root parts, need to check
11031 // to OpenSim and are not yet complete in SL
11032 case ScriptBaseClass.OBJECT_SERVER_COST: 11709 case ScriptBaseClass.OBJECT_SERVER_COST:
11033 // The linden calculation is here 11710 // The linden calculation is here
11034 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight 11711 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight
@@ -11036,16 +11713,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11036 ret.Add(new LSL_Float(0)); 11713 ret.Add(new LSL_Float(0));
11037 break; 11714 break;
11038 case ScriptBaseClass.OBJECT_STREAMING_COST: 11715 case ScriptBaseClass.OBJECT_STREAMING_COST:
11039 // The linden calculation is here 11716 // The value returned in SL for normal prims is prim count * 0.06
11040 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Streaming_Cost 11717 ret.Add(new LSL_Float(obj.StreamingCost));
11041 // The value returned in SL for normal prims looks like the prim count * 0.06
11042 ret.Add(new LSL_Float(0));
11043 break; 11718 break;
11044 case ScriptBaseClass.OBJECT_PHYSICS_COST: 11719 case ScriptBaseClass.OBJECT_PHYSICS_COST:
11045 // The linden calculation is here 11720 // The value returned in SL for normal prims is prim count
11046 // http://wiki.secondlife.com/wiki/Mesh/Mesh_physics 11721 ret.Add(new LSL_Float(obj.PhysicsCost));
11047 // The value returned in SL for normal prims looks like the prim count
11048 ret.Add(new LSL_Float(0));
11049 break; 11722 break;
11050 case ScriptBaseClass.OBJECT_CHARACTER_TIME: // Pathfinding 11723 case ScriptBaseClass.OBJECT_CHARACTER_TIME: // Pathfinding
11051 ret.Add(new LSL_Float(0)); 11724 ret.Add(new LSL_Float(0));
@@ -11304,15 +11977,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11304 return result; 11977 return result;
11305 } 11978 }
11306 11979
11307 public void print(string str) 11980 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
11308 { 11981 {
11309 // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print 11982 List<SceneObjectPart> parts = GetLinkParts(link);
11310 IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "OSSL"); 11983 if (parts.Count < 1)
11311 if (ossl != null) 11984 return 0;
11312 { 11985
11313 ossl.CheckThreatLevel(ThreatLevel.High, "print"); 11986 return GetNumberOfSides(parts[0]);
11314 m_log.Info("LSL print():" + str);
11315 }
11316 } 11987 }
11317 11988
11318 private string Name2Username(string name) 11989 private string Name2Username(string name)
@@ -11357,7 +12028,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11357 12028
11358 return rq.ToString(); 12029 return rq.ToString();
11359 } 12030 }
11360 12031/*
12032 private void SayShoutTimerElapsed(Object sender, ElapsedEventArgs args)
12033 {
12034 m_SayShoutCount = 0;
12035 }
12036*/
11361 private struct Tri 12037 private struct Tri
11362 { 12038 {
11363 public Vector3 p1; 12039 public Vector3 p1;
@@ -11506,9 +12182,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11506 12182
11507 ContactResult result = new ContactResult (); 12183 ContactResult result = new ContactResult ();
11508 result.ConsumerID = group.LocalId; 12184 result.ConsumerID = group.LocalId;
11509 result.Depth = intersection.distance; 12185// result.Depth = intersection.distance;
11510 result.Normal = intersection.normal; 12186 result.Normal = intersection.normal;
11511 result.Pos = intersection.ipoint; 12187 result.Pos = intersection.ipoint;
12188 result.Depth = Vector3.Mag(rayStart - result.Pos);
11512 12189
11513 contacts.Add(result); 12190 contacts.Add(result);
11514 }); 12191 });
@@ -11641,6 +12318,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11641 12318
11642 return contacts[0]; 12319 return contacts[0];
11643 } 12320 }
12321/*
12322 // not done:
12323 private ContactResult[] testRay2NonPhysicalPhantom(Vector3 rayStart, Vector3 raydir, float raylenght)
12324 {
12325 ContactResult[] contacts = null;
12326 World.ForEachSOG(delegate(SceneObjectGroup group)
12327 {
12328 if (m_host.ParentGroup == group)
12329 return;
12330
12331 if (group.IsAttachment)
12332 return;
12333
12334 if(group.RootPart.PhysActor != null)
12335 return;
12336
12337 contacts = group.RayCastGroupPartsOBBNonPhysicalPhantom(rayStart, raydir, raylenght);
12338 });
12339 return contacts;
12340 }
12341*/
11644 12342
11645 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) 12343 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
11646 { 12344 {
@@ -11764,18 +12462,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11764 } 12462 }
11765 } 12463 }
11766 12464
12465 // Double check this
11767 if (checkTerrain) 12466 if (checkTerrain)
11768 { 12467 {
11769 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd); 12468 bool skipGroundCheck = false;
11770 if (groundContact != null) 12469
11771 results.Add((ContactResult)groundContact); 12470 foreach (ContactResult c in results)
12471 {
12472 if (c.ConsumerID == 0) // Physics gave us a ground collision
12473 skipGroundCheck = true;
12474 }
12475
12476 if (!skipGroundCheck)
12477 {
12478 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd);
12479 if (groundContact != null)
12480 results.Add((ContactResult)groundContact);
12481 }
11772 } 12482 }
11773 12483
11774 results.Sort(delegate(ContactResult a, ContactResult b) 12484 results.Sort(delegate(ContactResult a, ContactResult b)
11775 { 12485 {
11776 return a.Depth.CompareTo(b.Depth); 12486 return a.Depth.CompareTo(b.Depth);
11777 }); 12487 });
11778 12488
11779 int values = 0; 12489 int values = 0;
11780 SceneObjectGroup thisgrp = m_host.ParentGroup; 12490 SceneObjectGroup thisgrp = m_host.ParentGroup;
11781 12491
@@ -11868,7 +12578,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11868 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD: 12578 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD:
11869 if (!isAccount) return 0; 12579 if (!isAccount) return 0;
11870 if (estate.HasAccess(id)) return 1; 12580 if (estate.HasAccess(id)) return 1;
11871 if (estate.IsBanned(id)) 12581 if (estate.IsBanned(id, World.GetUserFlags(id)))
11872 estate.RemoveBan(id); 12582 estate.RemoveBan(id);
11873 estate.AddEstateUser(id); 12583 estate.AddEstateUser(id);
11874 break; 12584 break;
@@ -11887,14 +12597,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11887 break; 12597 break;
11888 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD: 12598 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD:
11889 if (!isAccount) return 0; 12599 if (!isAccount) return 0;
11890 if (estate.IsBanned(id)) return 1; 12600 if (estate.IsBanned(id, World.GetUserFlags(id))) return 1;
11891 EstateBan ban = new EstateBan(); 12601 EstateBan ban = new EstateBan();
11892 ban.EstateID = estate.EstateID; 12602 ban.EstateID = estate.EstateID;
11893 ban.BannedUserID = id; 12603 ban.BannedUserID = id;
11894 estate.AddBan(ban); 12604 estate.AddBan(ban);
11895 break; 12605 break;
11896 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE: 12606 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE:
11897 if (!isAccount || !estate.IsBanned(id)) return 0; 12607 if (!isAccount || !estate.IsBanned(id, World.GetUserFlags(id))) return 0;
11898 estate.RemoveBan(id); 12608 estate.RemoveBan(id);
11899 break; 12609 break;
11900 default: return 0; 12610 default: return 0;
@@ -11959,13 +12669,63 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11959 public void llCollisionSprite(string impact_sprite) 12669 public void llCollisionSprite(string impact_sprite)
11960 { 12670 {
11961 m_host.AddScriptLPS(1); 12671 m_host.AddScriptLPS(1);
11962 NotImplemented("llCollisionSprite"); 12672 // Viewer 2.0 broke this and it's likely LL has no intention
12673 // of fixing it. Therefore, letting this be a NOP seems appropriate.
11963 } 12674 }
11964 12675
11965 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 12676 public void llGodLikeRezObject(string inventory, LSL_Vector pos)
11966 { 12677 {
11967 m_host.AddScriptLPS(1); 12678 m_host.AddScriptLPS(1);
11968 NotImplemented("llGodLikeRezObject"); 12679
12680 if (!World.Permissions.IsGod(m_host.OwnerID))
12681 NotImplemented("llGodLikeRezObject");
12682
12683 AssetBase rezAsset = World.AssetService.Get(inventory);
12684 if (rezAsset == null)
12685 {
12686 llSay(0, "Asset not found");
12687 return;
12688 }
12689
12690 SceneObjectGroup group = null;
12691
12692 try
12693 {
12694 string xmlData = Utils.BytesToString(rezAsset.Data);
12695 group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
12696 }
12697 catch
12698 {
12699 llSay(0, "Asset not found");
12700 return;
12701 }
12702
12703 if (group == null)
12704 {
12705 llSay(0, "Asset not found");
12706 return;
12707 }
12708
12709 group.RootPart.AttachPoint = group.RootPart.Shape.State;
12710 group.RootPart.AttachOffset = group.AbsolutePosition;
12711
12712 group.ResetIDs();
12713
12714 Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
12715 World.AddNewSceneObject(group, true, llpos, Quaternion.Identity, Vector3.Zero);
12716 group.CreateScriptInstances(0, true, World.DefaultScriptEngine, 3);
12717 group.ScheduleGroupForFullUpdate();
12718
12719 // objects rezzed with this method are die_at_edge by default.
12720 group.RootPart.SetDieAtEdge(true);
12721
12722 group.ResumeScripts();
12723
12724 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
12725 "object_rez", new Object[] {
12726 new LSL_String(
12727 group.RootPart.UUID.ToString()) },
12728 new DetectParams[0]));
11969 } 12729 }
11970 12730
11971 public LSL_String llTransferLindenDollars(string destination, int amount) 12731 public LSL_String llTransferLindenDollars(string destination, int amount)
@@ -12017,7 +12777,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12017 } 12777 }
12018 12778
12019 bool result = money.ObjectGiveMoney( 12779 bool result = money.ObjectGiveMoney(
12020 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); 12780 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount, txn);
12021 12781
12022 if (result) 12782 if (result)
12023 { 12783 {
@@ -12042,6 +12802,610 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12042 } 12802 }
12043 12803
12044 #endregion 12804 #endregion
12805
12806 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
12807 {
12808 SceneObjectGroup group = m_host.ParentGroup;
12809
12810 if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
12811 return;
12812 if (group.IsAttachment)
12813 return;
12814
12815 if (frames.Data.Length > 0) // We are getting a new motion
12816 {
12817 if (group.RootPart.KeyframeMotion != null)
12818 group.RootPart.KeyframeMotion.Delete();
12819 group.RootPart.KeyframeMotion = null;
12820
12821 int idx = 0;
12822
12823 KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
12824 KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
12825
12826 while (idx < options.Data.Length)
12827 {
12828 int option = (int)options.GetLSLIntegerItem(idx++);
12829 int remain = options.Data.Length - idx;
12830
12831 switch (option)
12832 {
12833 case ScriptBaseClass.KFM_MODE:
12834 if (remain < 1)
12835 break;
12836 int modeval = (int)options.GetLSLIntegerItem(idx++);
12837 switch(modeval)
12838 {
12839 case ScriptBaseClass.KFM_FORWARD:
12840 mode = KeyframeMotion.PlayMode.Forward;
12841 break;
12842 case ScriptBaseClass.KFM_REVERSE:
12843 mode = KeyframeMotion.PlayMode.Reverse;
12844 break;
12845 case ScriptBaseClass.KFM_LOOP:
12846 mode = KeyframeMotion.PlayMode.Loop;
12847 break;
12848 case ScriptBaseClass.KFM_PING_PONG:
12849 mode = KeyframeMotion.PlayMode.PingPong;
12850 break;
12851 }
12852 break;
12853 case ScriptBaseClass.KFM_DATA:
12854 if (remain < 1)
12855 break;
12856 int dataval = (int)options.GetLSLIntegerItem(idx++);
12857 data = (KeyframeMotion.DataFormat)dataval;
12858 break;
12859 }
12860 }
12861
12862 group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data);
12863
12864 idx = 0;
12865
12866 int elemLength = 2;
12867 if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation))
12868 elemLength = 3;
12869
12870 List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>();
12871 while (idx < frames.Data.Length)
12872 {
12873 int remain = frames.Data.Length - idx;
12874
12875 if (remain < elemLength)
12876 break;
12877
12878 KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe();
12879 frame.Position = null;
12880 frame.Rotation = null;
12881
12882 if ((data & KeyframeMotion.DataFormat.Translation) != 0)
12883 {
12884 LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++);
12885 frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z);
12886 }
12887 if ((data & KeyframeMotion.DataFormat.Rotation) != 0)
12888 {
12889 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
12890 Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
12891 q.Normalize();
12892 frame.Rotation = q;
12893 }
12894
12895 float tempf = (float)frames.GetLSLFloatItem(idx++);
12896 frame.TimeMS = (int)(tempf * 1000.0f);
12897
12898 keyframes.Add(frame);
12899 }
12900
12901 group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray());
12902 group.RootPart.KeyframeMotion.Start();
12903 }
12904 else
12905 {
12906 if (group.RootPart.KeyframeMotion == null)
12907 return;
12908
12909 if (options.Data.Length == 0)
12910 {
12911 group.RootPart.KeyframeMotion.Stop();
12912 return;
12913 }
12914
12915 int code = (int)options.GetLSLIntegerItem(0);
12916
12917 int idx = 0;
12918
12919 while (idx < options.Data.Length)
12920 {
12921 int option = (int)options.GetLSLIntegerItem(idx++);
12922 int remain = options.Data.Length - idx;
12923
12924 switch (option)
12925 {
12926 case ScriptBaseClass.KFM_COMMAND:
12927 int cmd = (int)options.GetLSLIntegerItem(idx++);
12928 switch (cmd)
12929 {
12930 case ScriptBaseClass.KFM_CMD_PLAY:
12931 group.RootPart.KeyframeMotion.Start();
12932 break;
12933 case ScriptBaseClass.KFM_CMD_STOP:
12934 group.RootPart.KeyframeMotion.Stop();
12935 break;
12936 case ScriptBaseClass.KFM_CMD_PAUSE:
12937 group.RootPart.KeyframeMotion.Pause();
12938 break;
12939 }
12940 break;
12941 }
12942 }
12943 }
12944 }
12945
12946 protected LSL_List SetPrimParams(ScenePresence av, LSL_List rules, string originFunc, ref uint rulesParsed)
12947 {
12948 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
12949
12950 int idx = 0;
12951 int idxStart = 0;
12952
12953 bool positionChanged = false;
12954 Vector3 finalPos = Vector3.Zero;
12955
12956 try
12957 {
12958 while (idx < rules.Length)
12959 {
12960 ++rulesParsed;
12961 int code = rules.GetLSLIntegerItem(idx++);
12962
12963 int remain = rules.Length - idx;
12964 idxStart = idx;
12965
12966 switch (code)
12967 {
12968 case (int)ScriptBaseClass.PRIM_POSITION:
12969 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
12970 {
12971 if (remain < 1)
12972 return null;
12973
12974 LSL_Vector v;
12975 v = rules.GetVector3Item(idx++);
12976
12977 SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
12978 if (part == null)
12979 break;
12980
12981 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
12982 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
12983 if (part.LinkNum > 1)
12984 {
12985 localRot = GetPartLocalRot(part);
12986 localPos = GetPartLocalPos(part);
12987 }
12988
12989 v -= localPos;
12990 v /= localRot;
12991
12992 LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
12993
12994 v = v + 2 * sitOffset;
12995
12996 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
12997 av.SendAvatarDataToAllAgents();
12998
12999 }
13000 break;
13001
13002 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
13003 case (int)ScriptBaseClass.PRIM_ROTATION:
13004 {
13005 if (remain < 1)
13006 return null;
13007
13008 LSL_Rotation r;
13009 r = rules.GetQuaternionItem(idx++);
13010
13011 SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
13012 if (part == null)
13013 break;
13014
13015 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
13016 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
13017
13018 if (part.LinkNum > 1)
13019 localRot = GetPartLocalRot(part);
13020
13021 r = r * llGetRootRotation() / localRot;
13022 av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
13023 av.SendAvatarDataToAllAgents();
13024 }
13025 break;
13026
13027 // parse rest doing nothing but number of parameters error check
13028 case (int)ScriptBaseClass.PRIM_SIZE:
13029 case (int)ScriptBaseClass.PRIM_MATERIAL:
13030 case (int)ScriptBaseClass.PRIM_PHANTOM:
13031 case (int)ScriptBaseClass.PRIM_PHYSICS:
13032 case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
13033 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
13034 case (int)ScriptBaseClass.PRIM_NAME:
13035 case (int)ScriptBaseClass.PRIM_DESC:
13036 if (remain < 1)
13037 return null;
13038 idx++;
13039 break;
13040
13041 case (int)ScriptBaseClass.PRIM_GLOW:
13042 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
13043 case (int)ScriptBaseClass.PRIM_TEXGEN:
13044 if (remain < 2)
13045 return null;
13046 idx += 2;
13047 break;
13048
13049 case (int)ScriptBaseClass.PRIM_TYPE:
13050 if (remain < 3)
13051 return null;
13052 code = (int)rules.GetLSLIntegerItem(idx++);
13053 remain = rules.Length - idx;
13054 switch (code)
13055 {
13056 case (int)ScriptBaseClass.PRIM_TYPE_BOX:
13057 case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
13058 case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
13059 if (remain < 6)
13060 return null;
13061 idx += 6;
13062 break;
13063
13064 case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
13065 if (remain < 5)
13066 return null;
13067 idx += 5;
13068 break;
13069
13070 case (int)ScriptBaseClass.PRIM_TYPE_TORUS:
13071 case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
13072 case (int)ScriptBaseClass.PRIM_TYPE_RING:
13073 if (remain < 11)
13074 return null;
13075 idx += 11;
13076 break;
13077
13078 case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
13079 if (remain < 2)
13080 return null;
13081 idx += 2;
13082 break;
13083 }
13084 break;
13085
13086 case (int)ScriptBaseClass.PRIM_COLOR:
13087 case (int)ScriptBaseClass.PRIM_TEXT:
13088 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
13089 case (int)ScriptBaseClass.PRIM_OMEGA:
13090 if (remain < 3)
13091 return null;
13092 idx += 3;
13093 break;
13094
13095 case (int)ScriptBaseClass.PRIM_TEXTURE:
13096 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
13097 case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
13098 if (remain < 5)
13099 return null;
13100 idx += 5;
13101 break;
13102
13103 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
13104 if (remain < 7)
13105 return null;
13106
13107 idx += 7;
13108 break;
13109
13110 case (int)ScriptBaseClass.PRIM_LINK_TARGET:
13111 if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
13112 return null;
13113
13114 return rules.GetSublist(idx, -1);
13115 }
13116 }
13117 }
13118 catch (InvalidCastException e)
13119 {
13120 ShoutError(string.Format(
13121 "{0} error running rule #{1}: arg #{2} ",
13122 originFunc, rulesParsed, idx - idxStart) + e.Message);
13123 }
13124 finally
13125 {
13126 if (positionChanged)
13127 {
13128 av.OffsetPosition = finalPos;
13129// av.SendAvatarDataToAllAgents();
13130 av.SendTerseUpdateToAllClients();
13131 positionChanged = false;
13132 }
13133 }
13134 return null;
13135 }
13136
13137 public LSL_List GetPrimParams(ScenePresence avatar, LSL_List rules, ref LSL_List res)
13138 {
13139 // avatars case
13140 // replies as SL wiki
13141
13142// SceneObjectPart sitPart = avatar.ParentPart; // most likelly it will be needed
13143 SceneObjectPart sitPart = World.GetSceneObjectPart(avatar.ParentID); // maybe better do this expensive search for it in case it's gone??
13144
13145 int idx = 0;
13146 while (idx < rules.Length)
13147 {
13148 int code = (int)rules.GetLSLIntegerItem(idx++);
13149 int remain = rules.Length - idx;
13150
13151 switch (code)
13152 {
13153 case (int)ScriptBaseClass.PRIM_MATERIAL:
13154 res.Add(new LSL_Integer((int)SOPMaterialData.SopMaterial.Flesh));
13155 break;
13156
13157 case (int)ScriptBaseClass.PRIM_PHYSICS:
13158 res.Add(new LSL_Integer(0));
13159 break;
13160
13161 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
13162 res.Add(new LSL_Integer(0));
13163 break;
13164
13165 case (int)ScriptBaseClass.PRIM_PHANTOM:
13166 res.Add(new LSL_Integer(0));
13167 break;
13168
13169 case (int)ScriptBaseClass.PRIM_POSITION:
13170
13171 Vector3 pos = avatar.OffsetPosition;
13172
13173 Vector3 sitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f *2.0f);
13174 pos -= sitOffset;
13175
13176 if( sitPart != null)
13177 pos = sitPart.GetWorldPosition() + pos * sitPart.GetWorldRotation();
13178
13179 res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z));
13180 break;
13181
13182 case (int)ScriptBaseClass.PRIM_SIZE:
13183 // as in llGetAgentSize above
13184// res.Add(new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight));
13185 Vector3 s = avatar.Appearance.AvatarSize;
13186 res.Add(new LSL_Vector(s.X, s.Y, s.Z));
13187
13188 break;
13189
13190 case (int)ScriptBaseClass.PRIM_ROTATION:
13191 Quaternion rot = avatar.Rotation;
13192 if (sitPart != null)
13193 {
13194 rot = sitPart.GetWorldRotation() * rot; // apply sit part world rotation
13195 }
13196
13197 res.Add(new LSL_Rotation (rot.X, rot.Y, rot.Z, rot.W));
13198 break;
13199
13200 case (int)ScriptBaseClass.PRIM_TYPE:
13201 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
13202 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
13203 res.Add(new LSL_Vector(0f,1.0f,0f));
13204 res.Add(new LSL_Float(0.0f));
13205 res.Add(new LSL_Vector(0, 0, 0));
13206 res.Add(new LSL_Vector(1.0f,1.0f,0f));
13207 res.Add(new LSL_Vector(0, 0, 0));
13208 break;
13209
13210 case (int)ScriptBaseClass.PRIM_TEXTURE:
13211 if (remain < 1)
13212 return null;
13213
13214 int face = (int)rules.GetLSLIntegerItem(idx++);
13215 if (face == ScriptBaseClass.ALL_SIDES)
13216 {
13217 for (face = 0; face < 21; face++)
13218 {
13219 res.Add(new LSL_String(""));
13220 res.Add(new LSL_Vector(0,0,0));
13221 res.Add(new LSL_Vector(0,0,0));
13222 res.Add(new LSL_Float(0.0));
13223 }
13224 }
13225 else
13226 {
13227 if (face >= 0 && face < 21)
13228 {
13229 res.Add(new LSL_String(""));
13230 res.Add(new LSL_Vector(0,0,0));
13231 res.Add(new LSL_Vector(0,0,0));
13232 res.Add(new LSL_Float(0.0));
13233 }
13234 }
13235 break;
13236
13237 case (int)ScriptBaseClass.PRIM_COLOR:
13238 if (remain < 1)
13239 return null;
13240
13241 face = (int)rules.GetLSLIntegerItem(idx++);
13242
13243 if (face == ScriptBaseClass.ALL_SIDES)
13244 {
13245 for (face = 0; face < 21; face++)
13246 {
13247 res.Add(new LSL_Vector(0,0,0));
13248 res.Add(new LSL_Float(0));
13249 }
13250 }
13251 else
13252 {
13253 res.Add(new LSL_Vector(0,0,0));
13254 res.Add(new LSL_Float(0));
13255 }
13256 break;
13257
13258 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
13259 if (remain < 1)
13260 return null;
13261 face = (int)rules.GetLSLIntegerItem(idx++);
13262
13263 if (face == ScriptBaseClass.ALL_SIDES)
13264 {
13265 for (face = 0; face < 21; face++)
13266 {
13267 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
13268 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
13269 }
13270 }
13271 else
13272 {
13273 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
13274 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
13275 }
13276 break;
13277
13278 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
13279 if (remain < 1)
13280 return null;
13281 face = (int)rules.GetLSLIntegerItem(idx++);
13282
13283 if (face == ScriptBaseClass.ALL_SIDES)
13284 {
13285 for (face = 0; face < 21; face++)
13286 {
13287 res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
13288 }
13289 }
13290 else
13291 {
13292 res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
13293 }
13294 break;
13295
13296 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
13297 res.Add(new LSL_Integer(0));
13298 res.Add(new LSL_Integer(0));// softness
13299 res.Add(new LSL_Float(0.0f)); // gravity
13300 res.Add(new LSL_Float(0.0f)); // friction
13301 res.Add(new LSL_Float(0.0f)); // wind
13302 res.Add(new LSL_Float(0.0f)); // tension
13303 res.Add(new LSL_Vector(0f,0f,0f));
13304 break;
13305
13306 case (int)ScriptBaseClass.PRIM_TEXGEN:
13307 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
13308 if (remain < 1)
13309 return null;
13310 face = (int)rules.GetLSLIntegerItem(idx++);
13311
13312 if (face == ScriptBaseClass.ALL_SIDES)
13313 {
13314 for (face = 0; face < 21; face++)
13315 {
13316 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
13317 }
13318 }
13319 else
13320 {
13321 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
13322 }
13323 break;
13324
13325 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
13326 res.Add(new LSL_Integer(0));
13327 res.Add(new LSL_Vector(0f,0f,0f));
13328 res.Add(new LSL_Float(0f)); // intensity
13329 res.Add(new LSL_Float(0f)); // radius
13330 res.Add(new LSL_Float(0f)); // falloff
13331 break;
13332
13333 case (int)ScriptBaseClass.PRIM_GLOW:
13334 if (remain < 1)
13335 return null;
13336 face = (int)rules.GetLSLIntegerItem(idx++);
13337
13338 if (face == ScriptBaseClass.ALL_SIDES)
13339 {
13340 for (face = 0; face < 21; face++)
13341 {
13342 res.Add(new LSL_Float(0f));
13343 }
13344 }
13345 else
13346 {
13347 res.Add(new LSL_Float(0f));
13348 }
13349 break;
13350
13351 case (int)ScriptBaseClass.PRIM_TEXT:
13352 res.Add(new LSL_String(""));
13353 res.Add(new LSL_Vector(0f,0f,0f));
13354 res.Add(new LSL_Float(1.0f));
13355 break;
13356
13357 case (int)ScriptBaseClass.PRIM_NAME:
13358 res.Add(new LSL_String(avatar.Name));
13359 break;
13360
13361 case (int)ScriptBaseClass.PRIM_DESC:
13362 res.Add(new LSL_String(""));
13363 break;
13364
13365 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
13366 Quaternion lrot = avatar.Rotation;
13367
13368 if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
13369 {
13370 lrot = sitPart.RotationOffset * lrot; // apply sit part rotation offset
13371 }
13372 res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W));
13373 break;
13374
13375 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
13376 Vector3 lpos = avatar.OffsetPosition; // pos relative to sit part
13377 Vector3 lsitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f * 2.0f);
13378 lpos -= lsitOffset;
13379
13380 if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
13381 {
13382 lpos = sitPart.OffsetPosition + (lpos * sitPart.RotationOffset); // make it relative to root prim
13383 }
13384 res.Add(new LSL_Vector(lpos.X,lpos.Y,lpos.Z));
13385 break;
13386
13387 case (int)ScriptBaseClass.PRIM_LINK_TARGET:
13388 if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
13389 return null;
13390
13391 return rules.GetSublist(idx, -1);
13392 }
13393 }
13394
13395 return null;
13396 }
13397
13398 public void llSetContentType(LSL_Key id, LSL_Integer content_type)
13399 {
13400 if (m_UrlModule != null)
13401 {
13402 string type = "text.plain";
13403 if (content_type == (int)ScriptBaseClass.CONTENT_TYPE_HTML)
13404 type = "text/html";
13405
13406 m_UrlModule.HttpContentType(new UUID(id),type);
13407 }
13408 }
12045 } 13409 }
12046 13410
12047 public class NotecardCache 13411 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 21bae27..bd776b6 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 415166a..f4e4f44 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 88ab515..a47e452 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
@@ -353,7 +353,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
353 // Position of a sensor in a child prim attached to an avatar 353 // Position of a sensor in a child prim attached to an avatar
354 // will be still wrong. 354 // will be still wrong.
355 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 355 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
356 q = avatar.GetWorldRotation() * q; 356 fromRegionPos = avatar.AbsolutePosition;
357 q = avatar.Rotation;
357 } 358 }
358 359
359 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); 360 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
@@ -397,7 +398,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
397 objtype = 0; 398 objtype = 0;
398 399
399 part = ((SceneObjectGroup)ent).RootPart; 400 part = ((SceneObjectGroup)ent).RootPart;
400 if (part.ParentGroup.AttachmentPoint != 0) // Attached so ignore 401 if (part.ParentGroup.RootPart.Shape.PCode != (byte)PCode.Tree &&
402 part.ParentGroup.RootPart.Shape.PCode != (byte)PCode.NewTree &&
403 part.ParentGroup.AttachmentPoint != 0) // Attached so ignore
401 continue; 404 continue;
402 405
403 if (part.Inventory.ContainsScripts()) 406 if (part.Inventory.ContainsScripts())
@@ -480,7 +483,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
480 // Position of a sensor in a child prim attached to an avatar 483 // Position of a sensor in a child prim attached to an avatar
481 // will be still wrong. 484 // will be still wrong.
482 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 485 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
483 q = avatar.GetWorldRotation() * q; 486 if (avatar == null)
487 return sensedEntities;
488 fromRegionPos = avatar.AbsolutePosition;
489 q = avatar.Rotation;
484 } 490 }
485 491
486 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); 492 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
@@ -496,7 +502,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
496// "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}", 502// "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}",
497// presence.Name, presence.PresenceType, ts.name, ts.type); 503// presence.Name, presence.PresenceType, ts.name, ts.type);
498 504
499 if ((ts.type & NPC) == 0 && (ts.type & OS_NPC) == 0 && presence.PresenceType == PresenceType.Npc) 505 if ((ts.type & NPC) == 0 && presence.PresenceType == PresenceType.Npc)
500 { 506 {
501 INPC npcData = m_npcModule.GetNPC(presence.UUID, presence.Scene); 507 INPC npcData = m_npcModule.GetNPC(presence.UUID, presence.Scene);
502 if (npcData == null || !npcData.SenseAsAgent) 508 if (npcData == null || !npcData.SenseAsAgent)
@@ -696,4 +702,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
696 return retList; 702 return retList;
697 } 703 }
698 } 704 }
699} \ No newline at end of file 705}
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 a6ea88c..daf89e5 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);
@@ -331,6 +332,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
331 void llSensorRemove(); 332 void llSensorRemove();
332 void llSensorRepeat(string name, string id, int type, double range, double arc, double rate); 333 void llSensorRepeat(string name, string id, int type, double range, double arc, double rate);
333 void llSetAlpha(double alpha, int face); 334 void llSetAlpha(double alpha, int face);
335 void llSetAngularVelocity(LSL_Vector angvelocity, int local);
334 void llSetBuoyancy(double buoyancy); 336 void llSetBuoyancy(double buoyancy);
335 void llSetCameraAtOffset(LSL_Vector offset); 337 void llSetCameraAtOffset(LSL_Vector offset);
336 void llSetCameraEyeOffset(LSL_Vector offset); 338 void llSetCameraEyeOffset(LSL_Vector offset);
@@ -357,11 +359,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
357 void llSetParcelMusicURL(string url); 359 void llSetParcelMusicURL(string url);
358 void llSetPayPrice(int price, LSL_List quick_pay_buttons); 360 void llSetPayPrice(int price, LSL_List quick_pay_buttons);
359 void llSetPos(LSL_Vector pos); 361 void llSetPos(LSL_Vector pos);
362 LSL_Integer llSetRegionPos(LSL_Vector pos);
360 LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules); 363 LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules);
361 void llSetPrimitiveParams(LSL_List rules); 364 void llSetPrimitiveParams(LSL_List rules);
362 void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules); 365 void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules);
363 void llSetPrimURL(string url); 366 void llSetPrimURL(string url);
364 LSL_Integer llSetRegionPos(LSL_Vector pos);
365 void llSetRemoteScriptAccessPin(int pin); 367 void llSetRemoteScriptAccessPin(int pin);
366 void llSetRot(LSL_Rotation rot); 368 void llSetRot(LSL_Rotation rot);
367 void llSetScale(LSL_Vector scale); 369 void llSetScale(LSL_Vector scale);
@@ -381,6 +383,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
381 void llSetVehicleRotationParam(int param, LSL_Rotation rot); 383 void llSetVehicleRotationParam(int param, LSL_Rotation rot);
382 void llSetVehicleType(int type); 384 void llSetVehicleType(int type);
383 void llSetVehicleVectorParam(int param, LSL_Vector vec); 385 void llSetVehicleVectorParam(int param, LSL_Vector vec);
386 void llSetVelocity(LSL_Vector velocity, int local);
384 void llShout(int channelID, string text); 387 void llShout(int channelID, string text);
385 LSL_Float llSin(double f); 388 LSL_Float llSin(double f);
386 void llSitTarget(LSL_Vector offset, LSL_Rotation rot); 389 void llSitTarget(LSL_Vector offset, LSL_Rotation rot);
@@ -424,10 +427,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
424 LSL_Vector llWind(LSL_Vector offset); 427 LSL_Vector llWind(LSL_Vector offset);
425 LSL_String llXorBase64Strings(string str1, string str2); 428 LSL_String llXorBase64Strings(string str1, string str2);
426 LSL_String llXorBase64StringsCorrect(string str1, string str2); 429 LSL_String llXorBase64StringsCorrect(string str1, string str2);
427 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);
428 432
429 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc); 433 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc);
430 void llSetKeyframedMotion(LSL_List frames, LSL_List options); 434 void llSetKeyframedMotion(LSL_List frames, LSL_List options);
431 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 435 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
436 LSL_List llGetPhysicsMaterial();
437 void llSetContentType(LSL_Key id, LSL_Integer content_type);
432 } 438 }
433} 439}
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 559068d..6efa73f 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;
@@ -337,6 +338,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
337 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART 338 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
338 public const int CHANGED_MEDIA = 2048; 339 public const int CHANGED_MEDIA = 2048;
339 public const int CHANGED_ANIMATION = 16384; 340 public const int CHANGED_ANIMATION = 16384;
341 public const int CHANGED_POSITION = 32768;
340 public const int TYPE_INVALID = 0; 342 public const int TYPE_INVALID = 0;
341 public const int TYPE_INTEGER = 1; 343 public const int TYPE_INTEGER = 1;
342 public const int TYPE_FLOAT = 2; 344 public const int TYPE_FLOAT = 2;
@@ -674,7 +676,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
674 public const int FRICTION = 2; 676 public const int FRICTION = 2;
675 public const int RESTITUTION = 4; 677 public const int RESTITUTION = 4;
676 public const int GRAVITY_MULTIPLIER = 8; 678 public const int GRAVITY_MULTIPLIER = 8;
677 679
678 // extra constants for llSetPrimMediaParams 680 // extra constants for llSetPrimMediaParams
679 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); 681 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0);
680 public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000); 682 public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000);
@@ -746,7 +748,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
746 748
747 public static readonly LSLInteger RCERR_UNKNOWN = -1; 749 public static readonly LSLInteger RCERR_UNKNOWN = -1;
748 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; 750 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2;
749 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3; 751 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = -3;
750 752
751 public const int KFM_MODE = 1; 753 public const int KFM_MODE = 1;
752 public const int KFM_LOOP = 1; 754 public const int KFM_LOOP = 1;
@@ -770,5 +772,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
770 /// process message parameter as regex 772 /// process message parameter as regex
771 /// </summary> 773 /// </summary>
772 public const int OS_LISTEN_REGEX_MESSAGE = 0x2; 774 public const int OS_LISTEN_REGEX_MESSAGE = 0x2;
775
776 public const int CONTENT_TYPE_TEXT = 0;
777 public const int CONTENT_TYPE_HTML = 1;
773 } 778 }
774} 779}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 398c125..6f3677c 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)
@@ -1493,6 +1495,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1493 m_LSL_Functions.llSetAlpha(alpha, face); 1495 m_LSL_Functions.llSetAlpha(alpha, face);
1494 } 1496 }
1495 1497
1498 public void llSetAngularVelocity(LSL_Vector angvelocity, int local)
1499 {
1500 m_LSL_Functions.llSetAngularVelocity(angvelocity, local);
1501 }
1502
1496 public void llSetBuoyancy(double buoyancy) 1503 public void llSetBuoyancy(double buoyancy)
1497 { 1504 {
1498 m_LSL_Functions.llSetBuoyancy(buoyancy); 1505 m_LSL_Functions.llSetBuoyancy(buoyancy);
@@ -1618,6 +1625,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1618 m_LSL_Functions.llSetPos(pos); 1625 m_LSL_Functions.llSetPos(pos);
1619 } 1626 }
1620 1627
1628 public LSL_Integer llSetRegionPos(LSL_Vector pos)
1629 {
1630 return m_LSL_Functions.llSetRegionPos(pos);
1631 }
1632
1621 public void llSetPrimitiveParams(LSL_List rules) 1633 public void llSetPrimitiveParams(LSL_List rules)
1622 { 1634 {
1623 m_LSL_Functions.llSetPrimitiveParams(rules); 1635 m_LSL_Functions.llSetPrimitiveParams(rules);
@@ -1633,11 +1645,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1633 m_LSL_Functions.llSetPrimURL(url); 1645 m_LSL_Functions.llSetPrimURL(url);
1634 } 1646 }
1635 1647
1636 public LSL_Integer llSetRegionPos(LSL_Vector pos)
1637 {
1638 return m_LSL_Functions.llSetRegionPos(pos);
1639 }
1640
1641 public void llSetRemoteScriptAccessPin(int pin) 1648 public void llSetRemoteScriptAccessPin(int pin)
1642 { 1649 {
1643 m_LSL_Functions.llSetRemoteScriptAccessPin(pin); 1650 m_LSL_Functions.llSetRemoteScriptAccessPin(pin);
@@ -1733,6 +1740,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1733 m_LSL_Functions.llSetVehicleVectorParam(param, vec); 1740 m_LSL_Functions.llSetVehicleVectorParam(param, vec);
1734 } 1741 }
1735 1742
1743 public void llSetVelocity(LSL_Vector velocity, int local)
1744 {
1745 m_LSL_Functions.llSetVelocity(velocity, local);
1746 }
1747
1736 public void llShout(int channelID, string text) 1748 public void llShout(int channelID, string text)
1737 { 1749 {
1738 m_LSL_Functions.llShout(channelID, text); 1750 m_LSL_Functions.llShout(channelID, text);
@@ -1983,9 +1995,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1983 return m_LSL_Functions.llClearLinkMedia(link, face); 1995 return m_LSL_Functions.llClearLinkMedia(link, face);
1984 } 1996 }
1985 1997
1986 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()
2014 {
2015 return m_LSL_Functions.llGetPhysicsMaterial();
2016 }
2017
2018 public void llSetContentType(LSL_Key id, LSL_Integer content_type)
1987 { 2019 {
1988 m_LSL_Functions.print(str); 2020 m_LSL_Functions.llSetContentType(id, content_type);
1989 } 2021 }
1990 } 2022 }
1991} 2023}
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 887a317..8da06d1 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
@@ -235,8 +236,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
235 StartParam = startParam; 236 StartParam = startParam;
236 m_MaxScriptQueue = maxScriptQueue; 237 m_MaxScriptQueue = maxScriptQueue;
237 m_postOnRez = postOnRez; 238 m_postOnRez = postOnRez;
238 m_AttachedAvatar = Part.ParentGroup.AttachedAvatar; 239 m_AttachedAvatar = part.ParentGroup.AttachedAvatar;
239 m_RegionID = Part.ParentGroup.Scene.RegionInfo.RegionID; 240 m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID;
240 241
241 if (Engine.Config.GetString("ScriptStopStrategy", "abort") == "co-op") 242 if (Engine.Config.GetString("ScriptStopStrategy", "abort") == "co-op")
242 { 243 {
@@ -481,27 +482,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
481 PostEvent(new EventParams("attach", 482 PostEvent(new EventParams("attach",
482 new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0])); 483 new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0]));
483 } 484 }
485
484 } 486 }
485 } 487 }
486 488
487 private void ReleaseControls() 489 private void ReleaseControls()
488 { 490 {
489 int permsMask; 491 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
490 UUID permsGranter; 492
491 lock (Part.TaskInventory) 493 if (part != null)
492 { 494 {
493 if (!Part.TaskInventory.ContainsKey(ItemID)) 495 int permsMask;
496 UUID permsGranter;
497 part.TaskInventory.LockItemsForRead(true);
498 if (!part.TaskInventory.ContainsKey(ItemID))
499 {
500 part.TaskInventory.LockItemsForRead(false);
494 return; 501 return;
502 }
503 permsGranter = part.TaskInventory[ItemID].PermsGranter;
504 permsMask = part.TaskInventory[ItemID].PermsMask;
505 part.TaskInventory.LockItemsForRead(false);
495 506
496 permsGranter = Part.TaskInventory[ItemID].PermsGranter; 507 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
497 permsMask = Part.TaskInventory[ItemID].PermsMask; 508 {
498 } 509 ScenePresence presence = Engine.World.GetScenePresence(permsGranter);
499 510 if (presence != null)
500 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) 511 presence.UnRegisterControlEventsToScript(LocalID, ItemID);
501 { 512 }
502 ScenePresence presence = Engine.World.GetScenePresence(permsGranter);
503 if (presence != null)
504 presence.UnRegisterControlEventsToScript(LocalID, ItemID);
505 } 513 }
506 } 514 }
507 515
@@ -656,6 +664,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
656 return true; 664 return true;
657 } 665 }
658 666
667 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
659 public void SetState(string state) 668 public void SetState(string state)
660 { 669 {
661 if (state == State) 670 if (state == State)
@@ -667,7 +676,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
667 new DetectParams[0])); 676 new DetectParams[0]));
668 PostEvent(new EventParams("state_entry", new Object[0], 677 PostEvent(new EventParams("state_entry", new Object[0],
669 new DetectParams[0])); 678 new DetectParams[0]));
670 679
671 throw new EventAbortException(); 680 throw new EventAbortException();
672 } 681 }
673 682
@@ -757,57 +766,60 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
757 /// <returns></returns> 766 /// <returns></returns>
758 public object EventProcessor() 767 public object EventProcessor()
759 { 768 {
769 EventParams data = null;
760 // We check here as the thread stopping this instance from running may itself hold the m_Script lock. 770 // We check here as the thread stopping this instance from running may itself hold the m_Script lock.
761 if (!Running) 771 if (!Running)
762 return 0; 772 return 0;
763 773
764 lock (m_Script)
765 {
766// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName); 774// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
767 775
768 if (Suspended) 776 if (Suspended)
769 return 0; 777 return 0;
770
771 EventParams data = null;
772 778
773 lock (EventQueue) 779 lock (EventQueue)
780 {
781 data = (EventParams) EventQueue.Dequeue();
782 if (data == null) // Shouldn't happen
774 { 783 {
775 data = (EventParams)EventQueue.Dequeue(); 784 if (EventQueue.Count > 0 && Running && !ShuttingDown)
776 if (data == null) // Shouldn't happen
777 { 785 {
778 if (EventQueue.Count > 0 && Running && !ShuttingDown) 786 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 } 787 }
788 788 else
789 if (data.EventName == "timer")
790 m_TimerQueued = false;
791 if (data.EventName == "control")
792 { 789 {
793 if (m_ControlEventsInQueue > 0) 790 m_CurrentWorkItem = null;
794 m_ControlEventsInQueue--;
795 } 791 }
796 if (data.EventName == "collision") 792 return 0;
797 m_CollisionInQueue = false;
798 } 793 }
799 794
795 if (data.EventName == "timer")
796 m_TimerQueued = false;
797 if (data.EventName == "control")
798 {
799 if (m_ControlEventsInQueue > 0)
800 m_ControlEventsInQueue--;
801 }
802 if (data.EventName == "collision")
803 m_CollisionInQueue = false;
804 }
805
806 lock(m_Script)
807 {
808
809// m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
810 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
811
800 if (DebugLevel >= 2) 812 if (DebugLevel >= 2)
801 m_log.DebugFormat( 813 m_log.DebugFormat(
802 "[SCRIPT INSTANCE]: Processing event {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}", 814 "[SCRIPT INSTANCE]: Processing event {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}",
803 data.EventName, 815 data.EventName,
804 ScriptName, 816 ScriptName,
805 Part.Name, 817 part.Name,
806 Part.LocalId, 818 part.LocalId,
807 Part.ParentGroup.Name, 819 part.ParentGroup.Name,
808 Part.ParentGroup.UUID, 820 part.ParentGroup.UUID,
809 Part.AbsolutePosition, 821 part.AbsolutePosition,
810 Part.ParentGroup.Scene.Name); 822 part.ParentGroup.Scene.Name);
811 823
812 m_DetectParams = data.DetectParams; 824 m_DetectParams = data.DetectParams;
813 825
@@ -820,17 +832,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
820 "[SCRIPT INSTANCE]: Changing state to {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}", 832 "[SCRIPT INSTANCE]: Changing state to {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}",
821 State, 833 State,
822 ScriptName, 834 ScriptName,
823 Part.Name, 835 part.Name,
824 Part.LocalId, 836 part.LocalId,
825 Part.ParentGroup.Name, 837 part.ParentGroup.Name,
826 Part.ParentGroup.UUID, 838 part.ParentGroup.UUID,
827 Part.AbsolutePosition, 839 part.AbsolutePosition,
828 Part.ParentGroup.Scene.Name); 840 part.ParentGroup.Scene.Name);
829 841
830 AsyncCommandManager.RemoveScript(Engine, 842 AsyncCommandManager.RemoveScript(Engine,
831 LocalID, ItemID); 843 LocalID, ItemID);
832 844
833 Part.SetScriptEvents(ItemID, (int)m_Script.GetStateEventFlags(State)); 845 if (part != null)
846 {
847 part.SetScriptEvents(ItemID,
848 (int)m_Script.GetStateEventFlags(State));
849 }
834 } 850 }
835 else 851 else
836 { 852 {
@@ -893,17 +909,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
893 text = text.Substring(0, 1000); 909 text = text.Substring(0, 1000);
894 Engine.World.SimChat(Utils.StringToBytes(text), 910 Engine.World.SimChat(Utils.StringToBytes(text),
895 ChatTypeEnum.DebugChannel, 2147483647, 911 ChatTypeEnum.DebugChannel, 2147483647,
896 Part.AbsolutePosition, 912 part.AbsolutePosition,
897 Part.Name, Part.UUID, false); 913 part.Name, part.UUID, false);
898 914
899 915
900 m_log.DebugFormat( 916 m_log.DebugFormat(
901 "[SCRIPT INSTANCE]: Runtime error in script {0}, part {1} {2} at {3} in {4}, displayed error {5}, actual exception {6}", 917 "[SCRIPT INSTANCE]: Runtime error in script {0}, part {1} {2} at {3} in {4}, displayed error {5}, actual exception {6}",
902 ScriptName, 918 ScriptName,
903 PrimName, 919 PrimName,
904 Part.UUID, 920 part.UUID,
905 Part.AbsolutePosition, 921 part.AbsolutePosition,
906 Part.ParentGroup.Scene.Name, 922 part.ParentGroup.Scene.Name,
907 text.Replace("\n", "\\n"), 923 text.Replace("\n", "\\n"),
908 e.InnerException); 924 e.InnerException);
909 } 925 }
@@ -923,12 +939,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
923 else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) 939 else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
924 { 940 {
925 m_InSelfDelete = true; 941 m_InSelfDelete = true;
926 Engine.World.DeleteSceneObject(Part.ParentGroup, false); 942 if (part != null)
943 Engine.World.DeleteSceneObject(part.ParentGroup, false);
927 } 944 }
928 else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException)) 945 else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException))
929 { 946 {
930 m_InSelfDelete = true; 947 m_InSelfDelete = true;
931 Part.Inventory.RemoveInventoryItem(ItemID); 948 if (part != null)
949 part.Inventory.RemoveInventoryItem(ItemID);
932 } 950 }
933 else if ((e is TargetInvocationException) && (e.InnerException is ScriptCoopStopException)) 951 else if ((e is TargetInvocationException) && (e.InnerException is ScriptCoopStopException))
934 { 952 {
@@ -982,14 +1000,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
982 ReleaseControls(); 1000 ReleaseControls();
983 1001
984 Stop(timeout); 1002 Stop(timeout);
985 Part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; 1003 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
986 Part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; 1004 part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
1005 part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
1006 part.CollisionSound = UUID.Zero;
987 AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); 1007 AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID);
988 EventQueue.Clear(); 1008 EventQueue.Clear();
989 m_Script.ResetVars(); 1009 m_Script.ResetVars();
990 State = "default"; 1010 State = "default";
991 1011
992 Part.SetScriptEvents(ItemID, 1012 part.SetScriptEvents(ItemID,
993 (int)m_Script.GetStateEventFlags(State)); 1013 (int)m_Script.GetStateEventFlags(State));
994 if (running) 1014 if (running)
995 Start(); 1015 Start();
@@ -998,6 +1018,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
998 new Object[0], new DetectParams[0])); 1018 new Object[0], new DetectParams[0]));
999 } 1019 }
1000 1020
1021 [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
1001 public void ApiResetScript() 1022 public void ApiResetScript()
1002 { 1023 {
1003 // bool running = Running; 1024 // bool running = Running;
@@ -1006,15 +1027,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
1006 ReleaseControls(); 1027 ReleaseControls();
1007 1028
1008 m_Script.ResetVars(); 1029 m_Script.ResetVars();
1009 Part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; 1030 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
1010 Part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; 1031 part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
1032 part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
1033 part.CollisionSound = UUID.Zero;
1011 AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); 1034 AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID);
1012 1035
1013 EventQueue.Clear(); 1036 EventQueue.Clear();
1014 m_Script.ResetVars(); 1037 m_Script.ResetVars();
1015 State = "default"; 1038 State = "default";
1016 1039
1017 Part.SetScriptEvents(ItemID, 1040 part.SetScriptEvents(ItemID,
1018 (int)m_Script.GetStateEventFlags(State)); 1041 (int)m_Script.GetStateEventFlags(State));
1019 1042
1020 if (m_CurrentEvent != "state_entry") 1043 if (m_CurrentEvent != "state_entry")
@@ -1028,10 +1051,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
1028 1051
1029 public Dictionary<string, object> GetVars() 1052 public Dictionary<string, object> GetVars()
1030 { 1053 {
1031 if (m_Script != null) 1054 return m_Script.GetVars();
1032 return m_Script.GetVars();
1033 else
1034 return new Dictionary<string, object>();
1035 } 1055 }
1036 1056
1037 public void SetVars(Dictionary<string, object> vars) 1057 public void SetVars(Dictionary<string, object> vars)
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index f6d94a3..c685afb 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 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 5804aa8..9d1e143 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -28,6 +28,7 @@
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.Globalization; 32using System.Globalization;
32using System.IO; 33using System.IO;
33using System.Linq; 34using System.Linq;
@@ -148,6 +149,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
148 private Dictionary<UUID, IScriptInstance> m_Scripts = 149 private Dictionary<UUID, IScriptInstance> m_Scripts =
149 new Dictionary<UUID, IScriptInstance>(); 150 new Dictionary<UUID, IScriptInstance>();
150 151
152 private OpenMetaverse.ReaderWriterLockSlim m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
153
151 // Maps the asset ID to the assembly 154 // Maps the asset ID to the assembly
152 155
153 private Dictionary<UUID, string> m_Assemblies = 156 private Dictionary<UUID, string> m_Assemblies =
@@ -170,6 +173,71 @@ namespace OpenSim.Region.ScriptEngine.XEngine
170 IWorkItemResult m_CurrentCompile = null; 173 IWorkItemResult m_CurrentCompile = null;
171 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>(); 174 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>();
172 175
176 private void lockScriptsForRead(bool locked)
177 {
178 if (locked)
179 {
180 if (m_scriptsLock.RecursiveReadCount > 0)
181 {
182 m_log.Error("[XEngine.m_Scripts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
183 m_scriptsLock.ExitReadLock();
184 }
185 if (m_scriptsLock.RecursiveWriteCount > 0)
186 {
187 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
188 m_scriptsLock.ExitWriteLock();
189 }
190
191 while (!m_scriptsLock.TryEnterReadLock(60000))
192 {
193 m_log.Error("[XEngine.m_Scripts] Thread lock detected while trying to aquire READ lock of m_scripts in XEngine. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
194 if (m_scriptsLock.IsWriteLockHeld)
195 {
196 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
197 }
198 }
199 }
200 else
201 {
202 if (m_scriptsLock.RecursiveReadCount > 0)
203 {
204 m_scriptsLock.ExitReadLock();
205 }
206 }
207 }
208 private void lockScriptsForWrite(bool locked)
209 {
210 if (locked)
211 {
212 if (m_scriptsLock.RecursiveReadCount > 0)
213 {
214 m_log.Error("[XEngine.m_Scripts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
215 m_scriptsLock.ExitReadLock();
216 }
217 if (m_scriptsLock.RecursiveWriteCount > 0)
218 {
219 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
220 m_scriptsLock.ExitWriteLock();
221 }
222
223 while (!m_scriptsLock.TryEnterWriteLock(60000))
224 {
225 m_log.Error("[XEngine.m_Scripts] Thread lock detected while trying to aquire WRITE lock of m_scripts in XEngine. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
226 if (m_scriptsLock.IsWriteLockHeld)
227 {
228 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
229 }
230 }
231 }
232 else
233 {
234 if (m_scriptsLock.RecursiveWriteCount > 0)
235 {
236 m_scriptsLock.ExitWriteLock();
237 }
238 }
239 }
240
173 private ScriptEngineConsoleCommands m_consoleCommands; 241 private ScriptEngineConsoleCommands m_consoleCommands;
174 242
175 public string ScriptEngineName 243 public string ScriptEngineName
@@ -699,64 +767,69 @@ namespace OpenSim.Region.ScriptEngine.XEngine
699 { 767 {
700 if (!m_Enabled) 768 if (!m_Enabled)
701 return; 769 return;
770 lockScriptsForRead(true);
702 771
703 lock (m_Scripts) 772 List<IScriptInstance> instancesToDel = new List<IScriptInstance>(m_Scripts.Values);
704 {
705 m_log.InfoFormat(
706 "[XEngine]: Shutting down {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName);
707 773
708 foreach (IScriptInstance instance in m_Scripts.Values) 774// foreach (IScriptInstance instance in m_Scripts.Values)
775 foreach (IScriptInstance instance in instancesToDel)
776 {
777 // Force a final state save
778 //
779 if (m_Assemblies.ContainsKey(instance.AssetID))
709 { 780 {
710 // Force a final state save 781 string assembly = m_Assemblies[instance.AssetID];
711 //
712 if (m_Assemblies.ContainsKey(instance.AssetID))
713 {
714 string assembly = m_Assemblies[instance.AssetID];
715 782
716 try 783 try
717 { 784 {
718 instance.SaveState(assembly); 785 instance.SaveState(assembly);
719 }
720 catch (Exception e)
721 {
722 m_log.Error(
723 string.Format(
724 "[XEngine]: Failed final state save for script {0}.{1}, item UUID {2}, prim UUID {3} in {4}. Exception ",
725 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, World.Name)
726 , e);
727 }
728 } 786 }
787 catch (Exception e)
788 {
789 m_log.Error(
790 string.Format(
791 "[XEngine]: Failed final state save for script {0}.{1}, item UUID {2}, prim UUID {3} in {4}. Exception ",
792 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, World.Name)
793 , e);
794 }
795 }
729 796
730 // Clear the event queue and abort the instance thread 797 // Clear the event queue and abort the instance thread
731 // 798 //
732 instance.ClearQueue(); 799 instance.ClearQueue();
733 instance.Stop(0); 800 instance.Stop(0);
734 801
735 // Release events, timer, etc 802 // Release events, timer, etc
736 // 803 //
737 instance.DestroyScriptInstance(); 804 instance.DestroyScriptInstance();
738 805
739 // Unload scripts and app domains. 806 // Unload scripts and app domains
740 // Must be done explicitly because they have infinite 807 // Must be done explicitly because they have infinite
741 // lifetime. 808 // lifetime
742 // However, don't bother to do this if the simulator is shutting 809 //
743 // down since it takes a long time with many scripts. 810// if (!m_SimulatorShuttingDown)
744 if (!m_SimulatorShuttingDown) 811 {
812 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
813 if (m_DomainScripts[instance.AppDomain].Count == 0)
745 { 814 {
746 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID); 815 m_DomainScripts.Remove(instance.AppDomain);
747 if (m_DomainScripts[instance.AppDomain].Count == 0) 816 UnloadAppDomain(instance.AppDomain);
748 {
749 m_DomainScripts.Remove(instance.AppDomain);
750 UnloadAppDomain(instance.AppDomain);
751 }
752 } 817 }
753 } 818 }
754 819
755 m_Scripts.Clear(); 820// m_Scripts.Clear();
756 m_PrimObjects.Clear(); 821// m_PrimObjects.Clear();
757 m_Assemblies.Clear(); 822// m_Assemblies.Clear();
758 m_DomainScripts.Clear(); 823// m_DomainScripts.Clear();
759 } 824 }
825 lockScriptsForRead(false);
826 lockScriptsForWrite(true);
827 m_Scripts.Clear();
828 lockScriptsForWrite(false);
829 m_PrimObjects.Clear();
830 m_Assemblies.Clear();
831 m_DomainScripts.Clear();
832
760 lock (m_ScriptEngines) 833 lock (m_ScriptEngines)
761 { 834 {
762 m_ScriptEngines.Remove(this); 835 m_ScriptEngines.Remove(this);
@@ -825,22 +898,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
825 898
826 List<IScriptInstance> instances = new List<IScriptInstance>(); 899 List<IScriptInstance> instances = new List<IScriptInstance>();
827 900
828 lock (m_Scripts) 901 lockScriptsForRead(true);
829 { 902 foreach (IScriptInstance instance in m_Scripts.Values)
830 foreach (IScriptInstance instance in m_Scripts.Values)
831 instances.Add(instance); 903 instances.Add(instance);
832 } 904 lockScriptsForRead(false);
833 905
834 foreach (IScriptInstance i in instances) 906 foreach (IScriptInstance i in instances)
835 { 907 {
836 string assembly = String.Empty; 908 string assembly = String.Empty;
837 909
838 lock (m_Scripts) 910
839 {
840 if (!m_Assemblies.ContainsKey(i.AssetID)) 911 if (!m_Assemblies.ContainsKey(i.AssetID))
841 continue; 912 continue;
842 assembly = m_Assemblies[i.AssetID]; 913 assembly = m_Assemblies[i.AssetID];
843 } 914
844 915
845 try 916 try
846 { 917 {
@@ -1244,97 +1315,93 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1244 } 1315 }
1245 1316
1246 ScriptInstance instance = null; 1317 ScriptInstance instance = null;
1247 lock (m_Scripts) 1318 // Create the object record
1319 lockScriptsForRead(true);
1320 if ((!m_Scripts.ContainsKey(itemID)) ||
1321 (m_Scripts[itemID].AssetID != assetID))
1248 { 1322 {
1249 // Create the object record 1323 lockScriptsForRead(false);
1250 if ((!m_Scripts.ContainsKey(itemID)) ||
1251 (m_Scripts[itemID].AssetID != assetID))
1252 {
1253 UUID appDomain = assetID;
1254 1324
1255 if (part.ParentGroup.IsAttachment) 1325 UUID appDomain = assetID;
1256 appDomain = part.ParentGroup.RootPart.UUID;
1257 1326
1258 if (!m_AppDomains.ContainsKey(appDomain)) 1327 if (part.ParentGroup.IsAttachment)
1259 { 1328 appDomain = part.ParentGroup.RootPart.UUID;
1260 try
1261 {
1262 AppDomainSetup appSetup = new AppDomainSetup();
1263 appSetup.PrivateBinPath = Path.Combine(
1264 m_ScriptEnginesPath,
1265 m_Scene.RegionInfo.RegionID.ToString());
1266 1329
1267 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; 1330 if (!m_AppDomains.ContainsKey(appDomain))
1268 Evidence evidence = new Evidence(baseEvidence); 1331 {
1332 try
1333 {
1334 AppDomainSetup appSetup = new AppDomainSetup();
1335 appSetup.PrivateBinPath = Path.Combine(
1336 m_ScriptEnginesPath,
1337 m_Scene.RegionInfo.RegionID.ToString());
1269 1338
1270 AppDomain sandbox; 1339 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
1271 if (m_AppDomainLoading) 1340 Evidence evidence = new Evidence(baseEvidence);
1272 {
1273 sandbox = AppDomain.CreateDomain(
1274 m_Scene.RegionInfo.RegionID.ToString(),
1275 evidence, appSetup);
1276 sandbox.AssemblyResolve +=
1277 new ResolveEventHandler(
1278 AssemblyResolver.OnAssemblyResolve);
1279 }
1280 else
1281 {
1282 sandbox = AppDomain.CurrentDomain;
1283 }
1284
1285 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
1286 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
1287 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
1288 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
1289 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
1290 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
1291 //sandbox.SetAppDomainPolicy(sandboxPolicy);
1292
1293 m_AppDomains[appDomain] = sandbox;
1294 1341
1295 m_DomainScripts[appDomain] = new List<UUID>(); 1342 AppDomain sandbox;
1343 if (m_AppDomainLoading)
1344 {
1345 sandbox = AppDomain.CreateDomain(
1346 m_Scene.RegionInfo.RegionID.ToString(),
1347 evidence, appSetup);
1348 m_AppDomains[appDomain].AssemblyResolve +=
1349 new ResolveEventHandler(
1350 AssemblyResolver.OnAssemblyResolve);
1296 } 1351 }
1297 catch (Exception e) 1352 else
1298 { 1353 {
1299 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString()); 1354 sandbox = AppDomain.CurrentDomain;
1300 m_ScriptErrorMessage += "Exception creating app domain:\n";
1301 m_ScriptFailCount++;
1302 lock (m_AddingAssemblies)
1303 {
1304 m_AddingAssemblies[assembly]--;
1305 }
1306 return false;
1307 } 1355 }
1308 }
1309 m_DomainScripts[appDomain].Add(itemID);
1310
1311 instance = new ScriptInstance(this, part,
1312 item,
1313 startParam, postOnRez,
1314 m_MaxScriptQueue);
1315 1356
1316 if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource)) 1357 if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
1317 return false; 1358 return false;
1318 1359
1319// if (DebugLevel >= 1) 1360 m_AppDomains[appDomain] = sandbox;
1320// m_log.DebugFormat(
1321// "[XEngine] Loaded script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}",
1322// part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID,
1323// part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
1324 1361
1325 if (presence != null) 1362 m_DomainScripts[appDomain] = new List<UUID>();
1363 }
1364 catch (Exception e)
1326 { 1365 {
1327 ShowScriptSaveResponse(item.OwnerID, 1366 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
1328 assetID, "Compile successful", true); 1367 m_ScriptErrorMessage += "Exception creating app domain:\n";
1368 m_ScriptFailCount++;
1369 lock (m_AddingAssemblies)
1370 {
1371 m_AddingAssemblies[assembly]--;
1372 }
1373 return false;
1329 } 1374 }
1375 }
1376 m_DomainScripts[appDomain].Add(itemID);
1377
1378 instance = new ScriptInstance(this, part,
1379 item,
1380 startParam, postOnRez,
1381 m_MaxScriptQueue);
1330 1382
1331 instance.AppDomain = appDomain; 1383 instance.Load(m_AppDomains[appDomain], assembly, stateSource);
1332 instance.LineMap = linemap; 1384// m_log.DebugFormat(
1385// "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
1386// part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID,
1387// part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
1333 1388
1334 m_Scripts[itemID] = instance; 1389 if (presence != null)
1390 {
1391 ShowScriptSaveResponse(item.OwnerID,
1392 assetID, "Compile successful", true);
1335 } 1393 }
1336 }
1337 1394
1395 instance.AppDomain = appDomain;
1396 instance.LineMap = linemap;
1397 lockScriptsForWrite(true);
1398 m_Scripts[itemID] = instance;
1399 lockScriptsForWrite(false);
1400 }
1401 else
1402 {
1403 lockScriptsForRead(false);
1404 }
1338 lock (m_PrimObjects) 1405 lock (m_PrimObjects)
1339 { 1406 {
1340 if (!m_PrimObjects.ContainsKey(localID)) 1407 if (!m_PrimObjects.ContainsKey(localID))
@@ -1352,7 +1419,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1352 m_AddingAssemblies[assembly]--; 1419 m_AddingAssemblies[assembly]--;
1353 } 1420 }
1354 1421
1355 if (instance != null) 1422 if (instance!=null)
1356 instance.Init(); 1423 instance.Init();
1357 1424
1358 bool runIt; 1425 bool runIt;
@@ -1375,18 +1442,28 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1375 m_CompileDict.Remove(itemID); 1442 m_CompileDict.Remove(itemID);
1376 } 1443 }
1377 1444
1378 IScriptInstance instance = null; 1445 lockScriptsForRead(true);
1379 1446 // Do we even have it?
1380 lock (m_Scripts) 1447 if (!m_Scripts.ContainsKey(itemID))
1381 { 1448 {
1382 // Do we even have it? 1449 // Do we even have it?
1383 if (!m_Scripts.ContainsKey(itemID)) 1450 if (!m_Scripts.ContainsKey(itemID))
1384 return; 1451 return;
1385 1452
1386 instance = m_Scripts[itemID]; 1453 lockScriptsForRead(false);
1454 lockScriptsForWrite(true);
1387 m_Scripts.Remove(itemID); 1455 m_Scripts.Remove(itemID);
1456 lockScriptsForWrite(false);
1457
1458 return;
1388 } 1459 }
1460
1389 1461
1462 IScriptInstance instance=m_Scripts[itemID];
1463 lockScriptsForRead(false);
1464 lockScriptsForWrite(true);
1465 m_Scripts.Remove(itemID);
1466 lockScriptsForWrite(false);
1390 instance.ClearQueue(); 1467 instance.ClearQueue();
1391 1468
1392 instance.Stop(m_WaitForEventCompletionOnScriptStop); 1469 instance.Stop(m_WaitForEventCompletionOnScriptStop);
@@ -1423,8 +1500,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1423 1500
1424 ObjectRemoved handlerObjectRemoved = OnObjectRemoved; 1501 ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
1425 if (handlerObjectRemoved != null) 1502 if (handlerObjectRemoved != null)
1426 handlerObjectRemoved(instance.ObjectID); 1503 {
1504 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
1505 handlerObjectRemoved(part.UUID);
1506 }
1427 1507
1508 CleanAssemblies();
1509
1428 ScriptRemoved handlerScriptRemoved = OnScriptRemoved; 1510 ScriptRemoved handlerScriptRemoved = OnScriptRemoved;
1429 if (handlerScriptRemoved != null) 1511 if (handlerScriptRemoved != null)
1430 handlerScriptRemoved(itemID); 1512 handlerScriptRemoved(itemID);
@@ -1685,12 +1767,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1685 private IScriptInstance GetInstance(UUID itemID) 1767 private IScriptInstance GetInstance(UUID itemID)
1686 { 1768 {
1687 IScriptInstance instance; 1769 IScriptInstance instance;
1688 lock (m_Scripts) 1770 lockScriptsForRead(true);
1771 if (!m_Scripts.ContainsKey(itemID))
1689 { 1772 {
1690 if (!m_Scripts.ContainsKey(itemID)) 1773 lockScriptsForRead(false);
1691 return null; 1774 return null;
1692 instance = m_Scripts[itemID];
1693 } 1775 }
1776 instance = m_Scripts[itemID];
1777 lockScriptsForRead(false);
1694 return instance; 1778 return instance;
1695 } 1779 }
1696 1780
@@ -1714,6 +1798,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1714 return false; 1798 return false;
1715 } 1799 }
1716 1800
1801 [DebuggerNonUserCode]
1717 public void ApiResetScript(UUID itemID) 1802 public void ApiResetScript(UUID itemID)
1718 { 1803 {
1719 IScriptInstance instance = GetInstance(itemID); 1804 IScriptInstance instance = GetInstance(itemID);
@@ -1775,6 +1860,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1775 return UUID.Zero; 1860 return UUID.Zero;
1776 } 1861 }
1777 1862
1863 [DebuggerNonUserCode]
1778 public void SetState(UUID itemID, string newState) 1864 public void SetState(UUID itemID, string newState)
1779 { 1865 {
1780 IScriptInstance instance = GetInstance(itemID); 1866 IScriptInstance instance = GetInstance(itemID);
@@ -1797,11 +1883,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1797 1883
1798 List<IScriptInstance> instances = new List<IScriptInstance>(); 1884 List<IScriptInstance> instances = new List<IScriptInstance>();
1799 1885
1800 lock (m_Scripts) 1886 lockScriptsForRead(true);
1801 { 1887 foreach (IScriptInstance instance in m_Scripts.Values)
1802 foreach (IScriptInstance instance in m_Scripts.Values)
1803 instances.Add(instance); 1888 instances.Add(instance);
1804 } 1889 lockScriptsForRead(false);
1805 1890
1806 foreach (IScriptInstance i in instances) 1891 foreach (IScriptInstance i in instances)
1807 { 1892 {
generated by cgit v1.1 at 2024-09-12 22:52:20 +0000