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.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs118
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3159
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs109
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs9
-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.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
-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.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs36
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Helpers.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs85
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs361
19 files changed, 2934 insertions, 1200 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 14edde4..57794f9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -250,6 +250,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
250 250
251 } 251 }
252 252
253 public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
254 {
255 // Remove a specific script
256
257 // Remove dataserver events
258 m_Dataserver[engine].RemoveEvents(localID, itemID);
259
260 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
261 if (comms != null)
262 comms.DeleteListener(itemID);
263
264 IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
265 xmlrpc.DeleteChannels(itemID);
266 xmlrpc.CancelSRDRequests(itemID);
267
268 // Remove Sensors
269 m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
270
271 }
272
253 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) 273 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
254 { 274 {
255 List<Object> data = new List<Object>(); 275 List<Object> data = new List<Object>();
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..489c1c6
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -0,0 +1,118 @@
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.Reflection;
30using System.Collections;
31using System.Collections.Generic;
32using System.Runtime.Remoting.Lifetime;
33using OpenMetaverse;
34using Nini.Config;
35using OpenSim;
36using OpenSim.Framework;
37using OpenSim.Region.CoreModules.World.LightShare;
38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.ScriptEngine.Shared;
41using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
42using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
43using OpenSim.Region.ScriptEngine.Interfaces;
44using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
45using OpenSim.Services.Interfaces;
46
47using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
48using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
49using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
50using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
51using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
52using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
53using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
54
55namespace OpenSim.Region.ScriptEngine.Shared.Api
56{
57 [Serializable]
58 public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi
59 {
60 internal IScriptEngine m_ScriptEngine;
61 internal SceneObjectPart m_host;
62 internal uint m_localID;
63 internal UUID m_itemID;
64 internal bool m_CMFunctionsEnabled = false;
65
66 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
67 {
68 m_ScriptEngine = ScriptEngine;
69 m_host = host;
70 m_localID = localID;
71 m_itemID = itemID;
72
73 if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
74 m_CMFunctionsEnabled = true;
75 }
76
77 public override Object InitializeLifetimeService()
78 {
79 ILease lease = (ILease)base.InitializeLifetimeService();
80
81 if (lease.CurrentState == LeaseState.Initial)
82 {
83 lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
84 // lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
85 // lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
86 }
87 return lease;
88 }
89
90 public Scene World
91 {
92 get { return m_ScriptEngine.World; }
93 }
94
95 public string cmDetectedCountry(int number)
96 {
97 m_host.AddScriptLPS(1);
98 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number);
99 if (detectedParams == null)
100 return String.Empty;
101 return detectedParams.Country;
102 }
103
104 public string cmGetAgentCountry(LSL_Key key)
105 {
106 if (!World.Permissions.IsGod(m_host.OwnerID))
107 return String.Empty;
108
109 UUID uuid;
110
111 if (!UUID.TryParse(key, out uuid))
112 return String.Empty;
113
114 UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
115 return account.UserCountry;
116 }
117 }
118}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0003515..4366626 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -28,10 +28,12 @@
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.Physics.Manager; 51using OpenSim.Region.Physics.Manager;
49using OpenSim.Region.ScriptEngine.Shared; 52using OpenSim.Region.ScriptEngine.Shared;
@@ -65,6 +68,7 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
65using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; 68using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
66using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; 69using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
67using System.Reflection; 70using System.Reflection;
71using Timer = System.Timers.Timer;
68 72
69namespace OpenSim.Region.ScriptEngine.Shared.Api 73namespace OpenSim.Region.ScriptEngine.Shared.Api
70{ 74{
@@ -99,16 +103,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
99 protected int m_notecardLineReadCharsMax = 255; 103 protected int m_notecardLineReadCharsMax = 255;
100 protected int m_scriptConsoleChannel = 0; 104 protected int m_scriptConsoleChannel = 0;
101 protected bool m_scriptConsoleChannelEnabled = false; 105 protected bool m_scriptConsoleChannelEnabled = false;
106 protected bool m_debuggerSafe = false;
102 protected IUrlModule m_UrlModule = null; 107 protected IUrlModule m_UrlModule = null;
103 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = 108 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
104 new Dictionary<UUID, UserInfoCacheEntry>(); 109 new Dictionary<UUID, UserInfoCacheEntry>();
105 110
111 protected Timer m_ShoutSayTimer;
112 protected int m_SayShoutCount = 0;
113
106 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) 114 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
107 { 115 {
116 m_ShoutSayTimer = new Timer(1000);
117 m_ShoutSayTimer.Elapsed += SayShoutTimerElapsed;
118 m_ShoutSayTimer.AutoReset = true;
119 m_ShoutSayTimer.Start();
120
108 m_ScriptEngine = ScriptEngine; 121 m_ScriptEngine = ScriptEngine;
109 m_host = host; 122 m_host = host;
110 m_localID = localID; 123 m_localID = localID;
111 m_itemID = itemID; 124 m_itemID = itemID;
125 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
112 126
113 m_ScriptDelayFactor = 127 m_ScriptDelayFactor =
114 m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); 128 m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
@@ -156,6 +170,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
156 get { return m_ScriptEngine.World; } 170 get { return m_ScriptEngine.World; }
157 } 171 }
158 172
173 [DebuggerNonUserCode]
159 public void state(string newState) 174 public void state(string newState)
160 { 175 {
161 m_ScriptEngine.SetState(m_itemID, newState); 176 m_ScriptEngine.SetState(m_itemID, newState);
@@ -165,6 +180,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
165 /// Reset the named script. The script must be present 180 /// Reset the named script. The script must be present
166 /// in the same prim. 181 /// in the same prim.
167 /// </summary> 182 /// </summary>
183 [DebuggerNonUserCode]
168 public void llResetScript() 184 public void llResetScript()
169 { 185 {
170 m_host.AddScriptLPS(1); 186 m_host.AddScriptLPS(1);
@@ -221,9 +237,62 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
221 } 237 }
222 } 238 }
223 239
240 public List<ScenePresence> GetLinkAvatars(int linkType)
241 {
242 List<ScenePresence> ret = new List<ScenePresence>();
243 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
244 return ret;
245
246 List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars();
247
248 switch (linkType)
249 {
250 case ScriptBaseClass.LINK_SET:
251 return avs;
252
253 case ScriptBaseClass.LINK_ROOT:
254 return ret;
255
256 case ScriptBaseClass.LINK_ALL_OTHERS:
257 return avs;
258
259 case ScriptBaseClass.LINK_ALL_CHILDREN:
260 return avs;
261
262 case ScriptBaseClass.LINK_THIS:
263 return ret;
264
265 default:
266 if (linkType < 0)
267 return ret;
268
269 int partCount = m_host.ParentGroup.GetPartCount();
270
271 if (linkType <= partCount)
272 {
273 return ret;
274 }
275 else
276 {
277 linkType = linkType - partCount;
278 if (linkType > avs.Count)
279 {
280 return ret;
281 }
282 else
283 {
284 ret.Add(avs[linkType-1]);
285 return ret;
286 }
287 }
288 }
289 }
290
224 public List<SceneObjectPart> GetLinkParts(int linkType) 291 public List<SceneObjectPart> GetLinkParts(int linkType)
225 { 292 {
226 List<SceneObjectPart> ret = new List<SceneObjectPart>(); 293 List<SceneObjectPart> ret = new List<SceneObjectPart>();
294 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
295 return ret;
227 ret.Add(m_host); 296 ret.Add(m_host);
228 297
229 switch (linkType) 298 switch (linkType)
@@ -270,40 +339,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
270 protected UUID InventorySelf() 339 protected UUID InventorySelf()
271 { 340 {
272 UUID invItemID = new UUID(); 341 UUID invItemID = new UUID();
273 342 bool unlock = false;
274 lock (m_host.TaskInventory) 343 if (!m_host.TaskInventory.IsReadLockedByMe())
275 { 344 {
276 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 345 m_host.TaskInventory.LockItemsForRead(true);
346 unlock = true;
347 }
348 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
349 {
350 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
277 { 351 {
278 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) 352 invItemID = inv.Key;
279 { 353 break;
280 invItemID = inv.Key;
281 break;
282 }
283 } 354 }
284 } 355 }
285 356 if (unlock)
357 {
358 m_host.TaskInventory.LockItemsForRead(false);
359 }
286 return invItemID; 360 return invItemID;
287 } 361 }
288 362
289 protected UUID InventoryKey(string name, int type) 363 protected UUID InventoryKey(string name, int type)
290 { 364 {
291 m_host.AddScriptLPS(1); 365 m_host.AddScriptLPS(1);
292 366 m_host.TaskInventory.LockItemsForRead(true);
293 lock (m_host.TaskInventory) 367
368 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
294 { 369 {
295 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 370 if (inv.Value.Name == name)
296 { 371 {
297 if (inv.Value.Name == name) 372 m_host.TaskInventory.LockItemsForRead(false);
373
374 if (inv.Value.Type != type)
298 { 375 {
299 if (inv.Value.Type != type) 376 return UUID.Zero;
300 return UUID.Zero;
301
302 return inv.Value.AssetID;
303 } 377 }
378
379 return inv.Value.AssetID;
304 } 380 }
305 } 381 }
306 382
383 m_host.TaskInventory.LockItemsForRead(false);
307 return UUID.Zero; 384 return UUID.Zero;
308 } 385 }
309 386
@@ -311,17 +388,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
311 { 388 {
312 m_host.AddScriptLPS(1); 389 m_host.AddScriptLPS(1);
313 390
314 lock (m_host.TaskInventory) 391
392 m_host.TaskInventory.LockItemsForRead(true);
393
394 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
315 { 395 {
316 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 396 if (inv.Value.Name == name)
317 { 397 {
318 if (inv.Value.Name == name) 398 m_host.TaskInventory.LockItemsForRead(false);
319 { 399 return inv.Value.AssetID;
320 return inv.Value.AssetID;
321 }
322 } 400 }
323 } 401 }
324 402
403 m_host.TaskInventory.LockItemsForRead(false);
404
405
325 return UUID.Zero; 406 return UUID.Zero;
326 } 407 }
327 408
@@ -463,31 +544,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
463 544
464 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke 545 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
465 546
466 /// <summary> 547 // Utility function for llRot2Euler
467 /// Convert an LSL rotation to a Euler vector. 548
468 /// </summary> 549 // normalize an angle between -PI and PI (-180 to +180 degrees)
469 /// <remarks> 550 protected double NormalizeAngle(double angle)
470 /// Using algorithm based off http://www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToEuler/quat_2_euler_paper_ver2-1.pdf
471 /// to avoid issues with singularity and rounding with Y rotation of +/- PI/2
472 /// </remarks>
473 /// <param name="r"></param>
474 /// <returns></returns>
475 public LSL_Vector llRot2Euler(LSL_Rotation r)
476 { 551 {
477 m_host.AddScriptLPS(1); 552 if (angle > -Math.PI && angle < Math.PI)
553 return angle;
478 554
479 LSL_Vector v = new LSL_Vector(0.0, 0.0, 1.0) * r; // Z axis unit vector unaffected by Z rotation component of r. 555 int numPis = (int)(Math.PI / angle);
480 double m = LSL_Vector.Mag(v); // Just in case v isn't normalized, need magnitude for Asin() operation later. 556 double remainder = angle - Math.PI * numPis;
481 if (m == 0.0) return new LSL_Vector(); 557 if (numPis % 2 == 1)
482 double x = Math.Atan2(-v.y, v.z); 558 return Math.PI - angle;
483 double sin = v.x / m; 559 return remainder;
484 if (sin < -0.999999 || sin > 0.999999) x = 0.0; // Force X rotation to 0 at the singularities. 560 }
485 double y = Math.Asin(sin);
486 // Rotate X axis unit vector by r and unwind the X and Y rotations leaving only the Z rotation
487 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)));
488 double z = Math.Atan2(v.y, v.x);
489 561
490 return new LSL_Vector(x, y, z); 562 public LSL_Vector llRot2Euler(LSL_Rotation q1)
563 {
564 m_host.AddScriptLPS(1);
565 LSL_Vector eul = new LSL_Vector();
566
567 double sqw = q1.s*q1.s;
568 double sqx = q1.x*q1.x;
569 double sqy = q1.z*q1.z;
570 double sqz = q1.y*q1.y;
571 double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
572 double test = q1.x*q1.z + q1.y*q1.s;
573 if (test > 0.4999*unit) { // singularity at north pole
574 eul.z = 2 * Math.Atan2(q1.x,q1.s);
575 eul.y = Math.PI/2;
576 eul.x = 0;
577 return eul;
578 }
579 if (test < -0.4999*unit) { // singularity at south pole
580 eul.z = -2 * Math.Atan2(q1.x,q1.s);
581 eul.y = -Math.PI/2;
582 eul.x = 0;
583 return eul;
584 }
585 eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw);
586 eul.y = Math.Asin(2*test/unit);
587 eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw);
588 return eul;
491 } 589 }
492 590
493 /* From wiki: 591 /* From wiki:
@@ -689,77 +787,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
689 { 787 {
690 //A and B should both be normalized 788 //A and B should both be normalized
691 m_host.AddScriptLPS(1); 789 m_host.AddScriptLPS(1);
692 LSL_Rotation rotBetween; 790 /* This method is more accurate than the SL one, and thus causes problems
693 // Check for zero vectors. If either is zero, return zero rotation. Otherwise, 791 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
694 // continue calculation. 792
695 if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f)) 793 double dotProduct = LSL_Vector.Dot(a, b);
794 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
795 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
796 double angle = Math.Acos(dotProduct / magProduct);
797 LSL_Vector axis = LSL_Vector.Norm(crossProduct);
798 double s = Math.Sin(angle / 2);
799
800 double x = axis.x * s;
801 double y = axis.y * s;
802 double z = axis.z * s;
803 double w = Math.Cos(angle / 2);
804
805 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
806 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
807
808 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
809 */
810
811 // This method mimics the 180 errors found in SL
812 // See www.euclideanspace.com... angleBetween
813 LSL_Vector vec_a = a;
814 LSL_Vector vec_b = b;
815
816 // Eliminate zero length
817 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
818 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
819 if (vec_a_mag < 0.00001 ||
820 vec_b_mag < 0.00001)
696 { 821 {
697 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 822 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
698 } 823 }
699 else 824
825 // Normalize
826 vec_a = llVecNorm(vec_a);
827 vec_b = llVecNorm(vec_b);
828
829 // Calculate axis and rotation angle
830 LSL_Vector axis = vec_a % vec_b;
831 LSL_Float cos_theta = vec_a * vec_b;
832
833 // Check if parallel
834 if (cos_theta > 0.99999)
700 { 835 {
701 a = LSL_Vector.Norm(a); 836 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
702 b = LSL_Vector.Norm(b); 837 }
703 double dotProduct = LSL_Vector.Dot(a, b); 838
704 // There are two degenerate cases possible. These are for vectors 180 or 839 // Check if anti-parallel
705 // 0 degrees apart. These have to be detected and handled individually. 840 else if (cos_theta < -0.99999)
706 // 841 {
707 // Check for vectors 180 degrees apart. 842 LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
708 // A dot product of -1 would mean the angle between vectors is 180 degrees. 843 if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
709 if (dotProduct < -0.9999999f) 844 return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
710 { 845 }
711 // First assume X axis is orthogonal to the vectors. 846 else // other rotation
712 LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f); 847 {
713 orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a)); 848 LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
714 // Check for near zero vector. A very small non-zero number here will create 849 axis = llVecNorm(axis);
715 // a rotation in an undesired direction. 850 double x, y, z, s, t;
716 if (LSL_Vector.Mag(orthoVector) > 0.0001) 851 s = Math.Cos(theta);
717 { 852 t = Math.Sin(theta);
718 rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f); 853 x = axis.x * t;
719 } 854 y = axis.y * t;
720 // If the magnitude of the vector was near zero, then assume the X axis is not 855 z = axis.z * t;
721 // orthogonal and use the Z axis instead. 856 return new LSL_Rotation(x,y,z,s);
722 else
723 {
724 // Set 180 z rotation.
725 rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f);
726 }
727 }
728 // Check for parallel vectors.
729 // A dot product of 1 would mean the angle between vectors is 0 degrees.
730 else if (dotProduct > 0.9999999f)
731 {
732 // Set zero rotation.
733 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
734 }
735 else
736 {
737 // All special checks have been performed so get the axis of rotation.
738 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
739 // Quarternion s value is the length of the unit vector + dot product.
740 double qs = 1.0 + dotProduct;
741 rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs);
742 // Normalize the rotation.
743 double mag = LSL_Rotation.Mag(rotBetween);
744 // We shouldn't have to worry about a divide by zero here. The qs value will be
745 // non-zero because we already know if we're here, then the dotProduct is not -1 so
746 // qs will not be zero. Also, we've already handled the input vectors being zero so the
747 // crossProduct vector should also not be zero.
748 rotBetween.x = rotBetween.x / mag;
749 rotBetween.y = rotBetween.y / mag;
750 rotBetween.z = rotBetween.z / mag;
751 rotBetween.s = rotBetween.s / mag;
752 // Check for undefined values and set zero rotation if any found. This code might not actually be required
753 // any longer since zero vectors are checked for at the top.
754 if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s))
755 {
756 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
757 }
758 }
759 } 857 }
760 return rotBetween;
761 } 858 }
762 859
763 public void llWhisper(int channelID, string text) 860 public void llWhisper(int channelID, string text)
764 { 861 {
765 m_host.AddScriptLPS(1); 862 m_host.AddScriptLPS(1);
@@ -779,6 +876,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
779 { 876 {
780 m_host.AddScriptLPS(1); 877 m_host.AddScriptLPS(1);
781 878
879 if (channelID == 0)
880 m_SayShoutCount++;
881
882 if (m_SayShoutCount >= 11)
883 ScriptSleep(2000);
884
782 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel)) 885 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel))
783 { 886 {
784 Console.WriteLine(text); 887 Console.WriteLine(text);
@@ -801,6 +904,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
801 { 904 {
802 m_host.AddScriptLPS(1); 905 m_host.AddScriptLPS(1);
803 906
907 if (channelID == 0)
908 m_SayShoutCount++;
909
910 if (m_SayShoutCount >= 11)
911 ScriptSleep(2000);
912
804 if (text.Length > 1023) 913 if (text.Length > 1023)
805 text = text.Substring(0, 1023); 914 text = text.Substring(0, 1023);
806 915
@@ -1101,10 +1210,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1101 return detectedParams.TouchUV; 1210 return detectedParams.TouchUV;
1102 } 1211 }
1103 1212
1213 [DebuggerNonUserCode]
1104 public virtual void llDie() 1214 public virtual void llDie()
1105 { 1215 {
1106 m_host.AddScriptLPS(1); 1216 m_host.AddScriptLPS(1);
1107 throw new SelfDeleteException(); 1217 if (!m_host.ParentGroup.IsAttachment) throw new SelfDeleteException();
1108 } 1218 }
1109 1219
1110 public LSL_Float llGround(LSL_Vector offset) 1220 public LSL_Float llGround(LSL_Vector offset)
@@ -1177,6 +1287,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1177 1287
1178 public void llSetStatus(int status, int value) 1288 public void llSetStatus(int status, int value)
1179 { 1289 {
1290 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
1291 return;
1180 m_host.AddScriptLPS(1); 1292 m_host.AddScriptLPS(1);
1181 1293
1182 int statusrotationaxis = 0; 1294 int statusrotationaxis = 0;
@@ -1406,6 +1518,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1406 { 1518 {
1407 m_host.AddScriptLPS(1); 1519 m_host.AddScriptLPS(1);
1408 1520
1521 SetColor(m_host, color, face);
1522 }
1523
1524 protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
1525 {
1526 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1527 return;
1528
1529 Primitive.TextureEntry tex = part.Shape.Textures;
1530 Color4 texcolor;
1531 if (face >= 0 && face < GetNumberOfSides(part))
1532 {
1533 texcolor = tex.CreateFace((uint)face).RGBA;
1534 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1535 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1536 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1537 tex.FaceTextures[face].RGBA = texcolor;
1538 part.UpdateTextureEntry(tex.GetBytes());
1539 return;
1540 }
1541 else if (face == ScriptBaseClass.ALL_SIDES)
1542 {
1543 for (uint i = 0; i < GetNumberOfSides(part); i++)
1544 {
1545 if (tex.FaceTextures[i] != null)
1546 {
1547 texcolor = tex.FaceTextures[i].RGBA;
1548 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1549 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1550 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1551 tex.FaceTextures[i].RGBA = texcolor;
1552 }
1553 texcolor = tex.DefaultTexture.RGBA;
1554 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1555 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1556 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1557 tex.DefaultTexture.RGBA = texcolor;
1558 }
1559 part.UpdateTextureEntry(tex.GetBytes());
1560 return;
1561 }
1562
1409 if (face == ScriptBaseClass.ALL_SIDES) 1563 if (face == ScriptBaseClass.ALL_SIDES)
1410 face = SceneObjectPart.ALL_SIDES; 1564 face = SceneObjectPart.ALL_SIDES;
1411 1565
@@ -1414,6 +1568,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1414 1568
1415 public void SetTexGen(SceneObjectPart part, int face,int style) 1569 public void SetTexGen(SceneObjectPart part, int face,int style)
1416 { 1570 {
1571 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1572 return;
1573
1417 Primitive.TextureEntry tex = part.Shape.Textures; 1574 Primitive.TextureEntry tex = part.Shape.Textures;
1418 MappingType textype; 1575 MappingType textype;
1419 textype = MappingType.Default; 1576 textype = MappingType.Default;
@@ -1444,6 +1601,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1444 1601
1445 public void SetGlow(SceneObjectPart part, int face, float glow) 1602 public void SetGlow(SceneObjectPart part, int face, float glow)
1446 { 1603 {
1604 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1605 return;
1606
1447 Primitive.TextureEntry tex = part.Shape.Textures; 1607 Primitive.TextureEntry tex = part.Shape.Textures;
1448 if (face >= 0 && face < GetNumberOfSides(part)) 1608 if (face >= 0 && face < GetNumberOfSides(part))
1449 { 1609 {
@@ -1469,6 +1629,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1469 1629
1470 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1630 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1471 { 1631 {
1632 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1633 return;
1472 1634
1473 Shininess sval = new Shininess(); 1635 Shininess sval = new Shininess();
1474 1636
@@ -1519,6 +1681,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1519 1681
1520 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1682 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1521 { 1683 {
1684 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1685 return;
1686
1522 Primitive.TextureEntry tex = part.Shape.Textures; 1687 Primitive.TextureEntry tex = part.Shape.Textures;
1523 if (face >= 0 && face < GetNumberOfSides(part)) 1688 if (face >= 0 && face < GetNumberOfSides(part))
1524 { 1689 {
@@ -1579,13 +1744,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1579 m_host.AddScriptLPS(1); 1744 m_host.AddScriptLPS(1);
1580 1745
1581 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1746 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1582 1747 if (parts.Count > 0)
1583 foreach (SceneObjectPart part in parts) 1748 {
1584 SetAlpha(part, alpha, face); 1749 try
1750 {
1751 parts[0].ParentGroup.areUpdatesSuspended = true;
1752 foreach (SceneObjectPart part in parts)
1753 SetAlpha(part, alpha, face);
1754 }
1755 finally
1756 {
1757 parts[0].ParentGroup.areUpdatesSuspended = false;
1758 }
1759 }
1585 } 1760 }
1586 1761
1587 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1762 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1588 { 1763 {
1764 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1765 return;
1766
1589 Primitive.TextureEntry tex = part.Shape.Textures; 1767 Primitive.TextureEntry tex = part.Shape.Textures;
1590 Color4 texcolor; 1768 Color4 texcolor;
1591 if (face >= 0 && face < GetNumberOfSides(part)) 1769 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1638,7 +1816,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1638 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1816 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1639 float wind, float tension, LSL_Vector Force) 1817 float wind, float tension, LSL_Vector Force)
1640 { 1818 {
1641 if (part == null) 1819 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1642 return; 1820 return;
1643 1821
1644 if (flexi) 1822 if (flexi)
@@ -1672,7 +1850,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1672 /// <param name="falloff"></param> 1850 /// <param name="falloff"></param>
1673 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 1851 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1674 { 1852 {
1675 if (part == null) 1853 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1676 return; 1854 return;
1677 1855
1678 if (light) 1856 if (light)
@@ -1749,15 +1927,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1749 m_host.AddScriptLPS(1); 1927 m_host.AddScriptLPS(1);
1750 1928
1751 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1929 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1752 1930 if (parts.Count > 0)
1753 foreach (SceneObjectPart part in parts) 1931 {
1754 SetTexture(part, texture, face); 1932 try
1755 1933 {
1934 parts[0].ParentGroup.areUpdatesSuspended = true;
1935 foreach (SceneObjectPart part in parts)
1936 SetTexture(part, texture, face);
1937 }
1938 finally
1939 {
1940 parts[0].ParentGroup.areUpdatesSuspended = false;
1941 }
1942 }
1756 ScriptSleep(200); 1943 ScriptSleep(200);
1757 } 1944 }
1758 1945
1759 protected void SetTexture(SceneObjectPart part, string texture, int face) 1946 protected void SetTexture(SceneObjectPart part, string texture, int face)
1760 { 1947 {
1948 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1949 return;
1950
1761 UUID textureID = new UUID(); 1951 UUID textureID = new UUID();
1762 1952
1763 textureID = InventoryKey(texture, (int)AssetType.Texture); 1953 textureID = InventoryKey(texture, (int)AssetType.Texture);
@@ -1802,6 +1992,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1802 1992
1803 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 1993 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1804 { 1994 {
1995 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1996 return;
1997
1805 Primitive.TextureEntry tex = part.Shape.Textures; 1998 Primitive.TextureEntry tex = part.Shape.Textures;
1806 if (face >= 0 && face < GetNumberOfSides(part)) 1999 if (face >= 0 && face < GetNumberOfSides(part))
1807 { 2000 {
@@ -1838,6 +2031,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1838 2031
1839 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 2032 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1840 { 2033 {
2034 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2035 return;
2036
1841 Primitive.TextureEntry tex = part.Shape.Textures; 2037 Primitive.TextureEntry tex = part.Shape.Textures;
1842 if (face >= 0 && face < GetNumberOfSides(part)) 2038 if (face >= 0 && face < GetNumberOfSides(part))
1843 { 2039 {
@@ -1874,6 +2070,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1874 2070
1875 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 2071 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
1876 { 2072 {
2073 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2074 return;
2075
1877 Primitive.TextureEntry tex = part.Shape.Textures; 2076 Primitive.TextureEntry tex = part.Shape.Textures;
1878 if (face >= 0 && face < GetNumberOfSides(part)) 2077 if (face >= 0 && face < GetNumberOfSides(part))
1879 { 2078 {
@@ -1978,26 +2177,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1978 return real_vec; 2177 return real_vec;
1979 } 2178 }
1980 2179
2180 public LSL_Integer llSetRegionPos(LSL_Vector pos)
2181 {
2182 return new LSL_Integer(SetRegionPos(m_host, pos));
2183 }
2184
2185 protected int SetRegionPos(SceneObjectPart part, LSL_Vector targetPos)
2186 {
2187 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2188 return 0;
2189
2190 SceneObjectGroup grp = part.ParentGroup;
2191
2192 if (grp.IsAttachment)
2193 return 0;
2194
2195 if (grp.RootPart.PhysActor != null && grp.RootPart.PhysActor.IsPhysical)
2196 return 0;
2197
2198 if (targetPos.x < -10.0f || targetPos.x >= (float)Constants.RegionSize || targetPos.y < -10.0f || targetPos.y >= (float)Constants.RegionSize || targetPos.z < 0 || targetPos.z >= 4096.0f)
2199 return 0;
2200
2201 float constrainedX = (float)targetPos.x;
2202 float constrainedY = (float)targetPos.y;
2203
2204 if (constrainedX < 0.0f)
2205 constrainedX = 0.0f;
2206 if (constrainedY < 0.0f)
2207 constrainedY = 0.0f;
2208 if (constrainedX >= (float)Constants.RegionSize)
2209 constrainedX = (float)Constants.RegionSize - 0.1f;
2210 if (constrainedY >= (float)Constants.RegionSize)
2211 constrainedY = (float)Constants.RegionSize -0.1f;
2212
2213 float ground = World.GetGroundHeight(constrainedX, constrainedY);
2214
2215 if (targetPos.z < ground)
2216 targetPos.z = ground;
2217
2218 Vector3 dest = new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z);
2219
2220 if (!World.Permissions.CanObjectEntry(grp.UUID, false, dest))
2221 return 0;
2222
2223 grp.UpdateGroupPosition(dest);
2224
2225 return 1;
2226 }
2227
1981 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos) 2228 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos)
1982 { 2229 {
1983 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2230 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2231 return;
2232
1984 LSL_Vector currentPos = GetPartLocalPos(part); 2233 LSL_Vector currentPos = GetPartLocalPos(part);
2234 LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos);
1985 2235
1986 float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y);
1987 bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true);
1988 2236
1989 if (part.ParentGroup.RootPart == part) 2237 if (part.ParentGroup.RootPart == part)
1990 { 2238 {
1991 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
1992 targetPos.z = ground;
1993 SceneObjectGroup parent = part.ParentGroup; 2239 SceneObjectGroup parent = part.ParentGroup;
1994 LSL_Vector real_vec = SetPosAdjust(currentPos, targetPos); 2240 Vector3 dest = new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z);
1995 parent.UpdateGroupPosition(new Vector3((float)real_vec.x, (float)real_vec.y, (float)real_vec.z)); 2241 if (!World.Permissions.CanObjectEntry(parent.UUID, false, dest))
2242 return;
2243 Util.FireAndForget(delegate(object x) {
2244 parent.UpdateGroupPosition(dest);
2245 });
1996 } 2246 }
1997 else 2247 else
1998 { 2248 {
1999 LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos); 2249 part.OffsetPosition = new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z);
2000 part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z);
2001 SceneObjectGroup parent = part.ParentGroup; 2250 SceneObjectGroup parent = part.ParentGroup;
2002 parent.HasGroupChanged = true; 2251 parent.HasGroupChanged = true;
2003 parent.ScheduleGroupForTerseUpdate(); 2252 parent.ScheduleGroupForTerseUpdate();
@@ -2028,11 +2277,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2028 } 2277 }
2029 else 2278 else
2030 { 2279 {
2031 if (m_host.IsRoot) 2280 if (part.IsRoot)
2032 { 2281 {
2033 return new LSL_Vector(m_host.AttachedPos.X, 2282 return new LSL_Vector(part.AttachedPos.X,
2034 m_host.AttachedPos.Y, 2283 part.AttachedPos.Y,
2035 m_host.AttachedPos.Z); 2284 part.AttachedPos.Z);
2036 } 2285 }
2037 else 2286 else
2038 { 2287 {
@@ -2048,9 +2297,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2048 m_host.AddScriptLPS(1); 2297 m_host.AddScriptLPS(1);
2049 2298
2050 // try to let this work as in SL... 2299 // try to let this work as in SL...
2051 if (m_host.ParentID == 0) 2300 if (m_host.LinkNum < 2)
2052 { 2301 {
2053 // special case: If we are root, rotate complete SOG to new rotation 2302 // Special case: If we are root, rotate complete SOG to new
2303 // rotation.
2304 // We are root if the link number is 0 (single prim) or 1
2305 // (root prim). ParentID may be nonzero in attachments and
2306 // using it would cause attachments and HUDs to rotate
2307 // to the wrong positions.
2054 SetRot(m_host, Rot2Quaternion(rot)); 2308 SetRot(m_host, Rot2Quaternion(rot));
2055 } 2309 }
2056 else 2310 else
@@ -2075,6 +2329,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2075 2329
2076 protected void SetRot(SceneObjectPart part, Quaternion rot) 2330 protected void SetRot(SceneObjectPart part, Quaternion rot)
2077 { 2331 {
2332 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2333 return;
2334
2078 part.UpdateRotation(rot); 2335 part.UpdateRotation(rot);
2079 // Update rotation does not move the object in the physics scene if it's a linkset. 2336 // Update rotation does not move the object in the physics scene if it's a linkset.
2080 2337
@@ -2227,13 +2484,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2227 public void llApplyRotationalImpulse(LSL_Vector force, int local) 2484 public void llApplyRotationalImpulse(LSL_Vector force, int local)
2228 { 2485 {
2229 m_host.AddScriptLPS(1); 2486 m_host.AddScriptLPS(1);
2230 m_host.ApplyAngularImpulse(new Vector3((float)force.x, (float)force.y, (float)force.z), local != 0); 2487 m_host.ParentGroup.RootPart.ApplyAngularImpulse(new Vector3((float)force.x, (float)force.y, (float)force.z), local != 0);
2231 } 2488 }
2232 2489
2233 public void llSetTorque(LSL_Vector torque, int local) 2490 public void llSetTorque(LSL_Vector torque, int local)
2234 { 2491 {
2235 m_host.AddScriptLPS(1); 2492 m_host.AddScriptLPS(1);
2236 m_host.SetAngularImpulse(new Vector3((float)torque.x, (float)torque.y, (float)torque.z), local != 0); 2493 m_host.ParentGroup.RootPart.SetAngularImpulse(new Vector3((float)torque.x, (float)torque.y, (float)torque.z), local != 0);
2237 } 2494 }
2238 2495
2239 public LSL_Vector llGetTorque() 2496 public LSL_Vector llGetTorque()
@@ -2698,12 +2955,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2698 2955
2699 m_host.AddScriptLPS(1); 2956 m_host.AddScriptLPS(1);
2700 2957
2958 m_host.TaskInventory.LockItemsForRead(true);
2701 TaskInventoryItem item = m_host.TaskInventory[invItemID]; 2959 TaskInventoryItem item = m_host.TaskInventory[invItemID];
2702 2960 m_host.TaskInventory.LockItemsForRead(false);
2703 lock (m_host.TaskInventory)
2704 {
2705 item = m_host.TaskInventory[invItemID];
2706 }
2707 2961
2708 if (item.PermsGranter == UUID.Zero) 2962 if (item.PermsGranter == UUID.Zero)
2709 return 0; 2963 return 0;
@@ -2771,64 +3025,69 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2771 { 3025 {
2772 m_host.AddScriptLPS(1); 3026 m_host.AddScriptLPS(1);
2773 3027
2774 if (Double.IsNaN(rot.x) || Double.IsNaN(rot.y) || Double.IsNaN(rot.z) || Double.IsNaN(rot.s)) 3028 Util.FireAndForget(delegate (object x)
2775 return; 3029 {
2776 float dist = (float)llVecDist(llGetPos(), pos); 3030 if (Double.IsNaN(rot.x) || Double.IsNaN(rot.y) || Double.IsNaN(rot.z) || Double.IsNaN(rot.s))
3031 return;
3032 float dist = (float)llVecDist(llGetPos(), pos);
2777 3033
2778 if (dist > m_ScriptDistanceFactor * 10.0f) 3034 if (dist > m_ScriptDistanceFactor * 10.0f)
2779 return; 3035 return;
2780 3036
2781 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 3037 //Clone is thread-safe
3038 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
2782 3039
2783 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory) 3040 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
2784 {
2785 if (inv.Value.Name == inventory)
2786 { 3041 {
2787 // make sure we're an object. 3042 if (inv.Value.Name == inventory)
2788 if (inv.Value.InvType != (int)InventoryType.Object)
2789 { 3043 {
2790 llSay(0, "Unable to create requested object. Object is missing from database."); 3044 // make sure we're an object.
2791 return; 3045 if (inv.Value.InvType != (int)InventoryType.Object)
2792 } 3046 {
3047 llSay(0, "Unable to create requested object. Object is missing from database.");
3048 return;
3049 }
2793 3050
2794 Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z); 3051 Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
2795 Vector3 llvel = new Vector3((float)vel.x, (float)vel.y, (float)vel.z); 3052 Vector3 llvel = new Vector3((float)vel.x, (float)vel.y, (float)vel.z);
2796 3053
2797 // need the magnitude later 3054 // need the magnitude later
2798 float velmag = (float)Util.GetMagnitude(llvel); 3055 // float velmag = (float)Util.GetMagnitude(llvel);
2799 3056
2800 SceneObjectGroup new_group = World.RezObject(m_host, inv.Value, llpos, Rot2Quaternion(rot), llvel, param); 3057 SceneObjectGroup new_group = World.RezObject(m_host, inv.Value, llpos, Rot2Quaternion(rot), llvel, param);
2801 3058
2802 // If either of these are null, then there was an unknown error. 3059 // If either of these are null, then there was an unknown error.
2803 if (new_group == null) 3060 if (new_group == null)
2804 continue; 3061 continue;
2805 3062
2806 // objects rezzed with this method are die_at_edge by default. 3063 // objects rezzed with this method are die_at_edge by default.
2807 new_group.RootPart.SetDieAtEdge(true); 3064 new_group.RootPart.SetDieAtEdge(true);
2808 3065
2809 new_group.ResumeScripts(); 3066 new_group.ResumeScripts();
2810 3067
2811 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams( 3068 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
2812 "object_rez", new Object[] { 3069 "object_rez", new Object[] {
2813 new LSL_String( 3070 new LSL_String(
2814 new_group.RootPart.UUID.ToString()) }, 3071 new_group.RootPart.UUID.ToString()) },
2815 new DetectParams[0])); 3072 new DetectParams[0]));
2816 3073
2817 float groupmass = new_group.GetMass(); 3074 float groupmass = new_group.GetMass();
2818 3075
2819 if (new_group.RootPart.PhysActor != null && new_group.RootPart.PhysActor.IsPhysical && llvel != Vector3.Zero) 3076 if (new_group.RootPart.PhysActor != null && new_group.RootPart.PhysActor.IsPhysical && llvel != Vector3.Zero)
2820 { 3077 {
2821 //Recoil. 3078 //Recoil.
2822 llApplyImpulse(new LSL_Vector(llvel.X * groupmass, llvel.Y * groupmass, llvel.Z * groupmass), 0); 3079 llApplyImpulse(new LSL_Vector(llvel.X * groupmass, llvel.Y * groupmass, llvel.Z * groupmass), 0);
3080 }
3081 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
3082 return;
2823 } 3083 }
2824 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
2825 ScriptSleep((int)((groupmass * velmag) / 10));
2826 ScriptSleep(100);
2827 return;
2828 } 3084 }
2829 }
2830 3085
2831 llSay(0, "Could not find object " + inventory); 3086 llSay(0, "Could not find object " + inventory);
3087 });
3088
3089 //ScriptSleep((int)((groupmass * velmag) / 10));
3090 ScriptSleep(100);
2832 } 3091 }
2833 3092
2834 public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) 3093 public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
@@ -2839,34 +3098,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2839 public void llLookAt(LSL_Vector target, double strength, double damping) 3098 public void llLookAt(LSL_Vector target, double strength, double damping)
2840 { 3099 {
2841 m_host.AddScriptLPS(1); 3100 m_host.AddScriptLPS(1);
2842 // Determine where we are looking from
2843 LSL_Vector from = llGetPos();
2844 3101
2845 // Work out the normalised vector from the source to the target 3102 // Get the normalized vector to the target
2846 LSL_Vector delta = llVecNorm(target - from); 3103 LSL_Vector d1 = llVecNorm(target - llGetPos());
2847 LSL_Vector angle = new LSL_Vector(0,0,0);
2848 3104
2849 // Calculate the yaw 3105 // Get the bearing (yaw)
2850 // subtracting PI_BY_TWO is required to compensate for the odd SL co-ordinate system 3106 LSL_Vector a1 = new LSL_Vector(0,0,0);
2851 angle.x = llAtan2(delta.z, delta.y) - ScriptBaseClass.PI_BY_TWO; 3107 a1.z = llAtan2(d1.y, d1.x);
2852 3108
2853 // Calculate pitch 3109 // Get the elevation (pitch)
2854 angle.y = llAtan2(delta.x, llSqrt((delta.y * delta.y) + (delta.z * delta.z))); 3110 LSL_Vector a2 = new LSL_Vector(0,0,0);
3111 a2.y= -llAtan2(d1.z, llSqrt((d1.x * d1.x) + (d1.y * d1.y)));
2855 3112
2856 // we need to convert from a vector describing 3113 LSL_Rotation r1 = llEuler2Rot(a1);
2857 // the angles of rotation in radians into rotation value 3114 LSL_Rotation r2 = llEuler2Rot(a2);
3115 LSL_Rotation r3 = new LSL_Rotation(0.000000, 0.707107, 0.000000, 0.707107);
2858 3116
2859 LSL_Rotation rot = llEuler2Rot(angle); 3117 if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
2860
2861 // Per discussion with Melanie, for non-physical objects llLookAt appears to simply
2862 // set the rotation of the object, copy that behavior
2863 if (strength == 0 || m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
2864 { 3118 {
2865 llSetRot(rot); 3119 // Do nothing if either value is 0 (this has been checked in SL)
3120 if (strength <= 0.0 || damping <= 0.0)
3121 return;
3122
3123 llSetRot(r3 * r2 * r1);
2866 } 3124 }
2867 else 3125 else
2868 { 3126 {
2869 m_host.StartLookAt(Rot2Quaternion(rot), (float)strength, (float)damping); 3127 if (strength == 0)
3128 {
3129 llSetRot(r3 * r2 * r1);
3130 return;
3131 }
3132
3133 m_host.StartLookAt(Rot2Quaternion(r3 * r2 * r1), (float)strength, (float)damping);
2870 } 3134 }
2871 } 3135 }
2872 3136
@@ -2916,13 +3180,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2916 { 3180 {
2917 TaskInventoryItem item; 3181 TaskInventoryItem item;
2918 3182
2919 lock (m_host.TaskInventory) 3183 m_host.TaskInventory.LockItemsForRead(true);
3184 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2920 { 3185 {
2921 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3186 m_host.TaskInventory.LockItemsForRead(false);
2922 return; 3187 return;
2923 else
2924 item = m_host.TaskInventory[InventorySelf()];
2925 } 3188 }
3189 else
3190 {
3191 item = m_host.TaskInventory[InventorySelf()];
3192 }
3193 m_host.TaskInventory.LockItemsForRead(false);
2926 3194
2927 if (item.PermsGranter != UUID.Zero) 3195 if (item.PermsGranter != UUID.Zero)
2928 { 3196 {
@@ -2944,13 +3212,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2944 { 3212 {
2945 TaskInventoryItem item; 3213 TaskInventoryItem item;
2946 3214
3215 m_host.TaskInventory.LockItemsForRead(true);
2947 lock (m_host.TaskInventory) 3216 lock (m_host.TaskInventory)
2948 { 3217 {
3218
2949 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3219 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3220 {
3221 m_host.TaskInventory.LockItemsForRead(false);
2950 return; 3222 return;
3223 }
2951 else 3224 else
3225 {
2952 item = m_host.TaskInventory[InventorySelf()]; 3226 item = m_host.TaskInventory[InventorySelf()];
3227 }
2953 } 3228 }
3229 m_host.TaskInventory.LockItemsForRead(false);
2954 3230
2955 m_host.AddScriptLPS(1); 3231 m_host.AddScriptLPS(1);
2956 3232
@@ -2982,19 +3258,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2982 { 3258 {
2983 m_host.AddScriptLPS(1); 3259 m_host.AddScriptLPS(1);
2984 3260
2985// if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
2986// return;
2987
2988 TaskInventoryItem item; 3261 TaskInventoryItem item;
2989 3262
2990 lock (m_host.TaskInventory) 3263 m_host.TaskInventory.LockItemsForRead(true);
3264
3265 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2991 { 3266 {
2992 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3267 m_host.TaskInventory.LockItemsForRead(false);
2993 return; 3268 return;
2994 else 3269 }
2995 item = m_host.TaskInventory[InventorySelf()]; 3270 else
3271 {
3272 item = m_host.TaskInventory[InventorySelf()];
2996 } 3273 }
2997 3274
3275 m_host.TaskInventory.LockItemsForRead(false);
3276
2998 if (item.PermsGranter != m_host.OwnerID) 3277 if (item.PermsGranter != m_host.OwnerID)
2999 return; 3278 return;
3000 3279
@@ -3019,13 +3298,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3019 3298
3020 TaskInventoryItem item; 3299 TaskInventoryItem item;
3021 3300
3022 lock (m_host.TaskInventory) 3301 m_host.TaskInventory.LockItemsForRead(true);
3302
3303 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3023 { 3304 {
3024 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3305 m_host.TaskInventory.LockItemsForRead(false);
3025 return; 3306 return;
3026 else 3307 }
3027 item = m_host.TaskInventory[InventorySelf()]; 3308 else
3309 {
3310 item = m_host.TaskInventory[InventorySelf()];
3028 } 3311 }
3312 m_host.TaskInventory.LockItemsForRead(false);
3313
3029 3314
3030 if (item.PermsGranter != m_host.OwnerID) 3315 if (item.PermsGranter != m_host.OwnerID)
3031 return; 3316 return;
@@ -3072,6 +3357,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3072 3357
3073 public void llInstantMessage(string user, string message) 3358 public void llInstantMessage(string user, string message)
3074 { 3359 {
3360 UUID result;
3361 if (!UUID.TryParse(user, out result))
3362 {
3363 ShoutError("An invalid key was passed to llInstantMessage");
3364 ScriptSleep(2000);
3365 return;
3366 }
3367
3368
3075 m_host.AddScriptLPS(1); 3369 m_host.AddScriptLPS(1);
3076 3370
3077 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3371 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -3086,14 +3380,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3086 UUID friendTransactionID = UUID.Random(); 3380 UUID friendTransactionID = UUID.Random();
3087 3381
3088 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3382 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3089 3383
3090 GridInstantMessage msg = new GridInstantMessage(); 3384 GridInstantMessage msg = new GridInstantMessage();
3091 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3385 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3092 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3386 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3093 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3387 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3094// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3388// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3095// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3389// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3096 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 3390// DateTime dt = DateTime.UtcNow;
3391//
3392// // Ticks from UtcNow, but make it look like local. Evil, huh?
3393// dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3394//
3395// try
3396// {
3397// // Convert that to the PST timezone
3398// TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3399// dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3400// }
3401// catch
3402// {
3403// // No logging here, as it could be VERY spammy
3404// }
3405//
3406// // And make it look local again to fool the unix time util
3407// dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3408
3409 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
3410
3097 //if (client != null) 3411 //if (client != null)
3098 //{ 3412 //{
3099 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3413 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3107,12 +3421,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3107 msg.message = message.Substring(0, 1024); 3421 msg.message = message.Substring(0, 1024);
3108 else 3422 else
3109 msg.message = message; 3423 msg.message = message;
3110 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3424 msg.dialog = (byte)19; // MessageFromObject
3111 msg.fromGroup = false;// fromGroup; 3425 msg.fromGroup = false;// fromGroup;
3112 msg.offline = (byte)0; //offline; 3426 msg.offline = (byte)0; //offline;
3113 msg.ParentEstateID = 0; //ParentEstateID; 3427 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3114 msg.Position = new Vector3(m_host.AbsolutePosition); 3428 msg.Position = new Vector3(m_host.AbsolutePosition);
3115 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3429 msg.RegionID = World.RegionInfo.RegionID.Guid;
3116 msg.binaryBucket 3430 msg.binaryBucket
3117 = Util.StringToBytes256( 3431 = Util.StringToBytes256(
3118 "{0}/{1}/{2}/{3}", 3432 "{0}/{1}/{2}/{3}",
@@ -3140,7 +3454,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3140 } 3454 }
3141 3455
3142 emailModule.SendEmail(m_host.UUID, address, subject, message); 3456 emailModule.SendEmail(m_host.UUID, address, subject, message);
3143 ScriptSleep(20000); 3457 ScriptSleep(15000);
3144 } 3458 }
3145 3459
3146 public void llGetNextEmail(string address, string subject) 3460 public void llGetNextEmail(string address, string subject)
@@ -3279,14 +3593,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3279 3593
3280 TaskInventoryItem item; 3594 TaskInventoryItem item;
3281 3595
3282 lock (m_host.TaskInventory) 3596 m_host.TaskInventory.LockItemsForRead(true);
3597 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3283 { 3598 {
3284 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3599 m_host.TaskInventory.LockItemsForRead(false);
3285 return; 3600 return;
3286 else
3287 item = m_host.TaskInventory[InventorySelf()];
3288 } 3601 }
3289 3602 else
3603 {
3604 item = m_host.TaskInventory[InventorySelf()];
3605 }
3606 m_host.TaskInventory.LockItemsForRead(false);
3290 if (item.PermsGranter == UUID.Zero) 3607 if (item.PermsGranter == UUID.Zero)
3291 return; 3608 return;
3292 3609
@@ -3316,13 +3633,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3316 3633
3317 TaskInventoryItem item; 3634 TaskInventoryItem item;
3318 3635
3319 lock (m_host.TaskInventory) 3636 m_host.TaskInventory.LockItemsForRead(true);
3637 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3320 { 3638 {
3321 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3639 m_host.TaskInventory.LockItemsForRead(false);
3322 return; 3640 return;
3323 else 3641 }
3324 item = m_host.TaskInventory[InventorySelf()]; 3642 else
3643 {
3644 item = m_host.TaskInventory[InventorySelf()];
3325 } 3645 }
3646 m_host.TaskInventory.LockItemsForRead(false);
3647
3326 3648
3327 if (item.PermsGranter == UUID.Zero) 3649 if (item.PermsGranter == UUID.Zero)
3328 return; 3650 return;
@@ -3389,10 +3711,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3389 3711
3390 TaskInventoryItem item; 3712 TaskInventoryItem item;
3391 3713
3392 lock (m_host.TaskInventory) 3714
3715 m_host.TaskInventory.LockItemsForRead(true);
3716 if (!m_host.TaskInventory.ContainsKey(invItemID))
3717 {
3718 m_host.TaskInventory.LockItemsForRead(false);
3719 return;
3720 }
3721 else
3393 { 3722 {
3394 item = m_host.TaskInventory[invItemID]; 3723 item = m_host.TaskInventory[invItemID];
3395 } 3724 }
3725 m_host.TaskInventory.LockItemsForRead(false);
3396 3726
3397 if (agentID == UUID.Zero || perm == 0) // Releasing permissions 3727 if (agentID == UUID.Zero || perm == 0) // Releasing permissions
3398 { 3728 {
@@ -3420,15 +3750,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3420 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 3750 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
3421 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3751 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
3422 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3752 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
3753 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
3423 ScriptBaseClass.PERMISSION_ATTACH; 3754 ScriptBaseClass.PERMISSION_ATTACH;
3424 3755
3425 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3756 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3426 { 3757 {
3427 lock (m_host.TaskInventory) 3758 m_host.TaskInventory.LockItemsForWrite(true);
3428 { 3759 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3429 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3760 m_host.TaskInventory[invItemID].PermsMask = perm;
3430 m_host.TaskInventory[invItemID].PermsMask = perm; 3761 m_host.TaskInventory.LockItemsForWrite(false);
3431 }
3432 3762
3433 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3763 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3434 "run_time_permissions", new Object[] { 3764 "run_time_permissions", new Object[] {
@@ -3438,28 +3768,44 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3438 return; 3768 return;
3439 } 3769 }
3440 } 3770 }
3441 else if (m_host.SitTargetAvatar == agentID) // Sitting avatar 3771 else
3442 { 3772 {
3443 // When agent is sitting, certain permissions are implicit if requested from sitting agent 3773 bool sitting = false;
3444 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3774 if (m_host.SitTargetAvatar == agentID)
3445 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3775 {
3446 ScriptBaseClass.PERMISSION_TRACK_CAMERA | 3776 sitting = true;
3447 ScriptBaseClass.PERMISSION_TAKE_CONTROLS; 3777 }
3778 else
3779 {
3780 foreach (SceneObjectPart p in m_host.ParentGroup.Parts)
3781 {
3782 if (p.SitTargetAvatar == agentID)
3783 sitting = true;
3784 }
3785 }
3448 3786
3449 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3787 if (sitting)
3450 { 3788 {
3451 lock (m_host.TaskInventory) 3789 // When agent is sitting, certain permissions are implicit if requested from sitting agent
3790 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
3791 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
3792 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
3793 ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
3794
3795 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3452 { 3796 {
3797 m_host.TaskInventory.LockItemsForWrite(true);
3453 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3798 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3454 m_host.TaskInventory[invItemID].PermsMask = perm; 3799 m_host.TaskInventory[invItemID].PermsMask = perm;
3455 } 3800 m_host.TaskInventory.LockItemsForWrite(false);
3456 3801
3457 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3802 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3458 "run_time_permissions", new Object[] { 3803 "run_time_permissions", new Object[] {
3459 new LSL_Integer(perm) }, 3804 new LSL_Integer(perm) },
3460 new DetectParams[0])); 3805 new DetectParams[0]));
3461 3806
3462 return; 3807 return;
3808 }
3463 } 3809 }
3464 } 3810 }
3465 3811
@@ -3473,11 +3819,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3473 3819
3474 if (!m_waitingForScriptAnswer) 3820 if (!m_waitingForScriptAnswer)
3475 { 3821 {
3476 lock (m_host.TaskInventory) 3822 m_host.TaskInventory.LockItemsForWrite(true);
3477 { 3823 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3478 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3824 m_host.TaskInventory[invItemID].PermsMask = 0;
3479 m_host.TaskInventory[invItemID].PermsMask = 0; 3825 m_host.TaskInventory.LockItemsForWrite(false);
3480 }
3481 3826
3482 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3827 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3483 m_waitingForScriptAnswer=true; 3828 m_waitingForScriptAnswer=true;
@@ -3512,10 +3857,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3512 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3857 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3513 llReleaseControls(); 3858 llReleaseControls();
3514 3859
3515 lock (m_host.TaskInventory) 3860
3516 { 3861 m_host.TaskInventory.LockItemsForWrite(true);
3517 m_host.TaskInventory[invItemID].PermsMask = answer; 3862 m_host.TaskInventory[invItemID].PermsMask = answer;
3518 } 3863 m_host.TaskInventory.LockItemsForWrite(false);
3864
3519 3865
3520 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3866 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3521 "run_time_permissions", new Object[] { 3867 "run_time_permissions", new Object[] {
@@ -3527,16 +3873,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3527 { 3873 {
3528 m_host.AddScriptLPS(1); 3874 m_host.AddScriptLPS(1);
3529 3875
3530 lock (m_host.TaskInventory) 3876 m_host.TaskInventory.LockItemsForRead(true);
3877
3878 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3531 { 3879 {
3532 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3880 if (item.Type == 10 && item.ItemID == m_itemID)
3533 { 3881 {
3534 if (item.Type == 10 && item.ItemID == m_itemID) 3882 m_host.TaskInventory.LockItemsForRead(false);
3535 { 3883 return item.PermsGranter.ToString();
3536 return item.PermsGranter.ToString();
3537 }
3538 } 3884 }
3539 } 3885 }
3886 m_host.TaskInventory.LockItemsForRead(false);
3540 3887
3541 return UUID.Zero.ToString(); 3888 return UUID.Zero.ToString();
3542 } 3889 }
@@ -3545,19 +3892,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3545 { 3892 {
3546 m_host.AddScriptLPS(1); 3893 m_host.AddScriptLPS(1);
3547 3894
3548 lock (m_host.TaskInventory) 3895 m_host.TaskInventory.LockItemsForRead(true);
3896
3897 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3549 { 3898 {
3550 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3899 if (item.Type == 10 && item.ItemID == m_itemID)
3551 { 3900 {
3552 if (item.Type == 10 && item.ItemID == m_itemID) 3901 int perms = item.PermsMask;
3553 { 3902 if (m_automaticLinkPermission)
3554 int perms = item.PermsMask; 3903 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
3555 if (m_automaticLinkPermission) 3904 m_host.TaskInventory.LockItemsForRead(false);
3556 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 3905 return perms;
3557 return perms;
3558 }
3559 } 3906 }
3560 } 3907 }
3908 m_host.TaskInventory.LockItemsForRead(false);
3561 3909
3562 return 0; 3910 return 0;
3563 } 3911 }
@@ -3579,9 +3927,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3579 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 3927 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3580 { 3928 {
3581 List<SceneObjectPart> parts = GetLinkParts(linknumber); 3929 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3582 3930 if (parts.Count > 0)
3583 foreach (SceneObjectPart part in parts) 3931 {
3584 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); 3932 try
3933 {
3934 parts[0].ParentGroup.areUpdatesSuspended = true;
3935 foreach (SceneObjectPart part in parts)
3936 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
3937 }
3938 finally
3939 {
3940 parts[0].ParentGroup.areUpdatesSuspended = false;
3941 }
3942 }
3585 } 3943 }
3586 3944
3587 public void llCreateLink(string target, int parent) 3945 public void llCreateLink(string target, int parent)
@@ -3594,11 +3952,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3594 return; 3952 return;
3595 3953
3596 TaskInventoryItem item; 3954 TaskInventoryItem item;
3597 lock (m_host.TaskInventory) 3955 m_host.TaskInventory.LockItemsForRead(true);
3598 { 3956 item = m_host.TaskInventory[invItemID];
3599 item = m_host.TaskInventory[invItemID]; 3957 m_host.TaskInventory.LockItemsForRead(false);
3600 } 3958
3601
3602 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3959 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3603 && !m_automaticLinkPermission) 3960 && !m_automaticLinkPermission)
3604 { 3961 {
@@ -3615,11 +3972,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3615 3972
3616 if (targetPart.ParentGroup.AttachmentPoint != 0) 3973 if (targetPart.ParentGroup.AttachmentPoint != 0)
3617 return; // Fail silently if attached 3974 return; // Fail silently if attached
3975
3976 if (targetPart.ParentGroup.RootPart.OwnerID != m_host.ParentGroup.RootPart.OwnerID)
3977 return;
3978
3618 SceneObjectGroup parentPrim = null, childPrim = null; 3979 SceneObjectGroup parentPrim = null, childPrim = null;
3619 3980
3620 if (targetPart != null) 3981 if (targetPart != null)
3621 { 3982 {
3622 if (parent != 0) { 3983 if (parent != 0)
3984 {
3623 parentPrim = m_host.ParentGroup; 3985 parentPrim = m_host.ParentGroup;
3624 childPrim = targetPart.ParentGroup; 3986 childPrim = targetPart.ParentGroup;
3625 } 3987 }
@@ -3631,7 +3993,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3631 3993
3632 // Required for linking 3994 // Required for linking
3633 childPrim.RootPart.ClearUpdateSchedule(); 3995 childPrim.RootPart.ClearUpdateSchedule();
3634 parentPrim.LinkToGroup(childPrim); 3996 parentPrim.LinkToGroup(childPrim, true);
3635 } 3997 }
3636 3998
3637 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 3999 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3650,16 +4012,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3650 m_host.AddScriptLPS(1); 4012 m_host.AddScriptLPS(1);
3651 UUID invItemID = InventorySelf(); 4013 UUID invItemID = InventorySelf();
3652 4014
3653 lock (m_host.TaskInventory) 4015 m_host.TaskInventory.LockItemsForRead(true);
3654 {
3655 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 4016 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3656 && !m_automaticLinkPermission) 4017 && !m_automaticLinkPermission)
3657 { 4018 {
3658 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 4019 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
4020 m_host.TaskInventory.LockItemsForRead(false);
3659 return; 4021 return;
3660 } 4022 }
3661 } 4023 m_host.TaskInventory.LockItemsForRead(false);
3662 4024
3663 if (linknum < ScriptBaseClass.LINK_THIS) 4025 if (linknum < ScriptBaseClass.LINK_THIS)
3664 return; 4026 return;
3665 4027
@@ -3698,10 +4060,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3698 // Restructuring Multiple Prims. 4060 // Restructuring Multiple Prims.
3699 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); 4061 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
3700 parts.Remove(parentPrim.RootPart); 4062 parts.Remove(parentPrim.RootPart);
3701 foreach (SceneObjectPart part in parts) 4063 if (parts.Count > 0)
3702 { 4064 {
3703 parentPrim.DelinkFromGroup(part.LocalId, true); 4065 try
4066 {
4067 parts[0].ParentGroup.areUpdatesSuspended = true;
4068 foreach (SceneObjectPart part in parts)
4069 {
4070 parentPrim.DelinkFromGroup(part.LocalId, true);
4071 }
4072 }
4073 finally
4074 {
4075 parts[0].ParentGroup.areUpdatesSuspended = false;
4076 }
3704 } 4077 }
4078
3705 parentPrim.HasGroupChanged = true; 4079 parentPrim.HasGroupChanged = true;
3706 parentPrim.ScheduleGroupForFullUpdate(); 4080 parentPrim.ScheduleGroupForFullUpdate();
3707 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 4081 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3710,12 +4084,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3710 { 4084 {
3711 SceneObjectPart newRoot = parts[0]; 4085 SceneObjectPart newRoot = parts[0];
3712 parts.Remove(newRoot); 4086 parts.Remove(newRoot);
3713 foreach (SceneObjectPart part in parts) 4087
4088 try
3714 { 4089 {
3715 // Required for linking 4090 parts[0].ParentGroup.areUpdatesSuspended = true;
3716 part.ClearUpdateSchedule(); 4091 foreach (SceneObjectPart part in parts)
3717 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 4092 {
4093 part.ClearUpdateSchedule();
4094 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
4095 }
3718 } 4096 }
4097 finally
4098 {
4099 parts[0].ParentGroup.areUpdatesSuspended = false;
4100 }
4101
4102
3719 newRoot.ParentGroup.HasGroupChanged = true; 4103 newRoot.ParentGroup.HasGroupChanged = true;
3720 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 4104 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3721 } 4105 }
@@ -3735,6 +4119,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3735 public void llBreakAllLinks() 4119 public void llBreakAllLinks()
3736 { 4120 {
3737 m_host.AddScriptLPS(1); 4121 m_host.AddScriptLPS(1);
4122
4123 UUID invItemID = InventorySelf();
4124
4125 TaskInventoryItem item;
4126 m_host.TaskInventory.LockItemsForRead(true);
4127 item = m_host.TaskInventory[invItemID];
4128 m_host.TaskInventory.LockItemsForRead(false);
4129
4130 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
4131 && !m_automaticLinkPermission)
4132 {
4133 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
4134 return;
4135 }
4136
3738 SceneObjectGroup parentPrim = m_host.ParentGroup; 4137 SceneObjectGroup parentPrim = m_host.ParentGroup;
3739 if (parentPrim.AttachmentPoint != 0) 4138 if (parentPrim.AttachmentPoint != 0)
3740 return; // Fail silently if attached 4139 return; // Fail silently if attached
@@ -3754,25 +4153,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3754 public LSL_String llGetLinkKey(int linknum) 4153 public LSL_String llGetLinkKey(int linknum)
3755 { 4154 {
3756 m_host.AddScriptLPS(1); 4155 m_host.AddScriptLPS(1);
3757 List<UUID> keytable = new List<UUID>();
3758 // parse for sitting avatare-uuids
3759 World.ForEachRootScenePresence(delegate(ScenePresence presence)
3760 {
3761 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
3762 keytable.Add(presence.UUID);
3763 });
3764
3765 int totalprims = m_host.ParentGroup.PrimCount + keytable.Count;
3766 if (linknum > m_host.ParentGroup.PrimCount && linknum <= totalprims)
3767 {
3768 return keytable[totalprims - linknum].ToString();
3769 }
3770
3771 if (linknum == 1 && m_host.ParentGroup.PrimCount == 1 && keytable.Count == 1)
3772 {
3773 return m_host.UUID.ToString();
3774 }
3775
3776 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); 4156 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
3777 if (part != null) 4157 if (part != null)
3778 { 4158 {
@@ -3780,6 +4160,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3780 } 4160 }
3781 else 4161 else
3782 { 4162 {
4163 if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1))
4164 {
4165 linknum -= (m_host.ParentGroup.PrimCount) + 1;
4166
4167 if (linknum < 0)
4168 return UUID.Zero.ToString();
4169
4170 List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
4171 if (avatars.Count > linknum)
4172 {
4173 return avatars[linknum].UUID.ToString();
4174 }
4175 }
3783 return UUID.Zero.ToString(); 4176 return UUID.Zero.ToString();
3784 } 4177 }
3785 } 4178 }
@@ -3878,17 +4271,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3878 m_host.AddScriptLPS(1); 4271 m_host.AddScriptLPS(1);
3879 int count = 0; 4272 int count = 0;
3880 4273
3881 lock (m_host.TaskInventory) 4274 m_host.TaskInventory.LockItemsForRead(true);
4275 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3882 { 4276 {
3883 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4277 if (inv.Value.Type == type || type == -1)
3884 { 4278 {
3885 if (inv.Value.Type == type || type == -1) 4279 count = count + 1;
3886 {
3887 count = count + 1;
3888 }
3889 } 4280 }
3890 } 4281 }
3891 4282
4283 m_host.TaskInventory.LockItemsForRead(false);
3892 return count; 4284 return count;
3893 } 4285 }
3894 4286
@@ -3897,16 +4289,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3897 m_host.AddScriptLPS(1); 4289 m_host.AddScriptLPS(1);
3898 ArrayList keys = new ArrayList(); 4290 ArrayList keys = new ArrayList();
3899 4291
3900 lock (m_host.TaskInventory) 4292 m_host.TaskInventory.LockItemsForRead(true);
4293 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3901 { 4294 {
3902 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4295 if (inv.Value.Type == type || type == -1)
3903 { 4296 {
3904 if (inv.Value.Type == type || type == -1) 4297 keys.Add(inv.Value.Name);
3905 {
3906 keys.Add(inv.Value.Name);
3907 }
3908 } 4298 }
3909 } 4299 }
4300 m_host.TaskInventory.LockItemsForRead(false);
3910 4301
3911 if (keys.Count == 0) 4302 if (keys.Count == 0)
3912 { 4303 {
@@ -3943,25 +4334,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3943 } 4334 }
3944 4335
3945 // move the first object found with this inventory name 4336 // move the first object found with this inventory name
3946 lock (m_host.TaskInventory) 4337 m_host.TaskInventory.LockItemsForRead(true);
4338 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3947 { 4339 {
3948 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4340 if (inv.Value.Name == inventory)
3949 { 4341 {
3950 if (inv.Value.Name == inventory) 4342 found = true;
3951 { 4343 objId = inv.Key;
3952 found = true; 4344 assetType = inv.Value.Type;
3953 objId = inv.Key; 4345 objName = inv.Value.Name;
3954 assetType = inv.Value.Type; 4346 break;
3955 objName = inv.Value.Name;
3956 break;
3957 }
3958 } 4347 }
3959 } 4348 }
4349 m_host.TaskInventory.LockItemsForRead(false);
3960 4350
3961 if (!found) 4351 if (!found)
3962 { 4352 {
3963 llSay(0, String.Format("Could not find object '{0}'", inventory)); 4353 llSay(0, String.Format("Could not find object '{0}'", inventory));
3964 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4354 return;
4355// throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
3965 } 4356 }
3966 4357
3967 // check if destination is an object 4358 // check if destination is an object
@@ -3987,48 +4378,68 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3987 return; 4378 return;
3988 } 4379 }
3989 } 4380 }
4381
3990 // destination is an avatar 4382 // destination is an avatar
3991 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4383 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
3992 4384
3993 if (agentItem == null) 4385 if (agentItem == null)
3994 return; 4386 return;
3995 4387
3996 byte[] bucket = new byte[17]; 4388 byte[] bucket = new byte[1];
3997 bucket[0] = (byte)assetType; 4389 bucket[0] = (byte)assetType;
3998 byte[] objBytes = agentItem.ID.GetBytes(); 4390 //byte[] objBytes = agentItem.ID.GetBytes();
3999 Array.Copy(objBytes, 0, bucket, 1, 16); 4391 //Array.Copy(objBytes, 0, bucket, 1, 16);
4000 4392
4001 GridInstantMessage msg = new GridInstantMessage(World, 4393 GridInstantMessage msg = new GridInstantMessage(World,
4002 m_host.UUID, m_host.Name+", an object owned by "+ 4394 m_host.OwnerID, m_host.Name, destId,
4003 resolveName(m_host.OwnerID)+",", destId,
4004 (byte)InstantMessageDialog.TaskInventoryOffered, 4395 (byte)InstantMessageDialog.TaskInventoryOffered,
4005 false, objName+"\n"+m_host.Name+" is located at "+ 4396 false, objName+". "+m_host.Name+" is located at "+
4006 World.RegionInfo.RegionName+" "+ 4397 World.RegionInfo.RegionName+" "+
4007 m_host.AbsolutePosition.ToString(), 4398 m_host.AbsolutePosition.ToString(),
4008 agentItem.ID, true, m_host.AbsolutePosition, 4399 agentItem.ID, true, m_host.AbsolutePosition,
4009 bucket); 4400 bucket);
4010 if (m_TransferModule != null) 4401
4011 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4402 ScenePresence sp;
4403
4404 if (World.TryGetScenePresence(destId, out sp))
4405 {
4406 sp.ControllingClient.SendInstantMessage(msg);
4407 }
4408 else
4409 {
4410 if (m_TransferModule != null)
4411 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4412 }
4413
4414 //This delay should only occur when giving inventory to avatars.
4012 ScriptSleep(3000); 4415 ScriptSleep(3000);
4013 } 4416 }
4014 } 4417 }
4015 4418
4419 [DebuggerNonUserCode]
4016 public void llRemoveInventory(string name) 4420 public void llRemoveInventory(string name)
4017 { 4421 {
4018 m_host.AddScriptLPS(1); 4422 m_host.AddScriptLPS(1);
4019 4423
4020 lock (m_host.TaskInventory) 4424 List<TaskInventoryItem> inv;
4425 try
4021 { 4426 {
4022 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4427 m_host.TaskInventory.LockItemsForRead(true);
4428 inv = new List<TaskInventoryItem>(m_host.TaskInventory.Values);
4429 }
4430 finally
4431 {
4432 m_host.TaskInventory.LockItemsForRead(false);
4433 }
4434 foreach (TaskInventoryItem item in inv)
4435 {
4436 if (item.Name == name)
4023 { 4437 {
4024 if (item.Name == name) 4438 if (item.ItemID == m_itemID)
4025 { 4439 throw new ScriptDeleteException();
4026 if (item.ItemID == m_itemID) 4440 else
4027 throw new ScriptDeleteException(); 4441 m_host.Inventory.RemoveInventoryItem(item.ItemID);
4028 else 4442 return;
4029 m_host.Inventory.RemoveInventoryItem(item.ItemID);
4030 return;
4031 }
4032 } 4443 }
4033 } 4444 }
4034 } 4445 }
@@ -4063,112 +4474,122 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4063 { 4474 {
4064 m_host.AddScriptLPS(1); 4475 m_host.AddScriptLPS(1);
4065 4476
4066 UUID uuid = (UUID)id; 4477 UUID uuid;
4067 PresenceInfo pinfo = null; 4478 if (UUID.TryParse(id, out uuid))
4068 UserAccount account;
4069
4070 UserInfoCacheEntry ce;
4071 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4072 { 4479 {
4073 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); 4480 PresenceInfo pinfo = null;
4074 if (account == null) 4481 UserAccount account;
4482
4483 UserInfoCacheEntry ce;
4484 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4075 { 4485 {
4076 m_userInfoCache[uuid] = null; // Cache negative 4486 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
4077 return UUID.Zero.ToString(); 4487 if (account == null)
4078 } 4488 {
4489 m_userInfoCache[uuid] = null; // Cache negative
4490 return UUID.Zero.ToString();
4491 }
4079 4492
4080 4493
4081 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); 4494 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4082 if (pinfos != null && pinfos.Length > 0) 4495 if (pinfos != null && pinfos.Length > 0)
4083 {
4084 foreach (PresenceInfo p in pinfos)
4085 { 4496 {
4086 if (p.RegionID != UUID.Zero) 4497 foreach (PresenceInfo p in pinfos)
4087 { 4498 {
4088 pinfo = p; 4499 if (p.RegionID != UUID.Zero)
4500 {
4501 pinfo = p;
4502 }
4089 } 4503 }
4090 } 4504 }
4091 }
4092 4505
4093 ce = new UserInfoCacheEntry(); 4506 ce = new UserInfoCacheEntry();
4094 ce.time = Util.EnvironmentTickCount(); 4507 ce.time = Util.EnvironmentTickCount();
4095 ce.account = account; 4508 ce.account = account;
4096 ce.pinfo = pinfo; 4509 ce.pinfo = pinfo;
4097 } 4510 m_userInfoCache[uuid] = ce;
4098 else 4511 }
4099 { 4512 else
4100 if (ce == null) 4513 {
4101 return UUID.Zero.ToString(); 4514 if (ce == null)
4515 return UUID.Zero.ToString();
4102 4516
4103 account = ce.account; 4517 account = ce.account;
4104 pinfo = ce.pinfo; 4518 pinfo = ce.pinfo;
4105 } 4519 }
4106 4520
4107 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) 4521 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
4108 {
4109 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4110 if (pinfos != null && pinfos.Length > 0)
4111 { 4522 {
4112 foreach (PresenceInfo p in pinfos) 4523 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4524 if (pinfos != null && pinfos.Length > 0)
4113 { 4525 {
4114 if (p.RegionID != UUID.Zero) 4526 foreach (PresenceInfo p in pinfos)
4115 { 4527 {
4116 pinfo = p; 4528 if (p.RegionID != UUID.Zero)
4529 {
4530 pinfo = p;
4531 }
4117 } 4532 }
4118 } 4533 }
4119 } 4534 else
4120 else 4535 pinfo = null;
4121 pinfo = null;
4122 4536
4123 ce.time = Util.EnvironmentTickCount(); 4537 ce.time = Util.EnvironmentTickCount();
4124 ce.pinfo = pinfo; 4538 ce.pinfo = pinfo;
4125 } 4539 }
4126 4540
4127 string reply = String.Empty; 4541 string reply = String.Empty;
4128 4542
4129 switch (data) 4543 switch (data)
4130 { 4544 {
4131 case 1: // DATA_ONLINE (0|1) 4545 case 1: // DATA_ONLINE (0|1)
4132 if (pinfo != null && pinfo.RegionID != UUID.Zero) 4546 if (pinfo != null && pinfo.RegionID != UUID.Zero)
4133 reply = "1"; 4547 reply = "1";
4134 else 4548 else
4135 reply = "0"; 4549 reply = "0";
4136 break; 4550 break;
4137 case 2: // DATA_NAME (First Last) 4551 case 2: // DATA_NAME (First Last)
4138 reply = account.FirstName + " " + account.LastName; 4552 reply = account.FirstName + " " + account.LastName;
4139 break; 4553 break;
4140 case 3: // DATA_BORN (YYYY-MM-DD) 4554 case 3: // DATA_BORN (YYYY-MM-DD)
4141 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); 4555 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
4142 born = born.AddSeconds(account.Created); 4556 born = born.AddSeconds(account.Created);
4143 reply = born.ToString("yyyy-MM-dd"); 4557 reply = born.ToString("yyyy-MM-dd");
4144 break; 4558 break;
4145 case 4: // DATA_RATING (0,0,0,0,0,0) 4559 case 4: // DATA_RATING (0,0,0,0,0,0)
4146 reply = "0,0,0,0,0,0"; 4560 reply = "0,0,0,0,0,0";
4147 break; 4561 break;
4148 case 8: // DATA_PAYINFO (0|1|2|3) 4562 case 8: // DATA_PAYINFO (0|1|2|3)
4149 reply = "0"; 4563 reply = "0";
4150 break; 4564 break;
4151 default: 4565 default:
4152 return UUID.Zero.ToString(); // Raise no event 4566 return UUID.Zero.ToString(); // Raise no event
4153 } 4567 }
4154 4568
4155 UUID rq = UUID.Random(); 4569 UUID rq = UUID.Random();
4156 4570
4157 UUID tid = AsyncCommands. 4571 UUID tid = AsyncCommands.
4158 DataserverPlugin.RegisterRequest(m_localID, 4572 DataserverPlugin.RegisterRequest(m_localID,
4159 m_itemID, rq.ToString()); 4573 m_itemID, rq.ToString());
4160 4574
4161 AsyncCommands. 4575 AsyncCommands.
4162 DataserverPlugin.DataserverReply(rq.ToString(), reply); 4576 DataserverPlugin.DataserverReply(rq.ToString(), reply);
4163 4577
4164 ScriptSleep(100); 4578 ScriptSleep(100);
4165 return tid.ToString(); 4579 return tid.ToString();
4580 }
4581 else
4582 {
4583 ShoutError("Invalid UUID passed to llRequestAgentData.");
4584 }
4585 return "";
4166 } 4586 }
4167 4587
4168 public LSL_String llRequestInventoryData(string name) 4588 public LSL_String llRequestInventoryData(string name)
4169 { 4589 {
4170 m_host.AddScriptLPS(1); 4590 m_host.AddScriptLPS(1);
4171 4591
4592 //Clone is thread safe
4172 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 4593 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
4173 4594
4174 foreach (TaskInventoryItem item in itemDictionary.Values) 4595 foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -4222,6 +4643,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4222 ScenePresence presence = World.GetScenePresence(agentId); 4643 ScenePresence presence = World.GetScenePresence(agentId);
4223 if (presence != null) 4644 if (presence != null)
4224 { 4645 {
4646 // agent must not be a god
4647 if (presence.UserLevel >= 200) return;
4648
4225 // agent must be over the owners land 4649 // agent must be over the owners land
4226 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4650 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4227 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 4651 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
@@ -4233,6 +4657,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4233 ScriptSleep(5000); 4657 ScriptSleep(5000);
4234 } 4658 }
4235 4659
4660 public void llTeleportAgent(string agent, string simname, LSL_Vector pos, LSL_Vector lookAt)
4661 {
4662 m_host.AddScriptLPS(1);
4663 UUID agentId = new UUID();
4664 if (UUID.TryParse(agent, out agentId))
4665 {
4666 ScenePresence presence = World.GetScenePresence(agentId);
4667 if (presence != null)
4668 {
4669 // agent must not be a god
4670 if (presence.UserLevel >= 200) return;
4671
4672 // agent must be over the owners land
4673 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4674 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
4675 {
4676 World.RequestTeleportLocation(presence.ControllingClient, simname, new Vector3((float)pos.x, (float)pos.y, (float)pos.z), new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z), (uint)TeleportFlags.ViaLocation);
4677 }
4678 }
4679 }
4680 }
4681
4236 public void llTextBox(string agent, string message, int chatChannel) 4682 public void llTextBox(string agent, string message, int chatChannel)
4237 { 4683 {
4238 IDialogModule dm = World.RequestModuleInterface<IDialogModule>(); 4684 IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
@@ -4244,7 +4690,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4244 UUID av = new UUID(); 4690 UUID av = new UUID();
4245 if (!UUID.TryParse(agent,out av)) 4691 if (!UUID.TryParse(agent,out av))
4246 { 4692 {
4247 LSLError("First parameter to llDialog needs to be a key"); 4693 //LSLError("First parameter to llDialog needs to be a key");
4248 return; 4694 return;
4249 } 4695 }
4250 4696
@@ -4281,17 +4727,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4281 UUID soundId = UUID.Zero; 4727 UUID soundId = UUID.Zero;
4282 if (!UUID.TryParse(impact_sound, out soundId)) 4728 if (!UUID.TryParse(impact_sound, out soundId))
4283 { 4729 {
4284 lock (m_host.TaskInventory) 4730 m_host.TaskInventory.LockItemsForRead(true);
4731 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4285 { 4732 {
4286 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4733 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
4287 { 4734 {
4288 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound) 4735 soundId = item.AssetID;
4289 { 4736 break;
4290 soundId = item.AssetID;
4291 break;
4292 }
4293 } 4737 }
4294 } 4738 }
4739 m_host.TaskInventory.LockItemsForRead(false);
4295 } 4740 }
4296 m_host.CollisionSound = soundId; 4741 m_host.CollisionSound = soundId;
4297 m_host.CollisionSoundVolume = (float)impact_volume; 4742 m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4331,6 +4776,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4331 UUID partItemID; 4776 UUID partItemID;
4332 foreach (SceneObjectPart part in parts) 4777 foreach (SceneObjectPart part in parts)
4333 { 4778 {
4779 //Clone is thread safe
4334 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 4780 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
4335 4781
4336 foreach (TaskInventoryItem item in itemsDictionary.Values) 4782 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4545,17 +4991,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4545 4991
4546 m_host.AddScriptLPS(1); 4992 m_host.AddScriptLPS(1);
4547 4993
4548 lock (m_host.TaskInventory) 4994 m_host.TaskInventory.LockItemsForRead(true);
4995 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4549 { 4996 {
4550 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4997 if (item.Type == 10 && item.ItemID == m_itemID)
4551 { 4998 {
4552 if (item.Type == 10 && item.ItemID == m_itemID) 4999 result = item.Name!=null?item.Name:String.Empty;
4553 { 5000 break;
4554 result = item.Name != null ? item.Name : String.Empty;
4555 break;
4556 }
4557 } 5001 }
4558 } 5002 }
5003 m_host.TaskInventory.LockItemsForRead(false);
4559 5004
4560 return result; 5005 return result;
4561 } 5006 }
@@ -4728,23 +5173,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4728 { 5173 {
4729 m_host.AddScriptLPS(1); 5174 m_host.AddScriptLPS(1);
4730 5175
4731 lock (m_host.TaskInventory) 5176 m_host.TaskInventory.LockItemsForRead(true);
5177 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
4732 { 5178 {
4733 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 5179 if (inv.Value.Name == name)
4734 { 5180 {
4735 if (inv.Value.Name == name) 5181 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
4736 { 5182 {
4737 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 5183 m_host.TaskInventory.LockItemsForRead(false);
4738 { 5184 return inv.Value.AssetID.ToString();
4739 return inv.Value.AssetID.ToString(); 5185 }
4740 } 5186 else
4741 else 5187 {
4742 { 5188 m_host.TaskInventory.LockItemsForRead(false);
4743 return UUID.Zero.ToString(); 5189 return UUID.Zero.ToString();
4744 }
4745 } 5190 }
4746 } 5191 }
4747 } 5192 }
5193 m_host.TaskInventory.LockItemsForRead(false);
4748 5194
4749 return UUID.Zero.ToString(); 5195 return UUID.Zero.ToString();
4750 } 5196 }
@@ -4897,14 +5343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4897 { 5343 {
4898 m_host.AddScriptLPS(1); 5344 m_host.AddScriptLPS(1);
4899 5345
4900 if (src == null) 5346 return src.Length;
4901 {
4902 return 0;
4903 }
4904 else
4905 {
4906 return src.Length;
4907 }
4908 } 5347 }
4909 5348
4910 public LSL_Integer llList2Integer(LSL_List src, int index) 5349 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -4950,7 +5389,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4950 else if (src.Data[index] is LSL_Float) 5389 else if (src.Data[index] is LSL_Float)
4951 return Convert.ToDouble(((LSL_Float) src.Data[index]).value); 5390 return Convert.ToDouble(((LSL_Float) src.Data[index]).value);
4952 else if (src.Data[index] is LSL_String) 5391 else if (src.Data[index] is LSL_String)
4953 return Convert.ToDouble(((LSL_String) src.Data[index]).m_string); 5392 {
5393 string str = ((LSL_String) src.Data[index]).m_string;
5394 Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)");
5395 if (m != Match.Empty)
5396 {
5397 str = m.Value;
5398 double d = 0.0;
5399 if (!Double.TryParse(str, out d))
5400 return 0.0;
5401
5402 return d;
5403 }
5404 return 0.0;
5405 }
4954 return Convert.ToDouble(src.Data[index]); 5406 return Convert.ToDouble(src.Data[index]);
4955 } 5407 }
4956 catch (FormatException) 5408 catch (FormatException)
@@ -5223,7 +5675,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5223 } 5675 }
5224 } 5676 }
5225 } 5677 }
5226 else { 5678 else
5679 {
5227 object[] array = new object[src.Length]; 5680 object[] array = new object[src.Length];
5228 Array.Copy(src.Data, 0, array, 0, src.Length); 5681 Array.Copy(src.Data, 0, array, 0, src.Length);
5229 result = new LSL_List(array); 5682 result = new LSL_List(array);
@@ -5330,7 +5783,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5330 public LSL_Integer llGetRegionAgentCount() 5783 public LSL_Integer llGetRegionAgentCount()
5331 { 5784 {
5332 m_host.AddScriptLPS(1); 5785 m_host.AddScriptLPS(1);
5333 return new LSL_Integer(World.GetRootAgentCount()); 5786
5787 int count = 0;
5788 World.ForEachRootScenePresence(delegate(ScenePresence sp) {
5789 count++;
5790 });
5791
5792 return new LSL_Integer(count);
5334 } 5793 }
5335 5794
5336 public LSL_Vector llGetRegionCorner() 5795 public LSL_Vector llGetRegionCorner()
@@ -5672,10 +6131,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5672 m_host.AddScriptLPS(1); 6131 m_host.AddScriptLPS(1);
5673 6132
5674 List<SceneObjectPart> parts = GetLinkParts(linknumber); 6133 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5675 6134 if (parts.Count > 0)
5676 foreach (var part in parts)
5677 { 6135 {
5678 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); 6136 try
6137 {
6138 parts[0].ParentGroup.areUpdatesSuspended = true;
6139 foreach (var part in parts)
6140 {
6141 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
6142 }
6143 }
6144 finally
6145 {
6146 parts[0].ParentGroup.areUpdatesSuspended = false;
6147 }
5679 } 6148 }
5680 } 6149 }
5681 6150
@@ -5727,13 +6196,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5727 6196
5728 if (m_host.OwnerID == land.LandData.OwnerID) 6197 if (m_host.OwnerID == land.LandData.OwnerID)
5729 { 6198 {
5730 World.TeleportClientHome(agentID, presence.ControllingClient); 6199 Vector3 pos = World.GetNearestAllowedPosition(presence, land);
6200 presence.TeleportWithMomentum(pos);
6201 presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
5731 } 6202 }
5732 } 6203 }
5733 } 6204 }
5734 ScriptSleep(5000); 6205 ScriptSleep(5000);
5735 } 6206 }
5736 6207
6208 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
6209 {
6210 return ParseString2List(str, separators, in_spacers, false);
6211 }
6212
5737 public LSL_Integer llOverMyLand(string id) 6213 public LSL_Integer llOverMyLand(string id)
5738 { 6214 {
5739 m_host.AddScriptLPS(1); 6215 m_host.AddScriptLPS(1);
@@ -5798,8 +6274,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5798 UUID agentId = new UUID(); 6274 UUID agentId = new UUID();
5799 if (!UUID.TryParse(agent, out agentId)) 6275 if (!UUID.TryParse(agent, out agentId))
5800 return new LSL_Integer(0); 6276 return new LSL_Integer(0);
6277 if (agentId == m_host.GroupID)
6278 return new LSL_Integer(1);
5801 ScenePresence presence = World.GetScenePresence(agentId); 6279 ScenePresence presence = World.GetScenePresence(agentId);
5802 if (presence == null || presence.IsChildAgent) // Return flase for child agents 6280 if (presence == null || presence.IsChildAgent) // Return false for child agents
5803 return new LSL_Integer(0); 6281 return new LSL_Integer(0);
5804 IClientAPI client = presence.ControllingClient; 6282 IClientAPI client = presence.ControllingClient;
5805 if (m_host.GroupID == client.ActiveGroupId) 6283 if (m_host.GroupID == client.ActiveGroupId)
@@ -5934,7 +6412,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5934 return m_host.ParentGroup.AttachmentPoint; 6412 return m_host.ParentGroup.AttachmentPoint;
5935 } 6413 }
5936 6414
5937 public LSL_Integer llGetFreeMemory() 6415 public virtual LSL_Integer llGetFreeMemory()
5938 { 6416 {
5939 m_host.AddScriptLPS(1); 6417 m_host.AddScriptLPS(1);
5940 // Make scripts designed for LSO happy 6418 // Make scripts designed for LSO happy
@@ -6051,7 +6529,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6051 SetParticleSystem(m_host, rules); 6529 SetParticleSystem(m_host, rules);
6052 } 6530 }
6053 6531
6054 private void SetParticleSystem(SceneObjectPart part, LSL_List rules) { 6532 private void SetParticleSystem(SceneObjectPart part, LSL_List rules)
6533 {
6055 6534
6056 6535
6057 if (rules.Length == 0) 6536 if (rules.Length == 0)
@@ -6245,14 +6724,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6245 6724
6246 protected UUID GetTaskInventoryItem(string name) 6725 protected UUID GetTaskInventoryItem(string name)
6247 { 6726 {
6248 lock (m_host.TaskInventory) 6727 m_host.TaskInventory.LockItemsForRead(true);
6728 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6249 { 6729 {
6250 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6730 if (inv.Value.Name == name)
6251 { 6731 {
6252 if (inv.Value.Name == name) 6732 m_host.TaskInventory.LockItemsForRead(false);
6253 return inv.Key; 6733 return inv.Key;
6254 } 6734 }
6255 } 6735 }
6736 m_host.TaskInventory.LockItemsForRead(false);
6256 6737
6257 return UUID.Zero; 6738 return UUID.Zero;
6258 } 6739 }
@@ -6290,16 +6771,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6290 if (folderID == UUID.Zero) 6771 if (folderID == UUID.Zero)
6291 return; 6772 return;
6292 6773
6293 byte[] bucket = new byte[17]; 6774 byte[] bucket = new byte[1];
6294 bucket[0] = (byte)AssetType.Folder; 6775 bucket[0] = (byte)AssetType.Folder;
6295 byte[] objBytes = folderID.GetBytes(); 6776 //byte[] objBytes = folderID.GetBytes();
6296 Array.Copy(objBytes, 0, bucket, 1, 16); 6777 //Array.Copy(objBytes, 0, bucket, 1, 16);
6297 6778
6298 GridInstantMessage msg = new GridInstantMessage(World, 6779 GridInstantMessage msg = new GridInstantMessage(World,
6299 m_host.UUID, m_host.Name+", an object owned by "+ 6780 m_host.OwnerID, m_host.Name, destID,
6300 resolveName(m_host.OwnerID)+",", destID, 6781 (byte)InstantMessageDialog.TaskInventoryOffered,
6301 (byte)InstantMessageDialog.InventoryOffered, 6782 false, category+". "+m_host.Name+" is located at "+
6302 false, category+"\n"+m_host.Name+" is located at "+
6303 World.RegionInfo.RegionName+" "+ 6783 World.RegionInfo.RegionName+" "+
6304 m_host.AbsolutePosition.ToString(), 6784 m_host.AbsolutePosition.ToString(),
6305 folderID, true, m_host.AbsolutePosition, 6785 folderID, true, m_host.AbsolutePosition,
@@ -6537,13 +7017,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6537 UUID av = new UUID(); 7017 UUID av = new UUID();
6538 if (!UUID.TryParse(avatar,out av)) 7018 if (!UUID.TryParse(avatar,out av))
6539 { 7019 {
6540 LSLError("First parameter to llDialog needs to be a key"); 7020 //LSLError("First parameter to llDialog needs to be a key");
6541 return; 7021 return;
6542 } 7022 }
6543 if (buttons.Length < 1) 7023 if (buttons.Length < 1)
6544 { 7024 {
6545 LSLError("No less than 1 button can be shown"); 7025 buttons.Add("OK");
6546 return;
6547 } 7026 }
6548 if (buttons.Length > 12) 7027 if (buttons.Length > 12)
6549 { 7028 {
@@ -6560,7 +7039,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6560 } 7039 }
6561 if (buttons.Data[i].ToString().Length > 24) 7040 if (buttons.Data[i].ToString().Length > 24)
6562 { 7041 {
6563 LSLError("button label cannot be longer than 24 characters"); 7042 llWhisper(ScriptBaseClass.DEBUG_CHANNEL, "button label cannot be longer than 24 characters");
6564 return; 7043 return;
6565 } 7044 }
6566 buts[i] = buttons.Data[i].ToString(); 7045 buts[i] = buttons.Data[i].ToString();
@@ -6619,22 +7098,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6619 } 7098 }
6620 7099
6621 // copy the first script found with this inventory name 7100 // copy the first script found with this inventory name
6622 lock (m_host.TaskInventory) 7101 TaskInventoryItem scriptItem = null;
7102 m_host.TaskInventory.LockItemsForRead(true);
7103 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6623 { 7104 {
6624 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 7105 if (inv.Value.Name == name)
6625 { 7106 {
6626 if (inv.Value.Name == name) 7107 // make sure the object is a script
7108 if (10 == inv.Value.Type)
6627 { 7109 {
6628 // make sure the object is a script 7110 found = true;
6629 if (10 == inv.Value.Type) 7111 srcId = inv.Key;
6630 { 7112 scriptItem = inv.Value;
6631 found = true; 7113 break;
6632 srcId = inv.Key;
6633 break;
6634 }
6635 } 7114 }
6636 } 7115 }
6637 } 7116 }
7117 m_host.TaskInventory.LockItemsForRead(false);
6638 7118
6639 if (!found) 7119 if (!found)
6640 { 7120 {
@@ -6642,9 +7122,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6642 return; 7122 return;
6643 } 7123 }
6644 7124
6645 // the rest of the permission checks are done in RezScript, so check the pin there as well 7125 SceneObjectPart dest = World.GetSceneObjectPart(destId);
6646 World.RezScriptFromPrim(srcId, m_host, destId, pin, running, start_param); 7126 if (dest != null)
7127 {
7128 if ((scriptItem.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID)
7129 {
7130 // the rest of the permission checks are done in RezScript, so check the pin there as well
7131 World.RezScriptFromPrim(srcId, m_host, destId, pin, running, start_param);
6647 7132
7133 if ((scriptItem.BasePermissions & (uint)PermissionMask.Copy) == 0)
7134 m_host.Inventory.RemoveInventoryItem(srcId);
7135 }
7136 }
6648 // this will cause the delay even if the script pin or permissions were wrong - seems ok 7137 // this will cause the delay even if the script pin or permissions were wrong - seems ok
6649 ScriptSleep(3000); 7138 ScriptSleep(3000);
6650 } 7139 }
@@ -6707,19 +7196,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6707 public LSL_String llMD5String(string src, int nonce) 7196 public LSL_String llMD5String(string src, int nonce)
6708 { 7197 {
6709 m_host.AddScriptLPS(1); 7198 m_host.AddScriptLPS(1);
6710 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString())); 7199 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()), Encoding.UTF8);
6711 } 7200 }
6712 7201
6713 public LSL_String llSHA1String(string src) 7202 public LSL_String llSHA1String(string src)
6714 { 7203 {
6715 m_host.AddScriptLPS(1); 7204 m_host.AddScriptLPS(1);
6716 return Util.SHA1Hash(src).ToLower(); 7205 return Util.SHA1Hash(src, Encoding.UTF8).ToLower();
6717 } 7206 }
6718 7207
6719 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) 7208 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve)
6720 { 7209 {
6721 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7210 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6722 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7211 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7212 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7213 return shapeBlock;
6723 7214
6724 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 7215 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6725 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 7216 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6824,6 +7315,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6824 // Prim type box, cylinder and prism. 7315 // Prim type box, cylinder and prism.
6825 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) 7316 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)
6826 { 7317 {
7318 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7319 return;
7320
6827 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7321 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6828 ObjectShapePacket.ObjectDataBlock shapeBlock; 7322 ObjectShapePacket.ObjectDataBlock shapeBlock;
6829 7323
@@ -6877,6 +7371,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6877 // Prim type sphere. 7371 // Prim type sphere.
6878 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve) 7372 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve)
6879 { 7373 {
7374 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7375 return;
7376
6880 ObjectShapePacket.ObjectDataBlock shapeBlock; 7377 ObjectShapePacket.ObjectDataBlock shapeBlock;
6881 7378
6882 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve); 7379 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve);
@@ -6918,6 +7415,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6918 // Prim type torus, tube and ring. 7415 // Prim type torus, tube and ring.
6919 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) 7416 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)
6920 { 7417 {
7418 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7419 return;
7420
6921 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7421 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6922 ObjectShapePacket.ObjectDataBlock shapeBlock; 7422 ObjectShapePacket.ObjectDataBlock shapeBlock;
6923 7423
@@ -7053,6 +7553,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7053 // Prim type sculpt. 7553 // Prim type sculpt.
7054 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve) 7554 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve)
7055 { 7555 {
7556 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7557 return;
7558
7056 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7559 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7057 UUID sculptId; 7560 UUID sculptId;
7058 7561
@@ -7077,7 +7580,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7077 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag)) 7580 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag))
7078 { 7581 {
7079 // default 7582 // default
7080 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7583 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
7081 } 7584 }
7082 7585
7083 part.Shape.SetSculptProperties((byte)type, sculptId); 7586 part.Shape.SetSculptProperties((byte)type, sculptId);
@@ -7093,32 +7596,119 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7093 ScriptSleep(200); 7596 ScriptSleep(200);
7094 } 7597 }
7095 7598
7096 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) 7599 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
7097 { 7600 {
7098 m_host.AddScriptLPS(1); 7601 m_host.AddScriptLPS(1);
7099 7602
7100 setLinkPrimParams(linknumber, rules); 7603 setLinkPrimParams(linknumber, rules);
7101
7102 ScriptSleep(200);
7103 } 7604 }
7104 7605
7105 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7606 private void setLinkPrimParams(int linknumber, LSL_List rules)
7106 { 7607 {
7107 m_host.AddScriptLPS(1); 7608 List<SceneObjectPart> parts = GetLinkParts(linknumber);
7609 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7610 if (parts.Count>0)
7611 {
7612 try
7613 {
7614 parts[0].ParentGroup.areUpdatesSuspended = true;
7615 foreach (SceneObjectPart part in parts)
7616 SetPrimParams(part, rules);
7617 }
7618 finally
7619 {
7620 parts[0].ParentGroup.areUpdatesSuspended = false;
7621 }
7622 }
7623 if (avatars.Count > 0)
7624 {
7625 foreach (ScenePresence avatar in avatars)
7626 SetPrimParams(avatar, rules);
7627 }
7628 }
7108 7629
7109 setLinkPrimParams(linknumber, rules); 7630 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7631 {
7632 llSetLinkPrimitiveParamsFast(linknumber, rules);
7633 ScriptSleep(200);
7110 } 7634 }
7111 7635
7112 protected void setLinkPrimParams(int linknumber, LSL_List rules) 7636 protected void SetPrimParams(ScenePresence av, LSL_List rules)
7113 { 7637 {
7114 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7638 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
7639 //We only support PRIM_POSITION and PRIM_ROTATION
7115 7640
7116 foreach (SceneObjectPart part in parts) 7641 int idx = 0;
7117 SetPrimParams(part, rules); 7642
7643 while (idx < rules.Length)
7644 {
7645 int code = rules.GetLSLIntegerItem(idx++);
7646
7647 int remain = rules.Length - idx;
7648
7649 switch (code)
7650 {
7651 case (int)ScriptBaseClass.PRIM_POSITION:
7652 {
7653 if (remain < 1)
7654 return;
7655 LSL_Vector v;
7656 v = rules.GetVector3Item(idx++);
7657
7658 SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
7659 if (part == null)
7660 break;
7661
7662 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
7663 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
7664 if (llGetLinkNumber() > 1)
7665 {
7666 localRot = llGetLocalRot();
7667 localPos = llGetLocalPos();
7668 }
7669
7670 v -= localPos;
7671 v /= localRot;
7672
7673 LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
7674
7675 v = v + 2 * sitOffset;
7676
7677 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
7678 av.SendAvatarDataToAllAgents();
7679
7680 }
7681 break;
7682
7683 case (int)ScriptBaseClass.PRIM_ROTATION:
7684 {
7685 if (remain < 1)
7686 return;
7687
7688 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
7689 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
7690 if (llGetLinkNumber() > 1)
7691 {
7692 localRot = llGetLocalRot();
7693 localPos = llGetLocalPos();
7694 }
7695
7696 LSL_Rotation r;
7697 r = rules.GetQuaternionItem(idx++);
7698 r = r * llGetRootRotation() / localRot;
7699 av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
7700 av.SendAvatarDataToAllAgents();
7701 }
7702 break;
7703 }
7704 }
7118 } 7705 }
7119 7706
7120 protected void SetPrimParams(SceneObjectPart part, LSL_List rules) 7707 protected void SetPrimParams(SceneObjectPart part, LSL_List rules)
7121 { 7708 {
7709 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7710 return;
7711
7122 int idx = 0; 7712 int idx = 0;
7123 7713
7124 bool positionChanged = false; 7714 bool positionChanged = false;
@@ -7146,6 +7736,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7146 currentPosition = GetSetPosTarget(part, v, currentPosition); 7736 currentPosition = GetSetPosTarget(part, v, currentPosition);
7147 7737
7148 break; 7738 break;
7739 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
7740 if (remain < 1)
7741 return;
7742
7743 v=rules.GetVector3Item(idx++);
7744 positionChanged = true;
7745 currentPosition = GetSetPosTarget(part, v, currentPosition);
7746
7747 break;
7149 case (int)ScriptBaseClass.PRIM_SIZE: 7748 case (int)ScriptBaseClass.PRIM_SIZE:
7150 if (remain < 1) 7749 if (remain < 1)
7151 return; 7750 return;
@@ -7512,7 +8111,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7512 if (part.ParentGroup.RootPart == part) 8111 if (part.ParentGroup.RootPart == part)
7513 { 8112 {
7514 SceneObjectGroup parent = part.ParentGroup; 8113 SceneObjectGroup parent = part.ParentGroup;
7515 parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z)); 8114 Util.FireAndForget(delegate(object x) {
8115 parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z));
8116 });
7516 } 8117 }
7517 else 8118 else
7518 { 8119 {
@@ -7523,6 +8124,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7523 } 8124 }
7524 } 8125 }
7525 } 8126 }
8127
8128 if (positionChanged)
8129 {
8130 if (part.ParentGroup.RootPart == part)
8131 {
8132 SceneObjectGroup parent = part.ParentGroup;
8133 Util.FireAndForget(delegate(object x) {
8134 parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z));
8135 });
8136 }
8137 else
8138 {
8139 part.OffsetPosition = new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z);
8140 SceneObjectGroup parent = part.ParentGroup;
8141 parent.HasGroupChanged = true;
8142 parent.ScheduleGroupForTerseUpdate();
8143 }
8144 }
7526 } 8145 }
7527 8146
7528 public LSL_String llStringToBase64(string str) 8147 public LSL_String llStringToBase64(string str)
@@ -7683,13 +8302,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7683 public LSL_Integer llGetNumberOfPrims() 8302 public LSL_Integer llGetNumberOfPrims()
7684 { 8303 {
7685 m_host.AddScriptLPS(1); 8304 m_host.AddScriptLPS(1);
7686 int avatarCount = 0; 8305 int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
7687 World.ForEachRootScenePresence(delegate(ScenePresence presence) 8306
7688 {
7689 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
7690 avatarCount++;
7691 });
7692
7693 return m_host.ParentGroup.PrimCount + avatarCount; 8307 return m_host.ParentGroup.PrimCount + avatarCount;
7694 } 8308 }
7695 8309
@@ -7705,55 +8319,98 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7705 m_host.AddScriptLPS(1); 8319 m_host.AddScriptLPS(1);
7706 UUID objID = UUID.Zero; 8320 UUID objID = UUID.Zero;
7707 LSL_List result = new LSL_List(); 8321 LSL_List result = new LSL_List();
8322
8323 // If the ID is not valid, return null result
7708 if (!UUID.TryParse(obj, out objID)) 8324 if (!UUID.TryParse(obj, out objID))
7709 { 8325 {
7710 result.Add(new LSL_Vector()); 8326 result.Add(new LSL_Vector());
7711 result.Add(new LSL_Vector()); 8327 result.Add(new LSL_Vector());
7712 return result; 8328 return result;
7713 } 8329 }
8330
8331 // Check if this is an attached prim. If so, replace
8332 // the UUID with the avatar UUID and report it's bounding box
8333 SceneObjectPart part = World.GetSceneObjectPart(objID);
8334 if (part != null && part.ParentGroup.IsAttachment)
8335 objID = part.ParentGroup.AttachedAvatar;
8336
8337 // Find out if this is an avatar ID. If so, return it's box
7714 ScenePresence presence = World.GetScenePresence(objID); 8338 ScenePresence presence = World.GetScenePresence(objID);
7715 if (presence != null) 8339 if (presence != null)
7716 { 8340 {
7717 if (presence.ParentID == 0) // not sat on an object 8341 // As per LSL Wiki, there is no difference between sitting
8342 // and standing avatar since server 1.36
8343 LSL_Vector lower;
8344 LSL_Vector upper;
8345 if (presence.Animator.Animations.DefaultAnimation.AnimID
8346 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
7718 { 8347 {
7719 LSL_Vector lower; 8348 // This is for ground sitting avatars
7720 LSL_Vector upper; 8349 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7721 if (presence.Animator.Animations.DefaultAnimation.AnimID 8350 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7722 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 8351 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7723 {
7724 // This is for ground sitting avatars
7725 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7726 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7727 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7728 }
7729 else
7730 {
7731 // This is for standing/flying avatars
7732 float height = presence.Appearance.AvatarHeight / 2.0f;
7733 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7734 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7735 }
7736 result.Add(lower);
7737 result.Add(upper);
7738 return result;
7739 } 8352 }
7740 else 8353 else
7741 { 8354 {
7742 // sitting on an object so we need the bounding box of that 8355 // This is for standing/flying avatars
7743 // which should include the avatar so set the UUID to the 8356 float height = presence.Appearance.AvatarHeight / 2.0f;
7744 // UUID of the object the avatar is sat on and allow it to fall through 8357 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7745 // to processing an object 8358 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7746 SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
7747 objID = p.UUID;
7748 } 8359 }
8360
8361 // Adjust to the documented error offsets (see LSL Wiki)
8362 lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
8363 upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
8364
8365 if (lower.x > upper.x)
8366 lower.x = upper.x;
8367 if (lower.y > upper.y)
8368 lower.y = upper.y;
8369 if (lower.z > upper.z)
8370 lower.z = upper.z;
8371
8372 result.Add(lower);
8373 result.Add(upper);
8374 return result;
7749 } 8375 }
7750 SceneObjectPart part = World.GetSceneObjectPart(objID); 8376
8377 part = World.GetSceneObjectPart(objID);
7751 // Currently only works for single prims without a sitting avatar 8378 // Currently only works for single prims without a sitting avatar
7752 if (part != null) 8379 if (part != null)
7753 { 8380 {
7754 Vector3 halfSize = part.Scale / 2.0f; 8381 float minX;
7755 LSL_Vector lower = new LSL_Vector(halfSize.X * -1.0f, halfSize.Y * -1.0f, halfSize.Z * -1.0f); 8382 float maxX;
7756 LSL_Vector upper = new LSL_Vector(halfSize.X, halfSize.Y, halfSize.Z); 8383 float minY;
8384 float maxY;
8385 float minZ;
8386 float maxZ;
8387
8388 // This BBox is in sim coordinates, with the offset being
8389 // a contained point.
8390 Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
8391 out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
8392
8393 minX -= offsets[0].X;
8394 maxX -= offsets[0].X;
8395 minY -= offsets[0].Y;
8396 maxY -= offsets[0].Y;
8397 minZ -= offsets[0].Z;
8398 maxZ -= offsets[0].Z;
8399
8400 LSL_Vector lower;
8401 LSL_Vector upper;
8402
8403 // Adjust to the documented error offsets (see LSL Wiki)
8404 lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
8405 upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
8406
8407 if (lower.x > upper.x)
8408 lower.x = upper.x;
8409 if (lower.y > upper.y)
8410 lower.y = upper.y;
8411 if (lower.z > upper.z)
8412 lower.z = upper.z;
8413
7757 result.Add(lower); 8414 result.Add(lower);
7758 result.Add(upper); 8415 result.Add(upper);
7759 return result; 8416 return result;
@@ -7833,13 +8490,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7833 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X, 8490 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
7834 part.AbsolutePosition.Y, 8491 part.AbsolutePosition.Y,
7835 part.AbsolutePosition.Z); 8492 part.AbsolutePosition.Z);
7836 // For some reason, the part.AbsolutePosition.* values do not change if the
7837 // linkset is rotated; they always reflect the child prim's world position
7838 // as though the linkset is unrotated. This is incompatible behavior with SL's
7839 // implementation, so will break scripts imported from there (not to mention it
7840 // makes it more difficult to determine a child prim's actual inworld position).
7841 if (part.ParentID != 0)
7842 v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition();
7843 res.Add(v); 8493 res.Add(v);
7844 break; 8494 break;
7845 8495
@@ -8010,56 +8660,92 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8010 case (int)ScriptBaseClass.PRIM_BUMP_SHINY: 8660 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
8011 if (remain < 1) 8661 if (remain < 1)
8012 return res; 8662 return res;
8013 8663 face = (int)rules.GetLSLIntegerItem(idx++);
8014 face=(int)rules.GetLSLIntegerItem(idx++);
8015 8664
8016 tex = part.Shape.Textures; 8665 tex = part.Shape.Textures;
8666 int shiny;
8017 if (face == ScriptBaseClass.ALL_SIDES) 8667 if (face == ScriptBaseClass.ALL_SIDES)
8018 { 8668 {
8019 for (face = 0; face < GetNumberOfSides(part); face++) 8669 for (face = 0; face < GetNumberOfSides(part); face++)
8020 { 8670 {
8021 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8671 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8022 // Convert Shininess to PRIM_SHINY_* 8672 if (shinyness == Shininess.High)
8023 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 8673 {
8024 // PRIM_BUMP_* 8674 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8025 res.Add(new LSL_Integer((int)texface.Bump)); 8675 }
8676 else if (shinyness == Shininess.Medium)
8677 {
8678 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8679 }
8680 else if (shinyness == Shininess.Low)
8681 {
8682 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8683 }
8684 else
8685 {
8686 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8687 }
8688 res.Add(new LSL_Integer(shiny));
8689 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8026 } 8690 }
8027 } 8691 }
8028 else 8692 else
8029 { 8693 {
8030 if (face >= 0 && face < GetNumberOfSides(part)) 8694 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8695 if (shinyness == Shininess.High)
8031 { 8696 {
8032 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8697 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8033 // Convert Shininess to PRIM_SHINY_* 8698 }
8034 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 8699 else if (shinyness == Shininess.Medium)
8035 // PRIM_BUMP_* 8700 {
8036 res.Add(new LSL_Integer((int)texface.Bump)); 8701 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8037 } 8702 }
8703 else if (shinyness == Shininess.Low)
8704 {
8705 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8706 }
8707 else
8708 {
8709 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8710 }
8711 res.Add(new LSL_Integer(shiny));
8712 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8038 } 8713 }
8039 break; 8714 break;
8040 8715
8041 case (int)ScriptBaseClass.PRIM_FULLBRIGHT: 8716 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
8042 if (remain < 1) 8717 if (remain < 1)
8043 return res; 8718 return res;
8044 8719 face = (int)rules.GetLSLIntegerItem(idx++);
8045 face=(int)rules.GetLSLIntegerItem(idx++);
8046 8720
8047 tex = part.Shape.Textures; 8721 tex = part.Shape.Textures;
8722 int fullbright;
8048 if (face == ScriptBaseClass.ALL_SIDES) 8723 if (face == ScriptBaseClass.ALL_SIDES)
8049 { 8724 {
8050 for (face = 0; face < GetNumberOfSides(part); face++) 8725 for (face = 0; face < GetNumberOfSides(part); face++)
8051 { 8726 {
8052 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8727 if (tex.GetFace((uint)face).Fullbright == true)
8053 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 8728 {
8729 fullbright = ScriptBaseClass.TRUE;
8730 }
8731 else
8732 {
8733 fullbright = ScriptBaseClass.FALSE;
8734 }
8735 res.Add(new LSL_Integer(fullbright));
8054 } 8736 }
8055 } 8737 }
8056 else 8738 else
8057 { 8739 {
8058 if (face >= 0 && face < GetNumberOfSides(part)) 8740 if (tex.GetFace((uint)face).Fullbright == true)
8059 { 8741 {
8060 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8742 fullbright = ScriptBaseClass.TRUE;
8061 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0));
8062 } 8743 }
8744 else
8745 {
8746 fullbright = ScriptBaseClass.FALSE;
8747 }
8748 res.Add(new LSL_Integer(fullbright));
8063 } 8749 }
8064 break; 8750 break;
8065 8751
@@ -8081,27 +8767,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8081 break; 8767 break;
8082 8768
8083 case (int)ScriptBaseClass.PRIM_TEXGEN: 8769 case (int)ScriptBaseClass.PRIM_TEXGEN:
8770 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
8084 if (remain < 1) 8771 if (remain < 1)
8085 return res; 8772 return res;
8086 8773 face = (int)rules.GetLSLIntegerItem(idx++);
8087 face=(int)rules.GetLSLIntegerItem(idx++);
8088 8774
8089 tex = part.Shape.Textures; 8775 tex = part.Shape.Textures;
8090 if (face == ScriptBaseClass.ALL_SIDES) 8776 if (face == ScriptBaseClass.ALL_SIDES)
8091 { 8777 {
8092 for (face = 0; face < GetNumberOfSides(part); face++) 8778 for (face = 0; face < GetNumberOfSides(part); face++)
8093 { 8779 {
8094 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8780 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8095 // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc. 8781 {
8096 res.Add(new LSL_Integer((uint)texgen >> 1)); 8782 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8783 }
8784 else
8785 {
8786 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8787 }
8097 } 8788 }
8098 } 8789 }
8099 else 8790 else
8100 { 8791 {
8101 if (face >= 0 && face < GetNumberOfSides(part)) 8792 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8102 { 8793 {
8103 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8794 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8104 res.Add(new LSL_Integer((uint)texgen >> 1)); 8795 }
8796 else
8797 {
8798 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8105 } 8799 }
8106 } 8800 }
8107 break; 8801 break;
@@ -8124,28 +8818,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8124 case (int)ScriptBaseClass.PRIM_GLOW: 8818 case (int)ScriptBaseClass.PRIM_GLOW:
8125 if (remain < 1) 8819 if (remain < 1)
8126 return res; 8820 return res;
8127 8821 face = (int)rules.GetLSLIntegerItem(idx++);
8128 face=(int)rules.GetLSLIntegerItem(idx++);
8129 8822
8130 tex = part.Shape.Textures; 8823 tex = part.Shape.Textures;
8824 float primglow;
8131 if (face == ScriptBaseClass.ALL_SIDES) 8825 if (face == ScriptBaseClass.ALL_SIDES)
8132 { 8826 {
8133 for (face = 0; face < GetNumberOfSides(part); face++) 8827 for (face = 0; face < GetNumberOfSides(part); face++)
8134 { 8828 {
8135 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8829 primglow = tex.GetFace((uint)face).Glow;
8136 res.Add(new LSL_Float(texface.Glow)); 8830 res.Add(new LSL_Float(primglow));
8137 } 8831 }
8138 } 8832 }
8139 else 8833 else
8140 { 8834 {
8141 if (face >= 0 && face < GetNumberOfSides(part)) 8835 primglow = tex.GetFace((uint)face).Glow;
8142 { 8836 res.Add(new LSL_Float(primglow));
8143 Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
8144 res.Add(new LSL_Float(texface.Glow));
8145 }
8146 } 8837 }
8147 break; 8838 break;
8148
8149 case (int)ScriptBaseClass.PRIM_TEXT: 8839 case (int)ScriptBaseClass.PRIM_TEXT:
8150 Color4 textColor = part.GetTextColor(); 8840 Color4 textColor = part.GetTextColor();
8151 res.Add(new LSL_String(part.Text)); 8841 res.Add(new LSL_String(part.Text));
@@ -8757,8 +9447,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8757 // The function returns an ordered list 9447 // The function returns an ordered list
8758 // representing the tokens found in the supplied 9448 // representing the tokens found in the supplied
8759 // sources string. If two successive tokenizers 9449 // sources string. If two successive tokenizers
8760 // are encountered, then a NULL entry is added 9450 // are encountered, then a null-string entry is
8761 // to the list. 9451 // added to the list.
8762 // 9452 //
8763 // It is a precondition that the source and 9453 // It is a precondition that the source and
8764 // toekizer lisst are non-null. If they are null, 9454 // toekizer lisst are non-null. If they are null,
@@ -8766,7 +9456,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8766 // while their lengths are being determined. 9456 // while their lengths are being determined.
8767 // 9457 //
8768 // A small amount of working memoryis required 9458 // A small amount of working memoryis required
8769 // of approximately 8*#tokenizers. 9459 // of approximately 8*#tokenizers + 8*srcstrlen.
8770 // 9460 //
8771 // There are many ways in which this function 9461 // There are many ways in which this function
8772 // can be implemented, this implementation is 9462 // can be implemented, this implementation is
@@ -8782,155 +9472,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8782 // and eliminates redundant tokenizers as soon 9472 // and eliminates redundant tokenizers as soon
8783 // as is possible. 9473 // as is possible.
8784 // 9474 //
8785 // The implementation tries to avoid any copying 9475 // The implementation tries to minimize temporary
8786 // of arrays or other objects. 9476 // garbage generation.
8787 // </remarks> 9477 // </remarks>
8788 9478
8789 private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) 9479 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8790 { 9480 {
8791 int beginning = 0; 9481 return ParseString2List(src, separators, spacers, true);
8792 int srclen = src.Length; 9482 }
8793 int seplen = separators.Length;
8794 object[] separray = separators.Data;
8795 int spclen = spacers.Length;
8796 object[] spcarray = spacers.Data;
8797 int mlen = seplen+spclen;
8798
8799 int[] offset = new int[mlen+1];
8800 bool[] active = new bool[mlen];
8801
8802 int best;
8803 int j;
8804
8805 // Initial capacity reduces resize cost
8806 9483
8807 LSL_List tokens = new LSL_List(); 9484 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
9485 {
9486 int srclen = src.Length;
9487 int seplen = separators.Length;
9488 object[] separray = separators.Data;
9489 int spclen = spacers.Length;
9490 object[] spcarray = spacers.Data;
9491 int dellen = 0;
9492 string[] delarray = new string[seplen+spclen];
8808 9493
8809 // All entries are initially valid 9494 int outlen = 0;
9495 string[] outarray = new string[srclen*2+1];
8810 9496
8811 for (int i = 0; i < mlen; i++) 9497 int i, j;
8812 active[i] = true; 9498 string d;
8813 9499
8814 offset[mlen] = srclen; 9500 m_host.AddScriptLPS(1);
8815 9501
8816 while (beginning < srclen) 9502 /*
9503 * Convert separator and spacer lists to C# strings.
9504 * Also filter out null strings so we don't hang.
9505 */
9506 for (i = 0; i < seplen; i ++)
8817 { 9507 {
9508 d = separray[i].ToString();
9509 if (d.Length > 0)
9510 {
9511 delarray[dellen++] = d;
9512 }
9513 }
9514 seplen = dellen;
8818 9515
8819 best = mlen; // as bad as it gets 9516 for (i = 0; i < spclen; i ++)
9517 {
9518 d = spcarray[i].ToString();
9519 if (d.Length > 0)
9520 {
9521 delarray[dellen++] = d;
9522 }
9523 }
8820 9524
8821 // Scan for separators 9525 /*
9526 * Scan through source string from beginning to end.
9527 */
9528 for (i = 0;;)
9529 {
8822 9530
8823 for (j = 0; j < seplen; j++) 9531 /*
9532 * Find earliest delimeter in src starting at i (if any).
9533 */
9534 int earliestDel = -1;
9535 int earliestSrc = srclen;
9536 string earliestStr = null;
9537 for (j = 0; j < dellen; j ++)
8824 { 9538 {
8825 if (separray[j].ToString() == String.Empty) 9539 d = delarray[j];
8826 active[j] = false; 9540 if (d != null)
8827
8828 if (active[j])
8829 { 9541 {
8830 // scan all of the markers 9542 int index = src.IndexOf(d, i);
8831 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) 9543 if (index < 0)
8832 { 9544 {
8833 // not present at all 9545 delarray[j] = null; // delim nowhere in src, don't check it anymore
8834 active[j] = false;
8835 } 9546 }
8836 else 9547 else if (index < earliestSrc)
8837 { 9548 {
8838 // present and correct 9549 earliestSrc = index; // where delimeter starts in source string
8839 if (offset[j] < offset[best]) 9550 earliestDel = j; // where delimeter is in delarray[]
8840 { 9551 earliestStr = d; // the delimeter string from delarray[]
8841 // closest so far 9552 if (index == i) break; // can't do any better than found at beg of string
8842 best = j;
8843 if (offset[best] == beginning)
8844 break;
8845 }
8846 } 9553 }
8847 } 9554 }
8848 } 9555 }
8849 9556
8850 // Scan for spacers 9557 /*
8851 9558 * Output source string starting at i through start of earliest delimeter.
8852 if (offset[best] != beginning) 9559 */
9560 if (keepNulls || (earliestSrc > i))
8853 { 9561 {
8854 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 9562 outarray[outlen++] = src.Substring(i, earliestSrc - i);
8855 {
8856 if (spcarray[j-seplen].ToString() == String.Empty)
8857 active[j] = false;
8858
8859 if (active[j])
8860 {
8861 // scan all of the markers
8862 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
8863 {
8864 // not present at all
8865 active[j] = false;
8866 }
8867 else
8868 {
8869 // present and correct
8870 if (offset[j] < offset[best])
8871 {
8872 // closest so far
8873 best = j;
8874 }
8875 }
8876 }
8877 }
8878 } 9563 }
8879 9564
8880 // This is the normal exit from the scanning loop 9565 /*
9566 * If no delimeter found at or after i, we're done scanning.
9567 */
9568 if (earliestDel < 0) break;
8881 9569
8882 if (best == mlen) 9570 /*
9571 * If delimeter was a spacer, output the spacer.
9572 */
9573 if (earliestDel >= seplen)
8883 { 9574 {
8884 // no markers were found on this pass 9575 outarray[outlen++] = earliestStr;
8885 // so we're pretty much done
8886 if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
8887 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
8888 break;
8889 } 9576 }
8890 9577
8891 // Otherwise we just add the newly delimited token 9578 /*
8892 // and recalculate where the search should continue. 9579 * Look at rest of src string following delimeter.
8893 if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) 9580 */
8894 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 9581 i = earliestSrc + earliestStr.Length;
8895
8896 if (best < seplen)
8897 {
8898 beginning = offset[best] + (separray[best].ToString()).Length;
8899 }
8900 else
8901 {
8902 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
8903 string str = spcarray[best - seplen].ToString();
8904 if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
8905 tokens.Add(new LSL_String(str));
8906 }
8907 } 9582 }
8908 9583
8909 // This an awkward an not very intuitive boundary case. If the 9584 /*
8910 // last substring is a tokenizer, then there is an implied trailing 9585 * Make up an exact-sized output array suitable for an LSL_List object.
8911 // null list entry. Hopefully the single comparison will not be too 9586 */
8912 // arduous. Alternatively the 'break' could be replced with a return 9587 object[] outlist = new object[outlen];
8913 // but that's shabby programming. 9588 for (i = 0; i < outlen; i ++)
8914
8915 if ((beginning == srclen) && (keepNulls))
8916 { 9589 {
8917 if (srclen != 0) 9590 outlist[i] = new LSL_String(outarray[i]);
8918 tokens.Add(new LSL_String(""));
8919 } 9591 }
8920 9592 return new LSL_List(outlist);
8921 return tokens;
8922 }
8923
8924 public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
8925 {
8926 m_host.AddScriptLPS(1);
8927 return this.ParseString(src, separators, spacers, false);
8928 }
8929
8930 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8931 {
8932 m_host.AddScriptLPS(1);
8933 return this.ParseString(src, separators, spacers, true);
8934 } 9593 }
8935 9594
8936 public LSL_Integer llGetObjectPermMask(int mask) 9595 public LSL_Integer llGetObjectPermMask(int mask)
@@ -9007,28 +9666,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9007 { 9666 {
9008 m_host.AddScriptLPS(1); 9667 m_host.AddScriptLPS(1);
9009 9668
9010 lock (m_host.TaskInventory) 9669 m_host.TaskInventory.LockItemsForRead(true);
9670 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9011 { 9671 {
9012 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9672 if (inv.Value.Name == item)
9013 { 9673 {
9014 if (inv.Value.Name == item) 9674 m_host.TaskInventory.LockItemsForRead(false);
9675 switch (mask)
9015 { 9676 {
9016 switch (mask) 9677 case 0:
9017 { 9678 return (int)inv.Value.BasePermissions;
9018 case 0: 9679 case 1:
9019 return (int)inv.Value.BasePermissions; 9680 return (int)inv.Value.CurrentPermissions;
9020 case 1: 9681 case 2:
9021 return (int)inv.Value.CurrentPermissions; 9682 return (int)inv.Value.GroupPermissions;
9022 case 2: 9683 case 3:
9023 return (int)inv.Value.GroupPermissions; 9684 return (int)inv.Value.EveryonePermissions;
9024 case 3: 9685 case 4:
9025 return (int)inv.Value.EveryonePermissions; 9686 return (int)inv.Value.NextPermissions;
9026 case 4:
9027 return (int)inv.Value.NextPermissions;
9028 }
9029 } 9687 }
9030 } 9688 }
9031 } 9689 }
9690 m_host.TaskInventory.LockItemsForRead(false);
9032 9691
9033 return -1; 9692 return -1;
9034 } 9693 }
@@ -9075,16 +9734,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9075 { 9734 {
9076 m_host.AddScriptLPS(1); 9735 m_host.AddScriptLPS(1);
9077 9736
9078 lock (m_host.TaskInventory) 9737 m_host.TaskInventory.LockItemsForRead(true);
9738 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9079 { 9739 {
9080 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9740 if (inv.Value.Name == item)
9081 { 9741 {
9082 if (inv.Value.Name == item) 9742 m_host.TaskInventory.LockItemsForRead(false);
9083 { 9743 return inv.Value.CreatorID.ToString();
9084 return inv.Value.CreatorID.ToString();
9085 }
9086 } 9744 }
9087 } 9745 }
9746 m_host.TaskInventory.LockItemsForRead(false);
9088 9747
9089 llSay(0, "No item name '" + item + "'"); 9748 llSay(0, "No item name '" + item + "'");
9090 9749
@@ -9232,7 +9891,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9232 } 9891 }
9233 9892
9234 /// <summary> 9893 /// <summary>
9235 /// illListReplaceList removes the sub-list defined by the inclusive indices 9894 /// llListReplaceList removes the sub-list defined by the inclusive indices
9236 /// start and end and inserts the src list in its place. The inclusive 9895 /// start and end and inserts the src list in its place. The inclusive
9237 /// nature of the indices means that at least one element must be deleted 9896 /// nature of the indices means that at least one element must be deleted
9238 /// if the indices are within the bounds of the existing list. I.e. 2,2 9897 /// if the indices are within the bounds of the existing list. I.e. 2,2
@@ -9289,16 +9948,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9289 // based upon end. Note that if end exceeds the upper 9948 // based upon end. Note that if end exceeds the upper
9290 // bound in this case, the entire destination list 9949 // bound in this case, the entire destination list
9291 // is removed. 9950 // is removed.
9292 else 9951 else if (start == 0)
9293 { 9952 {
9294 if (end + 1 < dest.Length) 9953 if (end + 1 < dest.Length)
9295 {
9296 return src + dest.GetSublist(end + 1, -1); 9954 return src + dest.GetSublist(end + 1, -1);
9297 }
9298 else 9955 else
9299 {
9300 return src; 9956 return src;
9301 } 9957 }
9958 else // Start < 0
9959 {
9960 if (end + 1 < dest.Length)
9961 return dest.GetSublist(end + 1, -1);
9962 else
9963 return new LSL_List();
9302 } 9964 }
9303 } 9965 }
9304 // Finally, if start > end, we strip away a prefix and 9966 // Finally, if start > end, we strip away a prefix and
@@ -9349,17 +10011,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9349 int width = 0; 10011 int width = 0;
9350 int height = 0; 10012 int height = 0;
9351 10013
9352 ParcelMediaCommandEnum? commandToSend = null; 10014 uint commandToSend = 0;
9353 float time = 0.0f; // default is from start 10015 float time = 0.0f; // default is from start
9354 10016
9355 ScenePresence presence = null; 10017 ScenePresence presence = null;
9356 10018
9357 for (int i = 0; i < commandList.Data.Length; i++) 10019 for (int i = 0; i < commandList.Data.Length; i++)
9358 { 10020 {
9359 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 10021 uint command = (uint)(commandList.GetLSLIntegerItem(i));
9360 switch (command) 10022 switch (command)
9361 { 10023 {
9362 case ParcelMediaCommandEnum.Agent: 10024 case (uint)ParcelMediaCommandEnum.Agent:
9363 // we send only to one agent 10025 // we send only to one agent
9364 if ((i + 1) < commandList.Length) 10026 if ((i + 1) < commandList.Length)
9365 { 10027 {
@@ -9376,25 +10038,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9376 } 10038 }
9377 break; 10039 break;
9378 10040
9379 case ParcelMediaCommandEnum.Loop: 10041 case (uint)ParcelMediaCommandEnum.Loop:
9380 loop = 1; 10042 loop = 1;
9381 commandToSend = command; 10043 commandToSend = command;
9382 update = true; //need to send the media update packet to set looping 10044 update = true; //need to send the media update packet to set looping
9383 break; 10045 break;
9384 10046
9385 case ParcelMediaCommandEnum.Play: 10047 case (uint)ParcelMediaCommandEnum.Play:
9386 loop = 0; 10048 loop = 0;
9387 commandToSend = command; 10049 commandToSend = command;
9388 update = true; //need to send the media update packet to make sure it doesn't loop 10050 update = true; //need to send the media update packet to make sure it doesn't loop
9389 break; 10051 break;
9390 10052
9391 case ParcelMediaCommandEnum.Pause: 10053 case (uint)ParcelMediaCommandEnum.Pause:
9392 case ParcelMediaCommandEnum.Stop: 10054 case (uint)ParcelMediaCommandEnum.Stop:
9393 case ParcelMediaCommandEnum.Unload: 10055 case (uint)ParcelMediaCommandEnum.Unload:
9394 commandToSend = command; 10056 commandToSend = command;
9395 break; 10057 break;
9396 10058
9397 case ParcelMediaCommandEnum.Url: 10059 case (uint)ParcelMediaCommandEnum.Url:
9398 if ((i + 1) < commandList.Length) 10060 if ((i + 1) < commandList.Length)
9399 { 10061 {
9400 if (commandList.Data[i + 1] is LSL_String) 10062 if (commandList.Data[i + 1] is LSL_String)
@@ -9407,7 +10069,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9407 } 10069 }
9408 break; 10070 break;
9409 10071
9410 case ParcelMediaCommandEnum.Texture: 10072 case (uint)ParcelMediaCommandEnum.Texture:
9411 if ((i + 1) < commandList.Length) 10073 if ((i + 1) < commandList.Length)
9412 { 10074 {
9413 if (commandList.Data[i + 1] is LSL_String) 10075 if (commandList.Data[i + 1] is LSL_String)
@@ -9420,7 +10082,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9420 } 10082 }
9421 break; 10083 break;
9422 10084
9423 case ParcelMediaCommandEnum.Time: 10085 case (uint)ParcelMediaCommandEnum.Time:
9424 if ((i + 1) < commandList.Length) 10086 if ((i + 1) < commandList.Length)
9425 { 10087 {
9426 if (commandList.Data[i + 1] is LSL_Float) 10088 if (commandList.Data[i + 1] is LSL_Float)
@@ -9432,7 +10094,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9432 } 10094 }
9433 break; 10095 break;
9434 10096
9435 case ParcelMediaCommandEnum.AutoAlign: 10097 case (uint)ParcelMediaCommandEnum.AutoAlign:
9436 if ((i + 1) < commandList.Length) 10098 if ((i + 1) < commandList.Length)
9437 { 10099 {
9438 if (commandList.Data[i + 1] is LSL_Integer) 10100 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9446,7 +10108,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9446 } 10108 }
9447 break; 10109 break;
9448 10110
9449 case ParcelMediaCommandEnum.Type: 10111 case (uint)ParcelMediaCommandEnum.Type:
9450 if ((i + 1) < commandList.Length) 10112 if ((i + 1) < commandList.Length)
9451 { 10113 {
9452 if (commandList.Data[i + 1] is LSL_String) 10114 if (commandList.Data[i + 1] is LSL_String)
@@ -9459,7 +10121,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9459 } 10121 }
9460 break; 10122 break;
9461 10123
9462 case ParcelMediaCommandEnum.Desc: 10124 case (uint)ParcelMediaCommandEnum.Desc:
9463 if ((i + 1) < commandList.Length) 10125 if ((i + 1) < commandList.Length)
9464 { 10126 {
9465 if (commandList.Data[i + 1] is LSL_String) 10127 if (commandList.Data[i + 1] is LSL_String)
@@ -9472,7 +10134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9472 } 10134 }
9473 break; 10135 break;
9474 10136
9475 case ParcelMediaCommandEnum.Size: 10137 case (uint)ParcelMediaCommandEnum.Size:
9476 if ((i + 2) < commandList.Length) 10138 if ((i + 2) < commandList.Length)
9477 { 10139 {
9478 if (commandList.Data[i + 1] is LSL_Integer) 10140 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9542,7 +10204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9542 } 10204 }
9543 } 10205 }
9544 10206
9545 if (commandToSend != null) 10207 if (commandToSend != 0)
9546 { 10208 {
9547 // the commandList contained a start/stop/... command, too 10209 // the commandList contained a start/stop/... command, too
9548 if (presence == null) 10210 if (presence == null)
@@ -9579,7 +10241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9579 10241
9580 if (aList.Data[i] != null) 10242 if (aList.Data[i] != null)
9581 { 10243 {
9582 switch ((ParcelMediaCommandEnum) aList.Data[i]) 10244 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
9583 { 10245 {
9584 case ParcelMediaCommandEnum.Url: 10246 case ParcelMediaCommandEnum.Url:
9585 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); 10247 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL));
@@ -9622,16 +10284,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9622 { 10284 {
9623 m_host.AddScriptLPS(1); 10285 m_host.AddScriptLPS(1);
9624 10286
9625 lock (m_host.TaskInventory) 10287 m_host.TaskInventory.LockItemsForRead(true);
10288 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9626 { 10289 {
9627 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 10290 if (inv.Value.Name == name)
9628 { 10291 {
9629 if (inv.Value.Name == name) 10292 m_host.TaskInventory.LockItemsForRead(false);
9630 { 10293 return inv.Value.Type;
9631 return inv.Value.Type;
9632 }
9633 } 10294 }
9634 } 10295 }
10296 m_host.TaskInventory.LockItemsForRead(false);
9635 10297
9636 return -1; 10298 return -1;
9637 } 10299 }
@@ -9642,15 +10304,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9642 10304
9643 if (quick_pay_buttons.Data.Length < 4) 10305 if (quick_pay_buttons.Data.Length < 4)
9644 { 10306 {
9645 LSLError("List must have at least 4 elements"); 10307 int x;
9646 return; 10308 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
10309 {
10310 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
10311 }
9647 } 10312 }
9648 m_host.ParentGroup.RootPart.PayPrice[0]=price; 10313 int[] nPrice = new int[5];
9649 10314 nPrice[0] = price;
9650 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 10315 nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
9651 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 10316 nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
9652 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 10317 nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
9653 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 10318 nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
10319 m_host.ParentGroup.RootPart.PayPrice = nPrice;
9654 m_host.ParentGroup.HasGroupChanged = true; 10320 m_host.ParentGroup.HasGroupChanged = true;
9655 } 10321 }
9656 10322
@@ -9662,17 +10328,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9662 if (invItemID == UUID.Zero) 10328 if (invItemID == UUID.Zero)
9663 return new LSL_Vector(); 10329 return new LSL_Vector();
9664 10330
9665 lock (m_host.TaskInventory) 10331 m_host.TaskInventory.LockItemsForRead(true);
10332 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9666 { 10333 {
9667 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 10334 m_host.TaskInventory.LockItemsForRead(false);
9668 return new LSL_Vector(); 10335 return new LSL_Vector();
10336 }
9669 10337
9670 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 10338 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9671 { 10339 {
9672 ShoutError("No permissions to track the camera"); 10340 ShoutError("No permissions to track the camera");
9673 return new LSL_Vector(); 10341 m_host.TaskInventory.LockItemsForRead(false);
9674 } 10342 return new LSL_Vector();
9675 } 10343 }
10344 m_host.TaskInventory.LockItemsForRead(false);
9676 10345
9677 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10346 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9678 if (presence != null) 10347 if (presence != null)
@@ -9690,17 +10359,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9690 if (invItemID == UUID.Zero) 10359 if (invItemID == UUID.Zero)
9691 return new LSL_Rotation(); 10360 return new LSL_Rotation();
9692 10361
9693 lock (m_host.TaskInventory) 10362 m_host.TaskInventory.LockItemsForRead(true);
10363 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9694 { 10364 {
9695 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 10365 m_host.TaskInventory.LockItemsForRead(false);
9696 return new LSL_Rotation(); 10366 return new LSL_Rotation();
9697 10367 }
9698 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 10368 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9699 { 10369 {
9700 ShoutError("No permissions to track the camera"); 10370 ShoutError("No permissions to track the camera");
9701 return new LSL_Rotation(); 10371 m_host.TaskInventory.LockItemsForRead(false);
9702 } 10372 return new LSL_Rotation();
9703 } 10373 }
10374 m_host.TaskInventory.LockItemsForRead(false);
9704 10375
9705 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10376 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9706 if (presence != null) 10377 if (presence != null)
@@ -9762,8 +10433,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9762 { 10433 {
9763 m_host.AddScriptLPS(1); 10434 m_host.AddScriptLPS(1);
9764 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0); 10435 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0);
9765 if (detectedParams == null) return; // only works on the first detected avatar 10436 if (detectedParams == null)
9766 10437 {
10438 if (m_host.ParentGroup.IsAttachment == true)
10439 {
10440 detectedParams = new DetectParams();
10441 detectedParams.Key = m_host.OwnerID;
10442 }
10443 else
10444 {
10445 return;
10446 }
10447 }
10448
9767 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 10449 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
9768 if (avatar != null) 10450 if (avatar != null)
9769 { 10451 {
@@ -9771,6 +10453,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9771 new Vector3((float)pos.x, (float)pos.y, (float)pos.z), 10453 new Vector3((float)pos.x, (float)pos.y, (float)pos.z),
9772 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z)); 10454 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z));
9773 } 10455 }
10456
9774 ScriptSleep(1000); 10457 ScriptSleep(1000);
9775 } 10458 }
9776 10459
@@ -9882,14 +10565,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9882 if (objectID == UUID.Zero) return; 10565 if (objectID == UUID.Zero) return;
9883 10566
9884 UUID agentID; 10567 UUID agentID;
9885 lock (m_host.TaskInventory) 10568 m_host.TaskInventory.LockItemsForRead(true);
9886 { 10569 // we need the permission first, to know which avatar we want to set the camera for
9887 // we need the permission first, to know which avatar we want to set the camera for 10570 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9888 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9889 10571
9890 if (agentID == UUID.Zero) return; 10572 if (agentID == UUID.Zero)
9891 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 10573 {
10574 m_host.TaskInventory.LockItemsForRead(false);
10575 return;
10576 }
10577 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10578 {
10579 m_host.TaskInventory.LockItemsForRead(false);
10580 return;
9892 } 10581 }
10582 m_host.TaskInventory.LockItemsForRead(false);
9893 10583
9894 ScenePresence presence = World.GetScenePresence(agentID); 10584 ScenePresence presence = World.GetScenePresence(agentID);
9895 10585
@@ -9898,12 +10588,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9898 10588
9899 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 10589 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
9900 object[] data = rules.Data; 10590 object[] data = rules.Data;
9901 for (int i = 0; i < data.Length; ++i) { 10591 for (int i = 0; i < data.Length; ++i)
10592 {
9902 int type = Convert.ToInt32(data[i++].ToString()); 10593 int type = Convert.ToInt32(data[i++].ToString());
9903 if (i >= data.Length) break; // odd number of entries => ignore the last 10594 if (i >= data.Length) break; // odd number of entries => ignore the last
9904 10595
9905 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 10596 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
9906 switch (type) { 10597 switch (type)
10598 {
9907 case ScriptBaseClass.CAMERA_FOCUS: 10599 case ScriptBaseClass.CAMERA_FOCUS:
9908 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 10600 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
9909 case ScriptBaseClass.CAMERA_POSITION: 10601 case ScriptBaseClass.CAMERA_POSITION:
@@ -9939,12 +10631,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9939 10631
9940 // we need the permission first, to know which avatar we want to clear the camera for 10632 // we need the permission first, to know which avatar we want to clear the camera for
9941 UUID agentID; 10633 UUID agentID;
9942 lock (m_host.TaskInventory) 10634 m_host.TaskInventory.LockItemsForRead(true);
10635 agentID = m_host.TaskInventory[invItemID].PermsGranter;
10636 if (agentID == UUID.Zero)
10637 {
10638 m_host.TaskInventory.LockItemsForRead(false);
10639 return;
10640 }
10641 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
9943 { 10642 {
9944 agentID = m_host.TaskInventory[invItemID].PermsGranter; 10643 m_host.TaskInventory.LockItemsForRead(false);
9945 if (agentID == UUID.Zero) return; 10644 return;
9946 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
9947 } 10645 }
10646 m_host.TaskInventory.LockItemsForRead(false);
9948 10647
9949 ScenePresence presence = World.GetScenePresence(agentID); 10648 ScenePresence presence = World.GetScenePresence(agentID);
9950 10649
@@ -10011,19 +10710,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10011 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 10710 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
10012 { 10711 {
10013 m_host.AddScriptLPS(1); 10712 m_host.AddScriptLPS(1);
10014 string ret = String.Empty; 10713
10015 string src1 = llBase64ToString(str1); 10714 if (str1 == String.Empty)
10016 string src2 = llBase64ToString(str2); 10715 return String.Empty;
10017 int c = 0; 10716 if (str2 == String.Empty)
10018 for (int i = 0; i < src1.Length; i++) 10717 return str1;
10718
10719 int len = str2.Length;
10720 if ((len % 4) != 0) // LL is EVIL!!!!
10019 { 10721 {
10020 ret += (char) (src1[i] ^ src2[c]); 10722 while (str2.EndsWith("="))
10723 str2 = str2.Substring(0, str2.Length - 1);
10724
10725 len = str2.Length;
10726 int mod = len % 4;
10021 10727
10022 c++; 10728 if (mod == 1)
10023 if (c >= src2.Length) 10729 str2 = str2.Substring(0, str2.Length - 1);
10024 c = 0; 10730 else if (mod == 2)
10731 str2 += "==";
10732 else if (mod == 3)
10733 str2 += "=";
10025 } 10734 }
10026 return llStringToBase64(ret); 10735
10736 byte[] data1;
10737 byte[] data2;
10738 try
10739 {
10740 data1 = Convert.FromBase64String(str1);
10741 data2 = Convert.FromBase64String(str2);
10742 }
10743 catch (Exception)
10744 {
10745 return new LSL_String(String.Empty);
10746 }
10747
10748 byte[] d2 = new Byte[data1.Length];
10749 int pos = 0;
10750
10751 if (data1.Length <= data2.Length)
10752 {
10753 Array.Copy(data2, 0, d2, 0, data1.Length);
10754 }
10755 else
10756 {
10757 while (pos < data1.Length)
10758 {
10759 len = data1.Length - pos;
10760 if (len > data2.Length)
10761 len = data2.Length;
10762
10763 Array.Copy(data2, 0, d2, pos, len);
10764 pos += len;
10765 }
10766 }
10767
10768 for (pos = 0 ; pos < data1.Length ; pos++ )
10769 data1[pos] ^= d2[pos];
10770
10771 return Convert.ToBase64String(data1);
10027 } 10772 }
10028 10773
10029 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 10774 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -10080,12 +10825,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10080 Regex r = new Regex(authregex); 10825 Regex r = new Regex(authregex);
10081 int[] gnums = r.GetGroupNumbers(); 10826 int[] gnums = r.GetGroupNumbers();
10082 Match m = r.Match(url); 10827 Match m = r.Match(url);
10083 if (m.Success) { 10828 if (m.Success)
10084 for (int i = 1; i < gnums.Length; i++) { 10829 {
10830 for (int i = 1; i < gnums.Length; i++)
10831 {
10085 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 10832 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
10086 //CaptureCollection cc = g.Captures; 10833 //CaptureCollection cc = g.Captures;
10087 } 10834 }
10088 if (m.Groups.Count == 5) { 10835 if (m.Groups.Count == 5)
10836 {
10089 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 10837 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
10090 url = m.Groups[1].ToString() + m.Groups[4].ToString(); 10838 url = m.Groups[1].ToString() + m.Groups[4].ToString();
10091 } 10839 }
@@ -10371,15 +11119,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10371 11119
10372 internal UUID ScriptByName(string name) 11120 internal UUID ScriptByName(string name)
10373 { 11121 {
10374 lock (m_host.TaskInventory) 11122 m_host.TaskInventory.LockItemsForRead(true);
11123
11124 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
10375 { 11125 {
10376 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 11126 if (item.Type == 10 && item.Name == name)
10377 { 11127 {
10378 if (item.Type == 10 && item.Name == name) 11128 m_host.TaskInventory.LockItemsForRead(false);
10379 return item.ItemID; 11129 return item.ItemID;
10380 } 11130 }
10381 } 11131 }
10382 11132
11133 m_host.TaskInventory.LockItemsForRead(false);
11134
10383 return UUID.Zero; 11135 return UUID.Zero;
10384 } 11136 }
10385 11137
@@ -10420,6 +11172,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10420 { 11172 {
10421 m_host.AddScriptLPS(1); 11173 m_host.AddScriptLPS(1);
10422 11174
11175 //Clone is thread safe
10423 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 11176 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10424 11177
10425 UUID assetID = UUID.Zero; 11178 UUID assetID = UUID.Zero;
@@ -10482,6 +11235,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10482 { 11235 {
10483 m_host.AddScriptLPS(1); 11236 m_host.AddScriptLPS(1);
10484 11237
11238 //Clone is thread safe
10485 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 11239 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10486 11240
10487 UUID assetID = UUID.Zero; 11241 UUID assetID = UUID.Zero;
@@ -10562,15 +11316,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10562 return GetLinkPrimitiveParams(obj, rules); 11316 return GetLinkPrimitiveParams(obj, rules);
10563 } 11317 }
10564 11318
10565 public void print(string str) 11319 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
10566 { 11320 {
10567 // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print 11321 List<SceneObjectPart> parts = GetLinkParts(link);
10568 IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_itemID, "OSSL"); 11322 if (parts.Count < 1)
10569 if (ossl != null) 11323 return 0;
10570 { 11324
10571 ossl.CheckThreatLevel(ThreatLevel.High, "print"); 11325 return GetNumberOfSides(parts[0]);
10572 m_log.Info("LSL print():" + str);
10573 }
10574 } 11326 }
10575 11327
10576 private string Name2Username(string name) 11328 private string Name2Username(string name)
@@ -10616,153 +11368,392 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10616 return rq.ToString(); 11368 return rq.ToString();
10617 } 11369 }
10618 11370
11371 private void SayShoutTimerElapsed(Object sender, ElapsedEventArgs args)
11372 {
11373 m_SayShoutCount = 0;
11374 }
11375
11376 private struct Tri
11377 {
11378 public Vector3 p1;
11379 public Vector3 p2;
11380 public Vector3 p3;
11381 }
11382
11383 private bool InBoundingBox(ScenePresence avatar, Vector3 point)
11384 {
11385 float height = avatar.Appearance.AvatarHeight;
11386 Vector3 b1 = avatar.AbsolutePosition + new Vector3(-0.22f, -0.22f, -height/2);
11387 Vector3 b2 = avatar.AbsolutePosition + new Vector3(0.22f, 0.22f, height/2);
11388
11389 if (point.X > b1.X && point.X < b2.X &&
11390 point.Y > b1.Y && point.Y < b2.Y &&
11391 point.Z > b1.Z && point.Z < b2.Z)
11392 return true;
11393 return false;
11394 }
11395
11396 private ContactResult[] AvatarIntersection(Vector3 rayStart, Vector3 rayEnd)
11397 {
11398 List<ContactResult> contacts = new List<ContactResult>();
11399
11400 Vector3 ab = rayEnd - rayStart;
11401
11402 World.ForEachScenePresence(delegate(ScenePresence sp)
11403 {
11404 Vector3 ac = sp.AbsolutePosition - rayStart;
11405 Vector3 bc = sp.AbsolutePosition - rayEnd;
11406
11407 double d = Math.Abs(Vector3.Mag(Vector3.Cross(ab, ac)) / Vector3.Distance(rayStart, rayEnd));
11408
11409 if (d > 1.5)
11410 return;
11411
11412 double d2 = Vector3.Dot(Vector3.Negate(ab), ac);
11413
11414 if (d2 > 0)
11415 return;
11416
11417 double dp = Math.Sqrt(Vector3.Mag(ac) * Vector3.Mag(ac) - d * d);
11418 Vector3 p = rayStart + Vector3.Divide(Vector3.Multiply(ab, (float)dp), (float)Vector3.Mag(ab));
11419
11420 if (!InBoundingBox(sp, p))
11421 return;
11422
11423 ContactResult result = new ContactResult ();
11424 result.ConsumerID = sp.LocalId;
11425 result.Depth = Vector3.Distance(rayStart, p);
11426 result.Normal = Vector3.Zero;
11427 result.Pos = p;
11428
11429 contacts.Add(result);
11430 });
11431
11432 return contacts.ToArray();
11433 }
11434
11435 private ContactResult[] ObjectIntersection(Vector3 rayStart, Vector3 rayEnd, bool includePhysical, bool includeNonPhysical, bool includePhantom)
11436 {
11437 Ray ray = new Ray(rayStart, Vector3.Normalize(rayEnd - rayStart));
11438 List<ContactResult> contacts = new List<ContactResult>();
11439
11440 Vector3 ab = rayEnd - rayStart;
11441
11442 World.ForEachSOG(delegate(SceneObjectGroup group)
11443 {
11444 if (m_host.ParentGroup == group)
11445 return;
11446
11447 if (group.IsAttachment)
11448 return;
11449
11450 if (group.RootPart.PhysActor == null)
11451 {
11452 if (!includePhantom)
11453 return;
11454 }
11455 else
11456 {
11457 if (group.RootPart.PhysActor.IsPhysical)
11458 {
11459 if (!includePhysical)
11460 return;
11461 }
11462 else
11463 {
11464 if (!includeNonPhysical)
11465 return;
11466 }
11467 }
11468
11469 // Find the radius ouside of which we don't even need to hit test
11470 float minX;
11471 float maxX;
11472 float minY;
11473 float maxY;
11474 float minZ;
11475 float maxZ;
11476
11477 float radius = 0.0f;
11478
11479 group.GetAxisAlignedBoundingBoxRaw(out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
11480
11481 if (Math.Abs(minX) > radius)
11482 radius = Math.Abs(minX);
11483 if (Math.Abs(minY) > radius)
11484 radius = Math.Abs(minY);
11485 if (Math.Abs(minZ) > radius)
11486 radius = Math.Abs(minZ);
11487 if (Math.Abs(maxX) > radius)
11488 radius = Math.Abs(maxX);
11489 if (Math.Abs(maxY) > radius)
11490 radius = Math.Abs(maxY);
11491 if (Math.Abs(maxZ) > radius)
11492 radius = Math.Abs(maxZ);
11493
11494 Vector3 ac = group.AbsolutePosition - rayStart;
11495 Vector3 bc = group.AbsolutePosition - rayEnd;
11496
11497 double d = Math.Abs(Vector3.Mag(Vector3.Cross(ab, ac)) / Vector3.Distance(rayStart, rayEnd));
11498
11499 // Too far off ray, don't bother
11500 if (d > radius)
11501 return;
11502
11503 // Behind ray, drop
11504 double d2 = Vector3.Dot(Vector3.Negate(ab), ac);
11505 if (d2 > 0)
11506 return;
11507
11508 EntityIntersection intersection = group.TestIntersection(ray, true, false);
11509 // Miss.
11510 if (!intersection.HitTF)
11511 return;
11512
11513 ContactResult result = new ContactResult ();
11514 result.ConsumerID = group.LocalId;
11515 result.Depth = intersection.distance;
11516 result.Normal = intersection.normal;
11517 result.Pos = intersection.ipoint;
11518
11519 contacts.Add(result);
11520 });
11521
11522 return contacts.ToArray();
11523 }
11524
11525 private ContactResult? GroundIntersection(Vector3 rayStart, Vector3 rayEnd)
11526 {
11527 double[,] heightfield = World.Heightmap.GetDoubles();
11528 List<ContactResult> contacts = new List<ContactResult>();
11529
11530 double min = 2048.0;
11531 double max = 0.0;
11532
11533 // Find the min and max of the heightfield
11534 for (int x = 0 ; x < World.Heightmap.Width ; x++)
11535 {
11536 for (int y = 0 ; y < World.Heightmap.Height ; y++)
11537 {
11538 if (heightfield[x, y] > max)
11539 max = heightfield[x, y];
11540 if (heightfield[x, y] < min)
11541 min = heightfield[x, y];
11542 }
11543 }
11544
11545
11546 // A ray extends past rayEnd, but doesn't go back before
11547 // rayStart. If the start is above the highest point of the ground
11548 // and the ray goes up, we can't hit the ground. Ever.
11549 if (rayStart.Z > max && rayEnd.Z >= rayStart.Z)
11550 return null;
11551
11552 // Same for going down
11553 if (rayStart.Z < min && rayEnd.Z <= rayStart.Z)
11554 return null;
11555
11556 List<Tri> trilist = new List<Tri>();
11557
11558 // Create our triangle list
11559 for (int x = 1 ; x < World.Heightmap.Width ; x++)
11560 {
11561 for (int y = 1 ; y < World.Heightmap.Height ; y++)
11562 {
11563 Tri t1 = new Tri();
11564 Tri t2 = new Tri();
11565
11566 Vector3 p1 = new Vector3(x-1, y-1, (float)heightfield[x-1, y-1]);
11567 Vector3 p2 = new Vector3(x, y-1, (float)heightfield[x, y-1]);
11568 Vector3 p3 = new Vector3(x, y, (float)heightfield[x, y]);
11569 Vector3 p4 = new Vector3(x-1, y, (float)heightfield[x-1, y]);
11570
11571 t1.p1 = p1;
11572 t1.p2 = p2;
11573 t1.p3 = p3;
11574
11575 t2.p1 = p3;
11576 t2.p2 = p4;
11577 t2.p3 = p1;
11578
11579 trilist.Add(t1);
11580 trilist.Add(t2);
11581 }
11582 }
11583
11584 // Ray direction
11585 Vector3 rayDirection = rayEnd - rayStart;
11586
11587 foreach (Tri t in trilist)
11588 {
11589 // Compute triangle plane normal and edges
11590 Vector3 u = t.p2 - t.p1;
11591 Vector3 v = t.p3 - t.p1;
11592 Vector3 n = Vector3.Cross(u, v);
11593
11594 if (n == Vector3.Zero)
11595 continue;
11596
11597 Vector3 w0 = rayStart - t.p1;
11598 double a = -Vector3.Dot(n, w0);
11599 double b = Vector3.Dot(n, rayDirection);
11600
11601 // Not intersecting the plane, or in plane (same thing)
11602 // Ignoring this MAY cause the ground to not be detected
11603 // sometimes
11604 if (Math.Abs(b) < 0.000001)
11605 continue;
11606
11607 double r = a / b;
11608
11609 // ray points away from plane
11610 if (r < 0.0)
11611 continue;
11612
11613 Vector3 ip = rayStart + Vector3.Multiply(rayDirection, (float)r);
11614
11615 float uu = Vector3.Dot(u, u);
11616 float uv = Vector3.Dot(u, v);
11617 float vv = Vector3.Dot(v, v);
11618 Vector3 w = ip - t.p1;
11619 float wu = Vector3.Dot(w, u);
11620 float wv = Vector3.Dot(w, v);
11621 float d = uv * uv - uu * vv;
11622
11623 float cs = (uv * wv - vv * wu) / d;
11624 if (cs < 0 || cs > 1.0)
11625 continue;
11626 float ct = (uv * wu - uu * wv) / d;
11627 if (ct < 0 || (cs + ct) > 1.0)
11628 continue;
11629
11630 // Add contact point
11631 ContactResult result = new ContactResult ();
11632 result.ConsumerID = 0;
11633 result.Depth = Vector3.Distance(rayStart, ip);
11634 result.Normal = n;
11635 result.Pos = ip;
11636
11637 contacts.Add(result);
11638 }
11639
11640 if (contacts.Count == 0)
11641 return null;
11642
11643 contacts.Sort(delegate(ContactResult a, ContactResult b)
11644 {
11645 return (int)(a.Depth - b.Depth);
11646 });
11647
11648 return contacts[0];
11649 }
11650
10619 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) 11651 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
10620 { 11652 {
11653 LSL_List list = new LSL_List();
11654
10621 m_host.AddScriptLPS(1); 11655 m_host.AddScriptLPS(1);
10622 11656
10623 Vector3 dir = new Vector3((float)(end-start).x, (float)(end-start).y, (float)(end-start).z); 11657 Vector3 rayStart = new Vector3((float)start.x, (float)start.y, (float)start.z);
10624 Vector3 startvector = new Vector3((float)start.x, (float)start.y, (float)start.z); 11658 Vector3 rayEnd = new Vector3((float)end.x, (float)end.y, (float)end.z);
10625 Vector3 endvector = new Vector3((float)end.x, (float)end.y, (float)end.z); 11659 Vector3 dir = rayEnd - rayStart;
10626 11660
10627 int count = 0; 11661 int count = 1;
10628// int detectPhantom = 0; 11662 bool detectPhantom = false;
10629 int dataFlags = 0; 11663 int dataFlags = 0;
10630 int rejectTypes = 0; 11664 int rejectTypes = 0;
10631 11665
10632 for (int i = 0; i < options.Length; i += 2) 11666 for (int i = 0; i < options.Length; i += 2)
10633 { 11667 {
10634 if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_MAX_HITS) 11668 if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_MAX_HITS)
10635 {
10636 count = options.GetLSLIntegerItem(i + 1); 11669 count = options.GetLSLIntegerItem(i + 1);
10637 } 11670 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DETECT_PHANTOM)
10638// else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DETECT_PHANTOM) 11671 detectPhantom = (options.GetLSLIntegerItem(i + 1) > 0);
10639// {
10640// detectPhantom = options.GetLSLIntegerItem(i + 1);
10641// }
10642 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DATA_FLAGS) 11672 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DATA_FLAGS)
10643 {
10644 dataFlags = options.GetLSLIntegerItem(i + 1); 11673 dataFlags = options.GetLSLIntegerItem(i + 1);
10645 }
10646 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_REJECT_TYPES) 11674 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_REJECT_TYPES)
10647 {
10648 rejectTypes = options.GetLSLIntegerItem(i + 1); 11675 rejectTypes = options.GetLSLIntegerItem(i + 1);
10649 }
10650 } 11676 }
10651 11677
10652 LSL_List list = new LSL_List(); 11678 if (count > 16)
10653 List<ContactResult> results = World.PhysicsScene.RaycastWorld(startvector, dir, dir.Length(), count); 11679 count = 16;
10654
10655 double distance = Util.GetDistanceTo(startvector, endvector);
10656 11680
10657 if (distance == 0) 11681 List<ContactResult> results = new List<ContactResult>();
10658 distance = 0.001;
10659
10660 Vector3 posToCheck = startvector;
10661 ITerrainChannel channel = World.RequestModuleInterface<ITerrainChannel>();
10662 11682
10663 bool checkTerrain = !((rejectTypes & ScriptBaseClass.RC_REJECT_LAND) == ScriptBaseClass.RC_REJECT_LAND); 11683 bool checkTerrain = !((rejectTypes & ScriptBaseClass.RC_REJECT_LAND) == ScriptBaseClass.RC_REJECT_LAND);
10664 bool checkAgents = !((rejectTypes & ScriptBaseClass.RC_REJECT_AGENTS) == ScriptBaseClass.RC_REJECT_AGENTS); 11684 bool checkAgents = !((rejectTypes & ScriptBaseClass.RC_REJECT_AGENTS) == ScriptBaseClass.RC_REJECT_AGENTS);
10665 bool checkNonPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_NONPHYSICAL) == ScriptBaseClass.RC_REJECT_NONPHYSICAL); 11685 bool checkNonPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_NONPHYSICAL) == ScriptBaseClass.RC_REJECT_NONPHYSICAL);
10666 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); 11686 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL);
10667 11687
10668 for (float i = 0; i <= distance; i += 0.1f) 11688 if (checkTerrain)
10669 { 11689 {
10670 posToCheck = startvector + (dir * (i / (float)distance)); 11690 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd);
11691 if (groundContact != null)
11692 results.Add((ContactResult)groundContact);
11693 }
10671 11694
10672 if (checkTerrain && channel[(int)(posToCheck.X + startvector.X), (int)(posToCheck.Y + startvector.Y)] < posToCheck.Z) 11695 if (checkAgents)
10673 { 11696 {
10674 ContactResult result = new ContactResult(); 11697 ContactResult[] agentHits = AvatarIntersection(rayStart, rayEnd);
10675 result.ConsumerID = 0; 11698 foreach (ContactResult r in agentHits)
10676 result.Depth = 0; 11699 results.Add(r);
10677 result.Normal = Vector3.Zero; 11700 }
10678 result.Pos = posToCheck;
10679 results.Add(result);
10680 checkTerrain = false;
10681 }
10682 11701
10683 if (checkAgents) 11702 if (checkPhysical || checkNonPhysical)
10684 { 11703 {
10685 World.ForEachRootScenePresence(delegate(ScenePresence sp) 11704 ContactResult[] objectHits = ObjectIntersection(rayStart, rayEnd, checkPhysical, checkNonPhysical, detectPhantom);
10686 { 11705 foreach (ContactResult r in objectHits)
10687 if (sp.AbsolutePosition.ApproxEquals(posToCheck, sp.PhysicsActor.Size.X)) 11706 results.Add(r);
10688 {
10689 ContactResult result = new ContactResult ();
10690 result.ConsumerID = sp.LocalId;
10691 result.Depth = 0;
10692 result.Normal = Vector3.Zero;
10693 result.Pos = posToCheck;
10694 results.Add(result);
10695 }
10696 });
10697 }
10698 } 11707 }
10699 11708
10700 int refcount = 0; 11709 results.Sort(delegate(ContactResult a, ContactResult b)
11710 {
11711 return (int)(a.Depth - b.Depth);
11712 });
11713
11714 int values = 0;
10701 foreach (ContactResult result in results) 11715 foreach (ContactResult result in results)
10702 { 11716 {
10703 if ((rejectTypes & ScriptBaseClass.RC_REJECT_LAND) 11717 UUID itemID = UUID.Zero;
10704 == ScriptBaseClass.RC_REJECT_LAND && result.ConsumerID == 0) 11718 int linkNum = 0;
10705 continue;
10706
10707 ISceneEntity entity = World.GetSceneObjectPart(result.ConsumerID);
10708 11719
10709 if (entity == null && (rejectTypes & ScriptBaseClass.RC_REJECT_AGENTS) != ScriptBaseClass.RC_REJECT_AGENTS) 11720 SceneObjectPart part = World.GetSceneObjectPart(result.ConsumerID);
10710 entity = World.GetScenePresence(result.ConsumerID); //Only check if we should be looking for agents 11721 // It's a prim!
10711 11722 if (part != null)
10712 if (entity == null)
10713 { 11723 {
10714 list.Add(UUID.Zero); 11724 if ((dataFlags & ScriptBaseClass.RC_GET_ROOT_KEY) == ScriptBaseClass.RC_GET_ROOT_KEY)
10715 11725 itemID = part.ParentGroup.UUID;
10716 if ((dataFlags & ScriptBaseClass.RC_GET_LINK_NUM) == ScriptBaseClass.RC_GET_LINK_NUM) 11726 else
10717 list.Add(0); 11727 itemID = part.UUID;
10718
10719 list.Add(result.Pos);
10720
10721 if ((dataFlags & ScriptBaseClass.RC_GET_NORMAL) == ScriptBaseClass.RC_GET_NORMAL)
10722 list.Add(result.Normal);
10723 11728
10724 continue; //Can't find it, so add UUID.Zero 11729 linkNum = part.LinkNum;
10725 } 11730 }
10726 11731 else
10727 /*if (detectPhantom == 0 && intersection.obj is ISceneChildEntity &&
10728 ((ISceneChildEntity)intersection.obj).PhysActor == null)
10729 continue;*/ //Can't do this ATM, physics engine knows only of non phantom objects
10730
10731 if (entity is SceneObjectPart)
10732 { 11732 {
10733 if (((SceneObjectPart)entity).PhysActor != null && ((SceneObjectPart)entity).PhysActor.IsPhysical) 11733 ScenePresence sp = World.GetScenePresence(result.ConsumerID);
10734 { 11734 /// It it a boy? a girl?
10735 if (!checkPhysical) 11735 if (sp != null)
10736 continue; 11736 itemID = sp.UUID;
10737 }
10738 else
10739 {
10740 if (!checkNonPhysical)
10741 continue;
10742 }
10743 } 11737 }
10744 11738
10745 refcount++; 11739 list.Add(new LSL_String(itemID.ToString()));
10746 if ((dataFlags & ScriptBaseClass.RC_GET_ROOT_KEY) == ScriptBaseClass.RC_GET_ROOT_KEY && entity is SceneObjectPart) 11740 list.Add(new LSL_String(result.Pos.ToString()));
10747 list.Add(((SceneObjectPart)entity).ParentGroup.UUID);
10748 else
10749 list.Add(entity.UUID);
10750 11741
10751 if ((dataFlags & ScriptBaseClass.RC_GET_LINK_NUM) == ScriptBaseClass.RC_GET_LINK_NUM) 11742 if ((dataFlags & ScriptBaseClass.RC_GET_LINK_NUM) == ScriptBaseClass.RC_GET_LINK_NUM)
10752 { 11743 list.Add(new LSL_Integer(linkNum));
10753 if (entity is SceneObjectPart)
10754 list.Add(((SceneObjectPart)entity).LinkNum);
10755 else
10756 list.Add(0);
10757 }
10758 11744
10759 list.Add(result.Pos);
10760 11745
10761 if ((dataFlags & ScriptBaseClass.RC_GET_NORMAL) == ScriptBaseClass.RC_GET_NORMAL) 11746 if ((dataFlags & ScriptBaseClass.RC_GET_NORMAL) == ScriptBaseClass.RC_GET_NORMAL)
10762 list.Add(result.Normal); 11747 list.Add(new LSL_Vector(result.Normal.X, result.Normal.Y, result.Normal.Z));
11748
11749 values++;
11750 count--;
11751
11752 if (count == 0)
11753 break;
10763 } 11754 }
10764 11755
10765 list.Add(refcount); //The status code, either the # of contacts, RCERR_SIM_PERF_LOW, or RCERR_CAST_TIME_EXCEEDED 11756 list.Add(new LSL_Integer(values));
10766 11757
10767 return list; 11758 return list;
10768 } 11759 }
@@ -10802,7 +11793,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10802 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD: 11793 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD:
10803 if (!isAccount) return 0; 11794 if (!isAccount) return 0;
10804 if (estate.HasAccess(id)) return 1; 11795 if (estate.HasAccess(id)) return 1;
10805 if (estate.IsBanned(id)) 11796 if (estate.IsBanned(id, World.GetUserFlags(id)))
10806 estate.RemoveBan(id); 11797 estate.RemoveBan(id);
10807 estate.AddEstateUser(id); 11798 estate.AddEstateUser(id);
10808 break; 11799 break;
@@ -10821,14 +11812,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10821 break; 11812 break;
10822 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD: 11813 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD:
10823 if (!isAccount) return 0; 11814 if (!isAccount) return 0;
10824 if (estate.IsBanned(id)) return 1; 11815 if (estate.IsBanned(id, World.GetUserFlags(id))) return 1;
10825 EstateBan ban = new EstateBan(); 11816 EstateBan ban = new EstateBan();
10826 ban.EstateID = estate.EstateID; 11817 ban.EstateID = estate.EstateID;
10827 ban.BannedUserID = id; 11818 ban.BannedUserID = id;
10828 estate.AddBan(ban); 11819 estate.AddBan(ban);
10829 break; 11820 break;
10830 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE: 11821 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE:
10831 if (!isAccount || !estate.IsBanned(id)) return 0; 11822 if (!isAccount || !estate.IsBanned(id, World.GetUserFlags(id))) return 0;
10832 estate.RemoveBan(id); 11823 estate.RemoveBan(id);
10833 break; 11824 break;
10834 default: return 0; 11825 default: return 0;
@@ -10854,22 +11845,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10854 NotImplemented("llGetSPMaxMemory"); 11845 NotImplemented("llGetSPMaxMemory");
10855 } 11846 }
10856 11847
10857 public void llGetUsedMemory() 11848 public virtual LSL_Integer llGetUsedMemory()
10858 { 11849 {
10859 m_host.AddScriptLPS(1); 11850 m_host.AddScriptLPS(1);
10860 NotImplemented("llGetUsedMemory"); 11851 NotImplemented("llGetUsedMemory");
11852 return 0;
10861 } 11853 }
10862 11854
10863 public void llScriptProfiler(LSL_Integer flags) 11855 public void llScriptProfiler(LSL_Integer flags)
10864 { 11856 {
10865 m_host.AddScriptLPS(1); 11857 m_host.AddScriptLPS(1);
10866 NotImplemented("llScriptProfiler"); 11858 //NotImplemented("llScriptProfiler");
10867 } 11859 }
10868 11860
10869 public void llSetSoundQueueing(int queue) 11861 public void llSetSoundQueueing(int queue)
10870 { 11862 {
10871 m_host.AddScriptLPS(1); 11863 m_host.AddScriptLPS(1);
10872 NotImplemented("llSetSoundQueueing");
10873 } 11864 }
10874 11865
10875 public void llCollisionSprite(string impact_sprite) 11866 public void llCollisionSprite(string impact_sprite)
@@ -10881,10 +11872,274 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10881 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 11872 public void llGodLikeRezObject(string inventory, LSL_Vector pos)
10882 { 11873 {
10883 m_host.AddScriptLPS(1); 11874 m_host.AddScriptLPS(1);
10884 NotImplemented("llGodLikeRezObject"); 11875
11876 if (!World.Permissions.IsGod(m_host.OwnerID))
11877 NotImplemented("llGodLikeRezObject");
11878
11879 AssetBase rezAsset = World.AssetService.Get(inventory);
11880 if (rezAsset == null)
11881 {
11882 llSay(0, "Asset not found");
11883 return;
11884 }
11885
11886 SceneObjectGroup group = null;
11887
11888 try
11889 {
11890 string xmlData = Utils.BytesToString(rezAsset.Data);
11891 group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
11892 }
11893 catch
11894 {
11895 llSay(0, "Asset not found");
11896 return;
11897 }
11898
11899 if (group == null)
11900 {
11901 llSay(0, "Asset not found");
11902 return;
11903 }
11904
11905 group.RootPart.AttachPoint = group.RootPart.Shape.State;
11906 group.RootPart.AttachOffset = group.AbsolutePosition;
11907
11908 group.ResetIDs();
11909
11910 Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
11911 World.AddNewSceneObject(group, true, llpos, Quaternion.Identity, Vector3.Zero);
11912 group.CreateScriptInstances(0, true, World.DefaultScriptEngine, 3);
11913 group.ScheduleGroupForFullUpdate();
11914
11915 // objects rezzed with this method are die_at_edge by default.
11916 group.RootPart.SetDieAtEdge(true);
11917
11918 group.ResumeScripts();
11919
11920 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
11921 "object_rez", new Object[] {
11922 new LSL_String(
11923 group.RootPart.UUID.ToString()) },
11924 new DetectParams[0]));
11925 }
11926
11927 public LSL_String llTransferLindenDollars(string destination, int amount)
11928 {
11929 UUID txn = UUID.Random();
11930
11931 Util.FireAndForget(delegate(object x)
11932 {
11933 int replycode = 0;
11934 string replydata = destination + "," + amount.ToString();
11935
11936 try
11937 {
11938 UUID invItemID=InventorySelf();
11939 if (invItemID == UUID.Zero)
11940 {
11941 replydata = "SERVICE_ERROR";
11942 return;
11943 }
11944
11945 m_host.AddScriptLPS(1);
11946
11947 m_host.TaskInventory.LockItemsForRead(true);
11948 TaskInventoryItem item = m_host.TaskInventory[invItemID];
11949 m_host.TaskInventory.LockItemsForRead(false);
11950
11951 if (item.PermsGranter == UUID.Zero)
11952 {
11953 replydata = "MISSING_PERMISSION_DEBIT";
11954 return;
11955 }
11956
11957 if ((item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0)
11958 {
11959 replydata = "MISSING_PERMISSION_DEBIT";
11960 return;
11961 }
11962
11963 UUID toID = new UUID();
11964
11965 if (!UUID.TryParse(destination, out toID))
11966 {
11967 replydata = "INVALID_AGENT";
11968 return;
11969 }
11970
11971 IMoneyModule money = World.RequestModuleInterface<IMoneyModule>();
11972
11973 if (money == null)
11974 {
11975 replydata = "TRANSFERS_DISABLED";
11976 return;
11977 }
11978
11979 bool result = money.ObjectGiveMoney(
11980 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount);
11981
11982 if (result)
11983 {
11984 replycode = 1;
11985 return;
11986 }
11987
11988 replydata = "LINDENDOLLAR_INSUFFICIENTFUNDS";
11989 }
11990 finally
11991 {
11992 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
11993 "transaction_result", new Object[] {
11994 new LSL_String(txn.ToString()),
11995 new LSL_Integer(replycode),
11996 new LSL_String(replydata) },
11997 new DetectParams[0]));
11998 }
11999 });
12000
12001 return txn.ToString();
10885 } 12002 }
10886 12003
10887 #endregion 12004 #endregion
12005
12006 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
12007 {
12008 SceneObjectGroup group = m_host.ParentGroup;
12009
12010 if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
12011 return;
12012 if (group.IsAttachment)
12013 return;
12014
12015 if (frames.Data.Length > 0) // We are getting a new motion
12016 {
12017 if (group.RootPart.KeyframeMotion != null)
12018 group.RootPart.KeyframeMotion.Stop();
12019 group.RootPart.KeyframeMotion = null;
12020
12021 int idx = 0;
12022
12023 KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
12024 KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
12025
12026 while (idx < options.Data.Length)
12027 {
12028 int option = (int)options.GetLSLIntegerItem(idx++);
12029 int remain = options.Data.Length - idx;
12030
12031 switch (option)
12032 {
12033 case ScriptBaseClass.KFM_MODE:
12034 if (remain < 1)
12035 break;
12036 int modeval = (int)options.GetLSLIntegerItem(idx++);
12037 switch(modeval)
12038 {
12039 case ScriptBaseClass.KFM_FORWARD:
12040 mode = KeyframeMotion.PlayMode.Forward;
12041 break;
12042 case ScriptBaseClass.KFM_REVERSE:
12043 mode = KeyframeMotion.PlayMode.Reverse;
12044 break;
12045 case ScriptBaseClass.KFM_LOOP:
12046 mode = KeyframeMotion.PlayMode.Loop;
12047 break;
12048 case ScriptBaseClass.KFM_PING_PONG:
12049 mode = KeyframeMotion.PlayMode.PingPong;
12050 break;
12051 }
12052 break;
12053 case ScriptBaseClass.KFM_DATA:
12054 if (remain < 1)
12055 break;
12056 int dataval = (int)options.GetLSLIntegerItem(idx++);
12057 data = (KeyframeMotion.DataFormat)dataval;
12058 break;
12059 }
12060 }
12061
12062 group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data);
12063
12064 idx = 0;
12065
12066 int elemLength = 2;
12067 if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation))
12068 elemLength = 3;
12069
12070 List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>();
12071 while (idx < frames.Data.Length)
12072 {
12073 int remain = frames.Data.Length - idx;
12074
12075 if (remain < elemLength)
12076 break;
12077
12078 KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe();
12079 frame.Position = null;
12080 frame.Rotation = null;
12081
12082 if ((data & KeyframeMotion.DataFormat.Translation) != 0)
12083 {
12084 LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++);
12085 frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z);
12086 }
12087 if ((data & KeyframeMotion.DataFormat.Rotation) != 0)
12088 {
12089 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
12090 frame.Rotation = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
12091 }
12092
12093 float tempf = (float)frames.GetLSLFloatItem(idx++);
12094 frame.TimeMS = (int)(tempf * 1000.0f);
12095
12096 keyframes.Add(frame);
12097 }
12098
12099 group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray());
12100 group.RootPart.KeyframeMotion.Start();
12101 }
12102 else
12103 {
12104 if (group.RootPart.KeyframeMotion == null)
12105 return;
12106
12107 if (options.Data.Length == 0)
12108 {
12109 group.RootPart.KeyframeMotion.Stop();
12110 return;
12111 }
12112
12113 int code = (int)options.GetLSLIntegerItem(0);
12114
12115 int idx = 0;
12116
12117 while (idx < options.Data.Length)
12118 {
12119 int option = (int)options.GetLSLIntegerItem(idx++);
12120 int remain = options.Data.Length - idx;
12121
12122 switch (option)
12123 {
12124 case ScriptBaseClass.KFM_COMMAND:
12125 int cmd = (int)options.GetLSLIntegerItem(idx++);
12126 switch (cmd)
12127 {
12128 case ScriptBaseClass.KFM_CMD_PLAY:
12129 group.RootPart.KeyframeMotion.Start();
12130 break;
12131 case ScriptBaseClass.KFM_CMD_STOP:
12132 group.RootPart.KeyframeMotion.Stop();
12133 break;
12134 case ScriptBaseClass.KFM_CMD_PAUSE:
12135 group.RootPart.KeyframeMotion.Pause();
12136 break;
12137 }
12138 break;
12139 }
12140 }
12141 }
12142 }
10888 } 12143 }
10889 12144
10890 public class NotecardCache 12145 public class NotecardCache
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8edd146..44fd980 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -137,6 +137,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
137 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; 137 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
138 internal float m_ScriptDelayFactor = 1.0f; 138 internal float m_ScriptDelayFactor = 1.0f;
139 internal float m_ScriptDistanceFactor = 1.0f; 139 internal float m_ScriptDistanceFactor = 1.0f;
140 internal bool m_debuggerSafe = false;
140 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); 141 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
141 142
142 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) 143 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
@@ -145,6 +146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
145 m_host = host; 146 m_host = host;
146 m_localID = localID; 147 m_localID = localID;
147 m_itemID = itemID; 148 m_itemID = itemID;
149 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
148 150
149 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) 151 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
150 m_OSFunctionsEnabled = true; 152 m_OSFunctionsEnabled = true;
@@ -206,7 +208,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
206 208
207 internal void OSSLError(string msg) 209 internal void OSSLError(string msg)
208 { 210 {
209 throw new Exception("OSSL Runtime Error: " + msg); 211 if (m_debuggerSafe)
212 {
213 OSSLShoutError(msg);
214 }
215 else
216 {
217 throw new Exception("OSSL Runtime Error: " + msg);
218 }
210 } 219 }
211 220
212 private void InitLSL() 221 private void InitLSL()
@@ -917,18 +926,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
917 if (target != null) 926 if (target != null)
918 { 927 {
919 UUID animID=UUID.Zero; 928 UUID animID=UUID.Zero;
920 lock (m_host.TaskInventory) 929 m_host.TaskInventory.LockItemsForRead(true);
930 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
921 { 931 {
922 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 932 if (inv.Value.Name == animation)
923 { 933 {
924 if (inv.Value.Name == animation) 934 if (inv.Value.Type == (int)AssetType.Animation)
925 { 935 animID = inv.Value.AssetID;
926 if (inv.Value.Type == (int)AssetType.Animation) 936 continue;
927 animID = inv.Value.AssetID;
928 continue;
929 }
930 } 937 }
931 } 938 }
939 m_host.TaskInventory.LockItemsForRead(false);
932 if (animID == UUID.Zero) 940 if (animID == UUID.Zero)
933 target.Animator.AddAnimation(animation, m_host.UUID); 941 target.Animator.AddAnimation(animation, m_host.UUID);
934 else 942 else
@@ -955,18 +963,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
955 if (target != null) 963 if (target != null)
956 { 964 {
957 UUID animID = UUID.Zero; 965 UUID animID = UUID.Zero;
958 lock (m_host.TaskInventory) 966 m_host.TaskInventory.LockItemsForRead(true);
967 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
959 { 968 {
960 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 969 if (inv.Value.Name == animation)
961 { 970 {
962 if (inv.Value.Name == animation) 971 if (inv.Value.Type == (int)AssetType.Animation)
963 { 972 animID = inv.Value.AssetID;
964 if (inv.Value.Type == (int)AssetType.Animation) 973 continue;
965 animID = inv.Value.AssetID;
966 continue;
967 }
968 } 974 }
969 } 975 }
976 m_host.TaskInventory.LockItemsForRead(false);
970 977
971 if (animID == UUID.Zero) 978 if (animID == UUID.Zero)
972 target.Animator.RemoveAnimation(animation); 979 target.Animator.RemoveAnimation(animation);
@@ -1798,6 +1805,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1798 1805
1799 if (!UUID.TryParse(notecardNameOrUuid, out assetID)) 1806 if (!UUID.TryParse(notecardNameOrUuid, out assetID))
1800 { 1807 {
1808 m_host.TaskInventory.LockItemsForRead(true);
1801 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1809 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1802 { 1810 {
1803 if (item.Type == 7 && item.Name == notecardNameOrUuid) 1811 if (item.Type == 7 && item.Name == notecardNameOrUuid)
@@ -1805,6 +1813,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1805 assetID = item.AssetID; 1813 assetID = item.AssetID;
1806 } 1814 }
1807 } 1815 }
1816 m_host.TaskInventory.LockItemsForRead(false);
1808 } 1817 }
1809 1818
1810 if (assetID == UUID.Zero) 1819 if (assetID == UUID.Zero)
@@ -2258,7 +2267,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2258 CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); 2267 CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
2259 m_host.AddScriptLPS(1); 2268 m_host.AddScriptLPS(1);
2260 2269
2261 return NpcCreate(firstname, lastname, position, notecard, false, false); 2270 return NpcCreate(firstname, lastname, position, notecard, true, false);
2262 } 2271 }
2263 2272
2264 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) 2273 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
@@ -2269,24 +2278,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2269 return NpcCreate( 2278 return NpcCreate(
2270 firstname, lastname, position, notecard, 2279 firstname, lastname, position, notecard,
2271 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, 2280 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0,
2272 (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0); 2281 false);
2282// (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
2273 } 2283 }
2274 2284
2275 private LSL_Key NpcCreate( 2285 private LSL_Key NpcCreate(
2276 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent) 2286 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent)
2277 { 2287 {
2288 if (!owned)
2289 OSSLError("Unowned NPCs are unsupported");
2290
2291 string groupTitle = String.Empty;
2292
2293 if (firstname != String.Empty || lastname != String.Empty)
2294 {
2295 if (firstname != "Shown outfit:")
2296 groupTitle = "- NPC -";
2297 }
2298
2278 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2299 INPCModule module = World.RequestModuleInterface<INPCModule>();
2279 if (module != null) 2300 if (module != null)
2280 { 2301 {
2281 AvatarAppearance appearance = null; 2302 AvatarAppearance appearance = null;
2282 2303
2283 UUID id; 2304// UUID id;
2284 if (UUID.TryParse(notecard, out id)) 2305// if (UUID.TryParse(notecard, out id))
2285 { 2306// {
2286 ScenePresence clonePresence = World.GetScenePresence(id); 2307// ScenePresence clonePresence = World.GetScenePresence(id);
2287 if (clonePresence != null) 2308// if (clonePresence != null)
2288 appearance = clonePresence.Appearance; 2309// appearance = clonePresence.Appearance;
2289 } 2310// }
2290 2311
2291 if (appearance == null) 2312 if (appearance == null)
2292 { 2313 {
@@ -2314,6 +2335,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2314 World, 2335 World,
2315 appearance); 2336 appearance);
2316 2337
2338 ScenePresence sp;
2339 if (World.TryGetScenePresence(x, out sp))
2340 {
2341 sp.Grouptitle = groupTitle;
2342 sp.SendAvatarDataToAllAgents();
2343 }
2317 return new LSL_Key(x.ToString()); 2344 return new LSL_Key(x.ToString());
2318 } 2345 }
2319 2346
@@ -2582,16 +2609,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2582 CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); 2609 CheckThreatLevel(ThreatLevel.High, "osNpcRemove");
2583 m_host.AddScriptLPS(1); 2610 m_host.AddScriptLPS(1);
2584 2611
2585 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2612 ManualResetEvent ev = new ManualResetEvent(false);
2586 if (module != null)
2587 {
2588 UUID npcId = new UUID(npc.m_string);
2589 2613
2590 if (!module.CheckPermissions(npcId, m_host.OwnerID)) 2614 Util.FireAndForget(delegate(object x) {
2591 return; 2615 try
2616 {
2617 INPCModule module = World.RequestModuleInterface<INPCModule>();
2618 if (module != null)
2619 {
2620 UUID npcId = new UUID(npc.m_string);
2592 2621
2593 module.DeleteNPC(npcId, World); 2622 if (!module.CheckPermissions(npcId, m_host.OwnerID))
2594 } 2623 return;
2624
2625 module.DeleteNPC(npcId, World);
2626 }
2627 }
2628 finally
2629 {
2630 ev.Set();
2631 }
2632 });
2633 ev.WaitOne();
2595 } 2634 }
2596 2635
2597 public void osNpcPlayAnimation(LSL_Key npc, string animation) 2636 public void osNpcPlayAnimation(LSL_Key npc, string animation)
@@ -2944,4 +2983,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2944 return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"); 2983 return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
2945 } 2984 }
2946 } 2985 }
2947} \ No newline at end of file 2986}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index fbb7c39..e25255c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
210 // Is the sensor type is AGENT and not SCRIPTED then include agents 210 // Is the sensor type is AGENT and not SCRIPTED then include agents
211 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0) 211 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0)
212 { 212 {
213 sensedEntities.AddRange(doAgentSensor(ts)); 213 sensedEntities.AddRange(doAgentSensor(ts));
214 } 214 }
215 215
216 // If SCRIPTED or PASSIVE or ACTIVE check objects 216 // If SCRIPTED or PASSIVE or ACTIVE check objects
@@ -307,13 +307,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
307 float dy; 307 float dy;
308 float dz; 308 float dz;
309 309
310 Quaternion q = SensePoint.RotationOffset; 310// Quaternion q = SensePoint.RotationOffset;
311 Quaternion q = SensePoint.GetWorldRotation(); // non-attached prim Sensor *always* uses World rotation!
311 if (SensePoint.ParentGroup.IsAttachment) 312 if (SensePoint.ParentGroup.IsAttachment)
312 { 313 {
313 // In attachments, the sensor cone always orients with the 314 // In attachments, the sensor cone always orients with the
314 // avatar rotation. This may include a nonzero elevation if 315 // avatar rotation. This may include a nonzero elevation if
315 // in mouselook. 316 // in mouselook.
316 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 317 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
318 fromRegionPos = avatar.AbsolutePosition;
317 q = avatar.Rotation; 319 q = avatar.Rotation;
318 } 320 }
319 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 321 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
@@ -436,6 +438,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
436 // avatar rotation. This may include a nonzero elevation if 438 // avatar rotation. This may include a nonzero elevation if
437 // in mouselook. 439 // in mouselook.
438 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 440 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
441 if (avatar == null)
442 return sensedEntities;
443 fromRegionPos = avatar.AbsolutePosition;
439 q = avatar.Rotation; 444 q = avatar.Rotation;
440 } 445 }
441 446
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index eeb59d9..2fd33fe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -109,25 +109,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
109 if (Timers.Count == 0) 109 if (Timers.Count == 0)
110 return; 110 return;
111 111
112 Dictionary<string, TimerClass>.ValueCollection tvals;
112 lock (TimerListLock) 113 lock (TimerListLock)
113 { 114 {
114 // Go through all timers 115 // Go through all timers
115 Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values; 116 tvals = Timers.Values;
116 foreach (TimerClass ts in tvals) 117 }
118
119 foreach (TimerClass ts in tvals)
120 {
121 // Time has passed?
122 if (ts.next < DateTime.Now.Ticks)
117 { 123 {
118 // Time has passed? 124 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
119 if (ts.next < DateTime.Now.Ticks) 125 // Add it to queue
120 { 126 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
121 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 127 new EventParams("timer", new Object[0],
122 // Add it to queue 128 new DetectParams[0]));
123 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 129 // set next interval
124 new EventParams("timer", new Object[0], 130
125 new DetectParams[0])); 131 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
126 // set next interval 132 ts.next = DateTime.Now.Ticks + ts.interval;
127
128 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
129 ts.next = DateTime.Now.Ticks + ts.interval;
130 }
131 } 133 }
132 } 134 }
133 } 135 }
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 0f53bc3..8d97a7c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -124,6 +124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
124 LSL_Float llGetEnergy(); 124 LSL_Float llGetEnergy();
125 LSL_Vector llGetForce(); 125 LSL_Vector llGetForce();
126 LSL_Integer llGetFreeMemory(); 126 LSL_Integer llGetFreeMemory();
127 LSL_Integer llGetUsedMemory();
127 LSL_Integer llGetFreeURLs(); 128 LSL_Integer llGetFreeURLs();
128 LSL_Vector llGetGeometricCenter(); 129 LSL_Vector llGetGeometricCenter();
129 LSL_Float llGetGMTclock(); 130 LSL_Float llGetGMTclock();
@@ -203,6 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
203 void llGiveInventory(string destination, string inventory); 204 void llGiveInventory(string destination, string inventory);
204 void llGiveInventoryList(string destination, string category, LSL_List inventory); 205 void llGiveInventoryList(string destination, string category, LSL_List inventory);
205 LSL_Integer llGiveMoney(string destination, int amount); 206 LSL_Integer llGiveMoney(string destination, int amount);
207 LSL_String llTransferLindenDollars(string destination, int amount);
206 void llGodLikeRezObject(string inventory, LSL_Vector pos); 208 void llGodLikeRezObject(string inventory, LSL_Vector pos);
207 LSL_Float llGround(LSL_Vector offset); 209 LSL_Float llGround(LSL_Vector offset);
208 LSL_Vector llGroundContour(LSL_Vector offset); 210 LSL_Vector llGroundContour(LSL_Vector offset);
@@ -348,6 +350,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
348 void llSetParcelMusicURL(string url); 350 void llSetParcelMusicURL(string url);
349 void llSetPayPrice(int price, LSL_List quick_pay_buttons); 351 void llSetPayPrice(int price, LSL_List quick_pay_buttons);
350 void llSetPos(LSL_Vector pos); 352 void llSetPos(LSL_Vector pos);
353 LSL_Integer llSetRegionPos(LSL_Vector pos);
351 LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules); 354 LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules);
352 void llSetPrimitiveParams(LSL_List rules); 355 void llSetPrimitiveParams(LSL_List rules);
353 void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules); 356 void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules);
@@ -396,6 +399,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
396 void llTargetOmega(LSL_Vector axis, double spinrate, double gain); 399 void llTargetOmega(LSL_Vector axis, double spinrate, double gain);
397 void llTargetRemove(int number); 400 void llTargetRemove(int number);
398 void llTeleportAgentHome(string agent); 401 void llTeleportAgentHome(string agent);
402 void llTeleportAgent(string agent, string simname, LSL_Vector pos, LSL_Vector lookAt);
399 void llTextBox(string avatar, string message, int chat_channel); 403 void llTextBox(string avatar, string message, int chat_channel);
400 LSL_String llToLower(string source); 404 LSL_String llToLower(string source);
401 LSL_String llToUpper(string source); 405 LSL_String llToUpper(string source);
@@ -412,9 +416,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
412 LSL_Vector llWind(LSL_Vector offset); 416 LSL_Vector llWind(LSL_Vector offset);
413 LSL_String llXorBase64Strings(string str1, string str2); 417 LSL_String llXorBase64Strings(string str1, string str2);
414 LSL_String llXorBase64StringsCorrect(string str1, string str2); 418 LSL_String llXorBase64StringsCorrect(string str1, string str2);
415 void print(string str); 419 LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
416 420
417 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 421 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
418 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 422 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
423 void llSetKeyframedMotion(LSL_List frames, LSL_List options);
419 } 424 }
420} 425}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 82a6caf..fb52600 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
85 // Avatar Info Commands 85 // Avatar Info Commands
86 string osGetAgentIP(string agent); 86 string osGetAgentIP(string agent);
87 LSL_List osGetAgents(); 87 LSL_List osGetAgents();
88 88
89 // Teleport commands 89 // Teleport commands
90 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 90 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
91 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 91 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
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 5a53e15..a5e160d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -282,6 +282,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
282 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART 282 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
283 public const int CHANGED_MEDIA = 2048; 283 public const int CHANGED_MEDIA = 2048;
284 public const int CHANGED_ANIMATION = 16384; 284 public const int CHANGED_ANIMATION = 16384;
285 public const int CHANGED_POSITION = 32768;
285 public const int TYPE_INVALID = 0; 286 public const int TYPE_INVALID = 0;
286 public const int TYPE_INTEGER = 1; 287 public const int TYPE_INTEGER = 1;
287 public const int TYPE_FLOAT = 2; 288 public const int TYPE_FLOAT = 2;
@@ -640,5 +641,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
640 public static readonly LSLInteger RCERR_UNKNOWN = -1; 641 public static readonly LSLInteger RCERR_UNKNOWN = -1;
641 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; 642 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2;
642 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3; 643 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3;
644
645 public const int KFM_MODE = 1;
646 public const int KFM_LOOP = 1;
647 public const int KFM_REVERSE = 3;
648 public const int KFM_FORWARD = 0;
649 public const int KFM_PING_PONG = 2;
650 public const int KFM_DATA = 2;
651 public const int KFM_TRANSLATION = 2;
652 public const int KFM_ROTATION = 1;
653 public const int KFM_COMMAND = 0;
654 public const int KFM_CMD_PLAY = 0;
655 public const int KFM_CMD_STOP = 1;
656 public const int KFM_CMD_PAUSE = 2;
643 } 657 }
644} 658}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index f8e3c36..a8d1ddb 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;
@@ -164,6 +165,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
164 m_LSL_Functions.llBreakLink(linknum); 165 m_LSL_Functions.llBreakLink(linknum);
165 } 166 }
166 167
168 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
169 {
170 return m_LSL_Functions.llCastRay(start, end, options);
171 }
172
167 public LSL_Integer llCeil(double f) 173 public LSL_Integer llCeil(double f)
168 { 174 {
169 return m_LSL_Functions.llCeil(f); 175 return m_LSL_Functions.llCeil(f);
@@ -314,6 +320,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
314 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); 320 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
315 } 321 }
316 322
323 [DebuggerNonUserCode]
317 public void llDie() 324 public void llDie()
318 { 325 {
319 m_LSL_Functions.llDie(); 326 m_LSL_Functions.llDie();
@@ -464,6 +471,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
464 return m_LSL_Functions.llGetFreeMemory(); 471 return m_LSL_Functions.llGetFreeMemory();
465 } 472 }
466 473
474 public LSL_Integer llGetUsedMemory()
475 {
476 return m_LSL_Functions.llGetUsedMemory();
477 }
478
467 public LSL_Integer llGetFreeURLs() 479 public LSL_Integer llGetFreeURLs()
468 { 480 {
469 return m_LSL_Functions.llGetFreeURLs(); 481 return m_LSL_Functions.llGetFreeURLs();
@@ -849,6 +861,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
849 return m_LSL_Functions.llGiveMoney(destination, amount); 861 return m_LSL_Functions.llGiveMoney(destination, amount);
850 } 862 }
851 863
864 public LSL_String llTransferLindenDollars(string destination, int amount)
865 {
866 return m_LSL_Functions.llTransferLindenDollars(destination, amount);
867 }
868
852 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 869 public void llGodLikeRezObject(string inventory, LSL_Vector pos)
853 { 870 {
854 m_LSL_Functions.llGodLikeRezObject(inventory, pos); 871 m_LSL_Functions.llGodLikeRezObject(inventory, pos);
@@ -1563,6 +1580,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1563 m_LSL_Functions.llSetPos(pos); 1580 m_LSL_Functions.llSetPos(pos);
1564 } 1581 }
1565 1582
1583 public LSL_Integer llSetRegionPos(LSL_Vector pos)
1584 {
1585 return m_LSL_Functions.llSetRegionPos(pos);
1586 }
1587
1566 public void llSetPrimitiveParams(LSL_List rules) 1588 public void llSetPrimitiveParams(LSL_List rules)
1567 { 1589 {
1568 m_LSL_Functions.llSetPrimitiveParams(rules); 1590 m_LSL_Functions.llSetPrimitiveParams(rules);
@@ -1798,6 +1820,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1798 m_LSL_Functions.llTargetRemove(number); 1820 m_LSL_Functions.llTargetRemove(number);
1799 } 1821 }
1800 1822
1823 public void llTeleportAgent(string agent, string simname, LSL_Vector pos, LSL_Vector lookAt)
1824 {
1825 m_LSL_Functions.llTeleportAgent(agent, simname, pos, lookAt);
1826 }
1827
1801 public void llTeleportAgentHome(string agent) 1828 public void llTeleportAgentHome(string agent)
1802 { 1829 {
1803 m_LSL_Functions.llTeleportAgentHome(agent); 1830 m_LSL_Functions.llTeleportAgentHome(agent);
@@ -1913,9 +1940,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1913 return m_LSL_Functions.llClearLinkMedia(link, face); 1940 return m_LSL_Functions.llClearLinkMedia(link, face);
1914 } 1941 }
1915 1942
1916 public void print(string str) 1943 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
1944 {
1945 return m_LSL_Functions.llGetLinkNumberOfSides(link);
1946 }
1947
1948 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
1917 { 1949 {
1918 m_LSL_Functions.print(str); 1950 m_LSL_Functions.llSetKeyframedMotion(frames, options);
1919 } 1951 }
1920 } 1952 }
1921} 1953}
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/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 8cebb4a..7e7e278 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;
38 39
39namespace OpenSim.Region.ScriptEngine.Shared 40namespace OpenSim.Region.ScriptEngine.Shared
40{ 41{
@@ -95,6 +96,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
95 Type = 0; 96 Type = 0;
96 Velocity = new LSL_Types.Vector3(); 97 Velocity = new LSL_Types.Vector3();
97 initializeSurfaceTouch(); 98 initializeSurfaceTouch();
99 Country = String.Empty;
98 } 100 }
99 101
100 public UUID Key; 102 public UUID Key;
@@ -126,6 +128,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
126 private int touchFace; 128 private int touchFace;
127 public int TouchFace { get { return touchFace; } } 129 public int TouchFace { get { return touchFace; } }
128 130
131 public string Country;
132
129 // This can be done in two places including the constructor 133 // This can be done in two places including the constructor
130 // so be carefull what gets added here 134 // so be carefull what gets added here
131 private void initializeSurfaceTouch() 135 private void initializeSurfaceTouch()
@@ -173,6 +177,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
173 return; 177 return;
174 178
175 Name = presence.Firstname + " " + presence.Lastname; 179 Name = presence.Firstname + " " + presence.Lastname;
180 UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, Key);
181 if (account != null)
182 Country = account.UserCountry;
183
176 Owner = Key; 184 Owner = Key;
177 Position = new LSL_Types.Vector3( 185 Position = new LSL_Types.Vector3(
178 presence.AbsolutePosition.X, 186 presence.AbsolutePosition.X,
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index bc1902b..da2ef7b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Runtime.Remoting; 31using System.Runtime.Remoting;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using System.Threading; 33using System.Threading;
@@ -264,13 +265,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
264 265
265 if (part != null) 266 if (part != null)
266 { 267 {
267 lock (part.TaskInventory) 268 part.TaskInventory.LockItemsForRead(true);
269 if (part.TaskInventory.ContainsKey(m_ItemID))
268 { 270 {
269 if (part.TaskInventory.ContainsKey(m_ItemID)) 271 m_thisScriptTask = part.TaskInventory[m_ItemID];
270 {
271 m_thisScriptTask = part.TaskInventory[m_ItemID];
272 }
273 } 272 }
273 part.TaskInventory.LockItemsForRead(false);
274 } 274 }
275 275
276 ApiManager am = new ApiManager(); 276 ApiManager am = new ApiManager();
@@ -469,14 +469,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
469 { 469 {
470 int permsMask; 470 int permsMask;
471 UUID permsGranter; 471 UUID permsGranter;
472 lock (part.TaskInventory) 472 part.TaskInventory.LockItemsForRead(true);
473 if (!part.TaskInventory.ContainsKey(m_ItemID))
473 { 474 {
474 if (!part.TaskInventory.ContainsKey(m_ItemID)) 475 part.TaskInventory.LockItemsForRead(false);
475 return; 476 return;
476
477 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
478 permsMask = part.TaskInventory[m_ItemID].PermsMask;
479 } 477 }
478 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
479 permsMask = part.TaskInventory[m_ItemID].PermsMask;
480 part.TaskInventory.LockItemsForRead(false);
480 481
481 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) 482 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
482 { 483 {
@@ -588,6 +589,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
588 return true; 589 return true;
589 } 590 }
590 591
592 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
591 public void SetState(string state) 593 public void SetState(string state)
592 { 594 {
593 if (state == State) 595 if (state == State)
@@ -599,7 +601,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
599 new DetectParams[0])); 601 new DetectParams[0]));
600 PostEvent(new EventParams("state_entry", new Object[0], 602 PostEvent(new EventParams("state_entry", new Object[0],
601 new DetectParams[0])); 603 new DetectParams[0]));
602 604
603 throw new EventAbortException(); 605 throw new EventAbortException();
604 } 606 }
605 607
@@ -682,41 +684,42 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
682 /// <returns></returns> 684 /// <returns></returns>
683 public object EventProcessor() 685 public object EventProcessor()
684 { 686 {
685 lock (m_Script) 687 EventParams data = null;
686 {
687// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
688 688
689 if (Suspended) 689// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
690 return 0;
691 690
692 EventParams data = null; 691 if (Suspended)
692 return 0;
693 693
694 lock (m_EventQueue) 694 lock (m_EventQueue)
695 {
696 data = (EventParams) m_EventQueue.Dequeue();
697 if (data == null) // Shouldn't happen
695 { 698 {
696 data = (EventParams) m_EventQueue.Dequeue(); 699 if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
697 if (data == null) // Shouldn't happen
698 { 700 {
699 if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown)) 701 m_CurrentResult = m_Engine.QueueEventHandler(this);
700 {
701 m_CurrentResult = m_Engine.QueueEventHandler(this);
702 }
703 else
704 {
705 m_CurrentResult = null;
706 }
707 return 0;
708 } 702 }
709 703 else
710 if (data.EventName == "timer")
711 m_TimerQueued = false;
712 if (data.EventName == "control")
713 { 704 {
714 if (m_ControlEventsInQueue > 0) 705 m_CurrentResult = null;
715 m_ControlEventsInQueue--;
716 } 706 }
717 if (data.EventName == "collision") 707 return 0;
718 m_CollisionInQueue = false; 708 }
709
710 if (data.EventName == "timer")
711 m_TimerQueued = false;
712 if (data.EventName == "control")
713 {
714 if (m_ControlEventsInQueue > 0)
715 m_ControlEventsInQueue--;
719 } 716 }
717 if (data.EventName == "collision")
718 m_CollisionInQueue = false;
719 }
720
721 lock(m_Script)
722 {
720 723
721// m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this); 724// m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
722 725
@@ -876,6 +879,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
876 new Object[0], new DetectParams[0])); 879 new Object[0], new DetectParams[0]));
877 } 880 }
878 881
882 [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
879 public void ApiResetScript() 883 public void ApiResetScript()
880 { 884 {
881 // bool running = Running; 885 // bool running = Running;
@@ -907,10 +911,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
907 911
908 public Dictionary<string, object> GetVars() 912 public Dictionary<string, object> GetVars()
909 { 913 {
910 if (m_Script != null) 914 return m_Script.GetVars();
911 return m_Script.GetVars();
912 else
913 return new Dictionary<string, object>();
914 } 915 }
915 916
916 public void SetVars(Dictionary<string, object> vars) 917 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 d848b2a..9e6752c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -83,19 +83,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
83 83
84 public override string ToString() 84 public override string ToString()
85 { 85 {
86 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", x, y, z); 86 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", x, y, z);
87 return s; 87 return s;
88 } 88 }
89 89
90 public static explicit operator LSLString(Vector3 vec) 90 public static explicit operator LSLString(Vector3 vec)
91 { 91 {
92 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 92 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
93 return new LSLString(s); 93 return new LSLString(s);
94 } 94 }
95 95
96 public static explicit operator string(Vector3 vec) 96 public static explicit operator string(Vector3 vec)
97 { 97 {
98 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 98 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
99 return s; 99 return s;
100 } 100 }
101 101
@@ -342,19 +342,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
342 342
343 public override string ToString() 343 public override string ToString()
344 { 344 {
345 string st=String.Format(Culture.FormatProvider, "<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", x, y, z, s); 345 string st=String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", x, y, z, s);
346 return st; 346 return st;
347 } 347 }
348 348
349 public static explicit operator string(Quaternion r) 349 public static explicit operator string(Quaternion r)
350 { 350 {
351 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 351 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
352 return s; 352 return s;
353 } 353 }
354 354
355 public static explicit operator LSLString(Quaternion r) 355 public static explicit operator LSLString(Quaternion r)
356 { 356 {
357 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 357 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
358 return new LSLString(s); 358 return new LSLString(s);
359 } 359 }
360 360
@@ -459,6 +459,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
459 size += 64; 459 size += 64;
460 else if (o is int) 460 else if (o is int)
461 size += 4; 461 size += 4;
462 else if (o is uint)
463 size += 4;
462 else if (o is string) 464 else if (o is string)
463 size += ((string)o).Length; 465 size += ((string)o).Length;
464 else if (o is float) 466 else if (o is float)
@@ -613,24 +615,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
613 615
614 public static bool operator ==(list a, list b) 616 public static bool operator ==(list a, list b)
615 { 617 {
616 int la = -1; 618 int la = a.Length;
617 int lb = -1; 619 int lb = b.Length;
618 try { la = a.Length; }
619 catch (NullReferenceException) { }
620 try { lb = b.Length; }
621 catch (NullReferenceException) { }
622 620
623 return la == lb; 621 return la == lb;
624 } 622 }
625 623
626 public static bool operator !=(list a, list b) 624 public static bool operator !=(list a, list b)
627 { 625 {
628 int la = -1; 626 int la = a.Length;
629 int lb = -1; 627 int lb = b.Length;
630 try { la = a.Length; }
631 catch (NullReferenceException) { }
632 try {lb = b.Length;}
633 catch (NullReferenceException) { }
634 628
635 return la != lb; 629 return la != lb;
636 } 630 }
@@ -1064,7 +1058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1064 { 1058 {
1065 list ret = new list(); 1059 list ret = new list();
1066 double entry; 1060 double entry;
1067 for (int i = 0; i < src.Data.Length - 1; i++) 1061 for (int i = 0; i < src.Data.Length; i++)
1068 { 1062 {
1069 if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry)) 1063 if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry))
1070 { 1064 {
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index c68f03f..02d47bd 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.Reflection; 34using System.Reflection;
@@ -109,6 +110,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
109 private Dictionary<UUID, IScriptInstance> m_Scripts = 110 private Dictionary<UUID, IScriptInstance> m_Scripts =
110 new Dictionary<UUID, IScriptInstance>(); 111 new Dictionary<UUID, IScriptInstance>();
111 112
113 private OpenMetaverse.ReaderWriterLockSlim m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
114
112 // Maps the asset ID to the assembly 115 // Maps the asset ID to the assembly
113 116
114 private Dictionary<UUID, string> m_Assemblies = 117 private Dictionary<UUID, string> m_Assemblies =
@@ -131,6 +134,71 @@ namespace OpenSim.Region.ScriptEngine.XEngine
131 IWorkItemResult m_CurrentCompile = null; 134 IWorkItemResult m_CurrentCompile = null;
132 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>(); 135 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>();
133 136
137 private void lockScriptsForRead(bool locked)
138 {
139 if (locked)
140 {
141 if (m_scriptsLock.RecursiveReadCount > 0)
142 {
143 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.");
144 m_scriptsLock.ExitReadLock();
145 }
146 if (m_scriptsLock.RecursiveWriteCount > 0)
147 {
148 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
149 m_scriptsLock.ExitWriteLock();
150 }
151
152 while (!m_scriptsLock.TryEnterReadLock(60000))
153 {
154 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.");
155 if (m_scriptsLock.IsWriteLockHeld)
156 {
157 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
158 }
159 }
160 }
161 else
162 {
163 if (m_scriptsLock.RecursiveReadCount > 0)
164 {
165 m_scriptsLock.ExitReadLock();
166 }
167 }
168 }
169 private void lockScriptsForWrite(bool locked)
170 {
171 if (locked)
172 {
173 if (m_scriptsLock.RecursiveReadCount > 0)
174 {
175 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.");
176 m_scriptsLock.ExitReadLock();
177 }
178 if (m_scriptsLock.RecursiveWriteCount > 0)
179 {
180 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
181 m_scriptsLock.ExitWriteLock();
182 }
183
184 while (!m_scriptsLock.TryEnterWriteLock(60000))
185 {
186 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.");
187 if (m_scriptsLock.IsWriteLockHeld)
188 {
189 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
190 }
191 }
192 }
193 else
194 {
195 if (m_scriptsLock.RecursiveWriteCount > 0)
196 {
197 m_scriptsLock.ExitWriteLock();
198 }
199 }
200 }
201
134 public string ScriptEngineName 202 public string ScriptEngineName
135 { 203 {
136 get { return "XEngine"; } 204 get { return "XEngine"; }
@@ -501,44 +569,37 @@ namespace OpenSim.Region.ScriptEngine.XEngine
501 { 569 {
502 if (!m_Enabled) 570 if (!m_Enabled)
503 return; 571 return;
504 572 lockScriptsForRead(true);
505 lock (m_Scripts) 573 foreach (IScriptInstance instance in m_Scripts.Values)
506 { 574 {
507 m_log.InfoFormat( 575 // Force a final state save
508 "[XEngine]: Shutting down {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName); 576 //
509 577 if (m_Assemblies.ContainsKey(instance.AssetID))
510 foreach (IScriptInstance instance in m_Scripts.Values)
511 { 578 {
512 // Force a final state save 579 string assembly = m_Assemblies[instance.AssetID];
513 // 580 instance.SaveState(assembly);
514 if (m_Assemblies.ContainsKey(instance.AssetID)) 581 }
515 {
516 string assembly = m_Assemblies[instance.AssetID];
517 instance.SaveState(assembly);
518 }
519 582
520 // Clear the event queue and abort the instance thread 583 // Clear the event queue and abort the instance thread
521 // 584 //
522 instance.ClearQueue(); 585 instance.ClearQueue();
523 instance.Stop(0); 586 instance.Stop(0);
524 587
525 // Release events, timer, etc 588 // Release events, timer, etc
526 // 589 //
527 instance.DestroyScriptInstance(); 590 instance.DestroyScriptInstance();
528 591
529 // Unload scripts and app domains. 592 // Unload scripts and app domains
530 // Must be done explicitly because they have infinite 593 // Must be done explicitly because they have infinite
531 // lifetime. 594 // lifetime
532 // However, don't bother to do this if the simulator is shutting 595 //
533 // down since it takes a long time with many scripts. 596 if (!m_SimulatorShuttingDown)
534 if (!m_SimulatorShuttingDown) 597 {
598 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
599 if (m_DomainScripts[instance.AppDomain].Count == 0)
535 { 600 {
536 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID); 601 m_DomainScripts.Remove(instance.AppDomain);
537 if (m_DomainScripts[instance.AppDomain].Count == 0) 602 UnloadAppDomain(instance.AppDomain);
538 {
539 m_DomainScripts.Remove(instance.AppDomain);
540 UnloadAppDomain(instance.AppDomain);
541 }
542 } 603 }
543 } 604 }
544 605
@@ -547,6 +608,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
547 m_Assemblies.Clear(); 608 m_Assemblies.Clear();
548 m_DomainScripts.Clear(); 609 m_DomainScripts.Clear();
549 } 610 }
611 lockScriptsForRead(false);
612 lockScriptsForWrite(true);
613 m_Scripts.Clear();
614 lockScriptsForWrite(false);
615 m_PrimObjects.Clear();
616 m_Assemblies.Clear();
617 m_DomainScripts.Clear();
618
550 lock (m_ScriptEngines) 619 lock (m_ScriptEngines)
551 { 620 {
552 m_ScriptEngines.Remove(this); 621 m_ScriptEngines.Remove(this);
@@ -611,22 +680,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
611 680
612 List<IScriptInstance> instances = new List<IScriptInstance>(); 681 List<IScriptInstance> instances = new List<IScriptInstance>();
613 682
614 lock (m_Scripts) 683 lockScriptsForRead(true);
615 { 684 foreach (IScriptInstance instance in m_Scripts.Values)
616 foreach (IScriptInstance instance in m_Scripts.Values)
617 instances.Add(instance); 685 instances.Add(instance);
618 } 686 lockScriptsForRead(false);
619 687
620 foreach (IScriptInstance i in instances) 688 foreach (IScriptInstance i in instances)
621 { 689 {
622 string assembly = String.Empty; 690 string assembly = String.Empty;
623 691
624 lock (m_Scripts) 692
625 {
626 if (!m_Assemblies.ContainsKey(i.AssetID)) 693 if (!m_Assemblies.ContainsKey(i.AssetID))
627 continue; 694 continue;
628 assembly = m_Assemblies[i.AssetID]; 695 assembly = m_Assemblies[i.AssetID];
629 } 696
630 697
631 i.SaveState(assembly); 698 i.SaveState(assembly);
632 } 699 }
@@ -970,92 +1037,95 @@ namespace OpenSim.Region.ScriptEngine.XEngine
970 } 1037 }
971 1038
972 ScriptInstance instance = null; 1039 ScriptInstance instance = null;
973 lock (m_Scripts) 1040 // Create the object record
1041 lockScriptsForRead(true);
1042 if ((!m_Scripts.ContainsKey(itemID)) ||
1043 (m_Scripts[itemID].AssetID != assetID))
974 { 1044 {
975 // Create the object record 1045 lockScriptsForRead(false);
976 1046
977 if ((!m_Scripts.ContainsKey(itemID)) || 1047 UUID appDomain = assetID;
978 (m_Scripts[itemID].AssetID != assetID))
979 {
980 UUID appDomain = assetID;
981 1048
982 if (part.ParentGroup.IsAttachment) 1049 if (part.ParentGroup.IsAttachment)
983 appDomain = part.ParentGroup.RootPart.UUID; 1050 appDomain = part.ParentGroup.RootPart.UUID;
984 1051
985 if (!m_AppDomains.ContainsKey(appDomain)) 1052 if (!m_AppDomains.ContainsKey(appDomain))
1053 {
1054 try
986 { 1055 {
987 try 1056 AppDomainSetup appSetup = new AppDomainSetup();
988 { 1057 appSetup.PrivateBinPath = Path.Combine(
989 AppDomainSetup appSetup = new AppDomainSetup(); 1058 m_ScriptEnginesPath,
990 appSetup.PrivateBinPath = Path.Combine( 1059 m_Scene.RegionInfo.RegionID.ToString());
991 m_ScriptEnginesPath, 1060
992 m_Scene.RegionInfo.RegionID.ToString()); 1061 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
993 1062 Evidence evidence = new Evidence(baseEvidence);
994 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; 1063
995 Evidence evidence = new Evidence(baseEvidence); 1064 AppDomain sandbox;
996 1065 if (m_AppDomainLoading)
997 AppDomain sandbox; 1066 sandbox = AppDomain.CreateDomain(
998 if (m_AppDomainLoading) 1067 m_Scene.RegionInfo.RegionID.ToString(),
999 sandbox = AppDomain.CreateDomain( 1068 evidence, appSetup);
1000 m_Scene.RegionInfo.RegionID.ToString(), 1069 else
1001 evidence, appSetup); 1070 sandbox = AppDomain.CurrentDomain;
1002 else 1071
1003 sandbox = AppDomain.CurrentDomain; 1072 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
1004 1073 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
1005 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel(); 1074 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
1006 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition(); 1075 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
1007 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet"); 1076 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
1008 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet); 1077 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
1009 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement); 1078 //sandbox.SetAppDomainPolicy(sandboxPolicy);
1010 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup; 1079
1011 //sandbox.SetAppDomainPolicy(sandboxPolicy); 1080 m_AppDomains[appDomain] = sandbox;
1012 1081
1013 m_AppDomains[appDomain] = sandbox; 1082 m_AppDomains[appDomain].AssemblyResolve +=
1014 1083 new ResolveEventHandler(
1015 m_AppDomains[appDomain].AssemblyResolve += 1084 AssemblyResolver.OnAssemblyResolve);
1016 new ResolveEventHandler( 1085 m_DomainScripts[appDomain] = new List<UUID>();
1017 AssemblyResolver.OnAssemblyResolve); 1086 }
1018 m_DomainScripts[appDomain] = new List<UUID>(); 1087 catch (Exception e)
1019 } 1088 {
1020 catch (Exception e) 1089 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
1090 m_ScriptErrorMessage += "Exception creating app domain:\n";
1091 m_ScriptFailCount++;
1092 lock (m_AddingAssemblies)
1021 { 1093 {
1022 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString()); 1094 m_AddingAssemblies[assembly]--;
1023 m_ScriptErrorMessage += "Exception creating app domain:\n";
1024 m_ScriptFailCount++;
1025 lock (m_AddingAssemblies)
1026 {
1027 m_AddingAssemblies[assembly]--;
1028 }
1029 return false;
1030 } 1095 }
1096 return false;
1031 } 1097 }
1032 m_DomainScripts[appDomain].Add(itemID); 1098 }
1033 1099 m_DomainScripts[appDomain].Add(itemID);
1034 instance = new ScriptInstance(this, part, 1100
1035 itemID, assetID, assembly, 1101 instance = new ScriptInstance(this, part,
1036 m_AppDomains[appDomain], 1102 itemID, assetID, assembly,
1037 part.ParentGroup.RootPart.Name, 1103 m_AppDomains[appDomain],
1038 item.Name, startParam, postOnRez, 1104 part.ParentGroup.RootPart.Name,
1039 stateSource, m_MaxScriptQueue); 1105 item.Name, startParam, postOnRez,
1040 1106 stateSource, m_MaxScriptQueue);
1041 m_log.DebugFormat( 1107
1042 "[XEngine] Loaded script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}", 1108 m_log.DebugFormat(
1043 part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID, 1109 "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
1110 part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID,
1044 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName); 1111 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
1045 1112
1046 if (presence != null) 1113 if (presence != null)
1047 { 1114 {
1048 ShowScriptSaveResponse(item.OwnerID, 1115 ShowScriptSaveResponse(item.OwnerID,
1049 assetID, "Compile successful", true); 1116 assetID, "Compile successful", true);
1050 }
1051
1052 instance.AppDomain = appDomain;
1053 instance.LineMap = linemap;
1054
1055 m_Scripts[itemID] = instance;
1056 } 1117 }
1057 }
1058 1118
1119 instance.AppDomain = appDomain;
1120 instance.LineMap = linemap;
1121 lockScriptsForWrite(true);
1122 m_Scripts[itemID] = instance;
1123 lockScriptsForWrite(false);
1124 }
1125 else
1126 {
1127 lockScriptsForRead(false);
1128 }
1059 lock (m_PrimObjects) 1129 lock (m_PrimObjects)
1060 { 1130 {
1061 if (!m_PrimObjects.ContainsKey(localID)) 1131 if (!m_PrimObjects.ContainsKey(localID))
@@ -1074,9 +1144,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1074 m_AddingAssemblies[assembly]--; 1144 m_AddingAssemblies[assembly]--;
1075 } 1145 }
1076 1146
1077 if (instance != null) 1147 if (instance!=null)
1078 instance.Init(); 1148 instance.Init();
1079 1149
1080 return true; 1150 return true;
1081 } 1151 }
1082 1152
@@ -1089,20 +1159,31 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1089 m_CompileDict.Remove(itemID); 1159 m_CompileDict.Remove(itemID);
1090 } 1160 }
1091 1161
1092 IScriptInstance instance = null; 1162 lockScriptsForRead(true);
1093 1163 // Do we even have it?
1094 lock (m_Scripts) 1164 if (!m_Scripts.ContainsKey(itemID))
1095 { 1165 {
1096 // Do we even have it? 1166 // Do we even have it?
1097 if (!m_Scripts.ContainsKey(itemID)) 1167 if (!m_Scripts.ContainsKey(itemID))
1098 return; 1168 return;
1099 1169
1100 instance = m_Scripts[itemID]; 1170 lockScriptsForRead(false);
1171 lockScriptsForWrite(true);
1101 m_Scripts.Remove(itemID); 1172 m_Scripts.Remove(itemID);
1173 lockScriptsForWrite(false);
1174
1175 return;
1102 } 1176 }
1177
1103 1178
1179 IScriptInstance instance=m_Scripts[itemID];
1180 lockScriptsForRead(false);
1181 lockScriptsForWrite(true);
1182 m_Scripts.Remove(itemID);
1183 lockScriptsForWrite(false);
1104 instance.ClearQueue(); 1184 instance.ClearQueue();
1105 instance.Stop(0); 1185 instance.Stop(0);
1186
1106// bool objectRemoved = false; 1187// bool objectRemoved = false;
1107 1188
1108 lock (m_PrimObjects) 1189 lock (m_PrimObjects)
@@ -1138,10 +1219,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1138 ObjectRemoved handlerObjectRemoved = OnObjectRemoved; 1219 ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
1139 if (handlerObjectRemoved != null) 1220 if (handlerObjectRemoved != null)
1140 { 1221 {
1141 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID); 1222 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
1142 handlerObjectRemoved(part.UUID); 1223 handlerObjectRemoved(part.UUID);
1143 } 1224 }
1144 1225
1226 CleanAssemblies();
1227
1145 ScriptRemoved handlerScriptRemoved = OnScriptRemoved; 1228 ScriptRemoved handlerScriptRemoved = OnScriptRemoved;
1146 if (handlerScriptRemoved != null) 1229 if (handlerScriptRemoved != null)
1147 handlerScriptRemoved(itemID); 1230 handlerScriptRemoved(itemID);
@@ -1283,7 +1366,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1283 return false; 1366 return false;
1284 1367
1285 uuids = m_PrimObjects[localID]; 1368 uuids = m_PrimObjects[localID];
1286 } 1369
1287 1370
1288 foreach (UUID itemID in uuids) 1371 foreach (UUID itemID in uuids)
1289 { 1372 {
@@ -1301,6 +1384,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1301 result = true; 1384 result = true;
1302 } 1385 }
1303 } 1386 }
1387 }
1304 1388
1305 return result; 1389 return result;
1306 } 1390 }
@@ -1402,12 +1486,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1402 private IScriptInstance GetInstance(UUID itemID) 1486 private IScriptInstance GetInstance(UUID itemID)
1403 { 1487 {
1404 IScriptInstance instance; 1488 IScriptInstance instance;
1405 lock (m_Scripts) 1489 lockScriptsForRead(true);
1490 if (!m_Scripts.ContainsKey(itemID))
1406 { 1491 {
1407 if (!m_Scripts.ContainsKey(itemID)) 1492 lockScriptsForRead(false);
1408 return null; 1493 return null;
1409 instance = m_Scripts[itemID];
1410 } 1494 }
1495 instance = m_Scripts[itemID];
1496 lockScriptsForRead(false);
1411 return instance; 1497 return instance;
1412 } 1498 }
1413 1499
@@ -1431,6 +1517,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1431 return false; 1517 return false;
1432 } 1518 }
1433 1519
1520 [DebuggerNonUserCode]
1434 public void ApiResetScript(UUID itemID) 1521 public void ApiResetScript(UUID itemID)
1435 { 1522 {
1436 IScriptInstance instance = GetInstance(itemID); 1523 IScriptInstance instance = GetInstance(itemID);
@@ -1482,6 +1569,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1482 return UUID.Zero; 1569 return UUID.Zero;
1483 } 1570 }
1484 1571
1572 [DebuggerNonUserCode]
1485 public void SetState(UUID itemID, string newState) 1573 public void SetState(UUID itemID, string newState)
1486 { 1574 {
1487 IScriptInstance instance = GetInstance(itemID); 1575 IScriptInstance instance = GetInstance(itemID);
@@ -1504,11 +1592,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1504 1592
1505 List<IScriptInstance> instances = new List<IScriptInstance>(); 1593 List<IScriptInstance> instances = new List<IScriptInstance>();
1506 1594
1507 lock (m_Scripts) 1595 lockScriptsForRead(true);
1508 { 1596 foreach (IScriptInstance instance in m_Scripts.Values)
1509 foreach (IScriptInstance instance in m_Scripts.Values)
1510 instances.Add(instance); 1597 instances.Add(instance);
1511 } 1598 lockScriptsForRead(false);
1512 1599
1513 foreach (IScriptInstance i in instances) 1600 foreach (IScriptInstance i in instances)
1514 { 1601 {
@@ -1893,5 +1980,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1893// else 1980// else
1894// m_log.DebugFormat("[XEngine]: Could not find script with ID {0} to resume", itemID); 1981// m_log.DebugFormat("[XEngine]: Could not find script with ID {0} to resume", itemID);
1895 } 1982 }
1983
1984 public bool HasScript(UUID itemID, out bool running)
1985 {
1986 running = true;
1987
1988 IScriptInstance instance = GetInstance(itemID);
1989 if (instance == null)
1990 return false;
1991
1992 running = instance.Running;
1993 return true;
1994 }
1896 } 1995 }
1897} \ No newline at end of file 1996}
generated by cgit v1.1 at 2025-01-03 02:20:59 +0000