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.cs3150
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs116
-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.cs8
-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.cs26
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs41
-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.cs84
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs39
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs364
19 files changed, 2999 insertions, 1160 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 993d10f..3cbdde5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -301,6 +301,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
301 return null; 301 return null;
302 } 302 }
303 303
304 public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
305 {
306 // Remove a specific script
307
308 // Remove dataserver events
309 m_Dataserver[engine].RemoveEvents(localID, itemID);
310
311 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
312 if (comms != null)
313 comms.DeleteListener(itemID);
314
315 IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
316 xmlrpc.DeleteChannels(itemID);
317 xmlrpc.CancelSRDRequests(itemID);
318
319 // Remove Sensors
320 m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
321
322 }
323
304 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) 324 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
305 { 325 {
306 List<Object> data = new List<Object>(); 326 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 d7a629b..4d7c40e 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;
@@ -2844,34 +3098,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2844 public void llLookAt(LSL_Vector target, double strength, double damping) 3098 public void llLookAt(LSL_Vector target, double strength, double damping)
2845 { 3099 {
2846 m_host.AddScriptLPS(1); 3100 m_host.AddScriptLPS(1);
2847 // Determine where we are looking from
2848 LSL_Vector from = llGetPos();
2849 3101
2850 // Work out the normalised vector from the source to the target 3102 // Get the normalized vector to the target
2851 LSL_Vector delta = llVecNorm(target - from); 3103 LSL_Vector d1 = llVecNorm(target - llGetPos());
2852 LSL_Vector angle = new LSL_Vector(0,0,0);
2853 3104
2854 // Calculate the yaw 3105 // Get the bearing (yaw)
2855 // 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);
2856 angle.x = llAtan2(delta.z, delta.y) - ScriptBaseClass.PI_BY_TWO; 3107 a1.z = llAtan2(d1.y, d1.x);
2857 3108
2858 // Calculate pitch 3109 // Get the elevation (pitch)
2859 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)));
2860 3112
2861 // we need to convert from a vector describing 3113 LSL_Rotation r1 = llEuler2Rot(a1);
2862 // 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);
2863 3116
2864 LSL_Rotation rot = llEuler2Rot(angle); 3117 if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
2865
2866 // Per discussion with Melanie, for non-physical objects llLookAt appears to simply
2867 // set the rotation of the object, copy that behavior
2868 if (strength == 0 || m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
2869 { 3118 {
2870 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);
2871 } 3124 }
2872 else 3125 else
2873 { 3126 {
2874 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);
2875 } 3134 }
2876 } 3135 }
2877 3136
@@ -2921,13 +3180,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2921 { 3180 {
2922 TaskInventoryItem item; 3181 TaskInventoryItem item;
2923 3182
2924 lock (m_host.TaskInventory) 3183 m_host.TaskInventory.LockItemsForRead(true);
3184 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2925 { 3185 {
2926 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3186 m_host.TaskInventory.LockItemsForRead(false);
2927 return; 3187 return;
2928 else
2929 item = m_host.TaskInventory[InventorySelf()];
2930 } 3188 }
3189 else
3190 {
3191 item = m_host.TaskInventory[InventorySelf()];
3192 }
3193 m_host.TaskInventory.LockItemsForRead(false);
2931 3194
2932 if (item.PermsGranter != UUID.Zero) 3195 if (item.PermsGranter != UUID.Zero)
2933 { 3196 {
@@ -2949,13 +3212,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2949 { 3212 {
2950 TaskInventoryItem item; 3213 TaskInventoryItem item;
2951 3214
3215 m_host.TaskInventory.LockItemsForRead(true);
2952 lock (m_host.TaskInventory) 3216 lock (m_host.TaskInventory)
2953 { 3217 {
3218
2954 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3219 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3220 {
3221 m_host.TaskInventory.LockItemsForRead(false);
2955 return; 3222 return;
3223 }
2956 else 3224 else
3225 {
2957 item = m_host.TaskInventory[InventorySelf()]; 3226 item = m_host.TaskInventory[InventorySelf()];
3227 }
2958 } 3228 }
3229 m_host.TaskInventory.LockItemsForRead(false);
2959 3230
2960 m_host.AddScriptLPS(1); 3231 m_host.AddScriptLPS(1);
2961 3232
@@ -2987,18 +3258,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2987 { 3258 {
2988 m_host.AddScriptLPS(1); 3259 m_host.AddScriptLPS(1);
2989 3260
2990// if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
2991// return;
2992
2993 TaskInventoryItem item; 3261 TaskInventoryItem item;
2994 3262
2995 lock (m_host.TaskInventory) 3263 m_host.TaskInventory.LockItemsForRead(true);
3264
3265 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2996 { 3266 {
2997 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3267 m_host.TaskInventory.LockItemsForRead(false);
2998 return; 3268 return;
2999 else
3000 item = m_host.TaskInventory[InventorySelf()];
3001 } 3269 }
3270 else
3271 {
3272 item = m_host.TaskInventory[InventorySelf()];
3273 }
3274
3275 m_host.TaskInventory.LockItemsForRead(false);
3002 3276
3003 if (item.PermsGranter != m_host.OwnerID) 3277 if (item.PermsGranter != m_host.OwnerID)
3004 return; 3278 return;
@@ -3024,13 +3298,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3024 3298
3025 TaskInventoryItem item; 3299 TaskInventoryItem item;
3026 3300
3027 lock (m_host.TaskInventory) 3301 m_host.TaskInventory.LockItemsForRead(true);
3302
3303 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3028 { 3304 {
3029 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3305 m_host.TaskInventory.LockItemsForRead(false);
3030 return; 3306 return;
3031 else 3307 }
3032 item = m_host.TaskInventory[InventorySelf()]; 3308 else
3309 {
3310 item = m_host.TaskInventory[InventorySelf()];
3033 } 3311 }
3312 m_host.TaskInventory.LockItemsForRead(false);
3313
3034 3314
3035 if (item.PermsGranter != m_host.OwnerID) 3315 if (item.PermsGranter != m_host.OwnerID)
3036 return; 3316 return;
@@ -3077,6 +3357,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3077 3357
3078 public void llInstantMessage(string user, string message) 3358 public void llInstantMessage(string user, string message)
3079 { 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
3080 m_host.AddScriptLPS(1); 3369 m_host.AddScriptLPS(1);
3081 3370
3082 // 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.
@@ -3091,14 +3380,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3091 UUID friendTransactionID = UUID.Random(); 3380 UUID friendTransactionID = UUID.Random();
3092 3381
3093 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3382 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3094 3383
3095 GridInstantMessage msg = new GridInstantMessage(); 3384 GridInstantMessage msg = new GridInstantMessage();
3096 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3385 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3097 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3386 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3098 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
3099// 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);
3100// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3389// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3101 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
3102 //if (client != null) 3411 //if (client != null)
3103 //{ 3412 //{
3104 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3413 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3112,12 +3421,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3112 msg.message = message.Substring(0, 1024); 3421 msg.message = message.Substring(0, 1024);
3113 else 3422 else
3114 msg.message = message; 3423 msg.message = message;
3115 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3424 msg.dialog = (byte)19; // MessageFromObject
3116 msg.fromGroup = false;// fromGroup; 3425 msg.fromGroup = false;// fromGroup;
3117 msg.offline = (byte)0; //offline; 3426 msg.offline = (byte)0; //offline;
3118 msg.ParentEstateID = 0; //ParentEstateID; 3427 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3119 msg.Position = new Vector3(m_host.AbsolutePosition); 3428 msg.Position = new Vector3(m_host.AbsolutePosition);
3120 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3429 msg.RegionID = World.RegionInfo.RegionID.Guid;
3121 msg.binaryBucket 3430 msg.binaryBucket
3122 = Util.StringToBytes256( 3431 = Util.StringToBytes256(
3123 "{0}/{1}/{2}/{3}", 3432 "{0}/{1}/{2}/{3}",
@@ -3145,7 +3454,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3145 } 3454 }
3146 3455
3147 emailModule.SendEmail(m_host.UUID, address, subject, message); 3456 emailModule.SendEmail(m_host.UUID, address, subject, message);
3148 ScriptSleep(20000); 3457 ScriptSleep(15000);
3149 } 3458 }
3150 3459
3151 public void llGetNextEmail(string address, string subject) 3460 public void llGetNextEmail(string address, string subject)
@@ -3284,14 +3593,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3284 3593
3285 TaskInventoryItem item; 3594 TaskInventoryItem item;
3286 3595
3287 lock (m_host.TaskInventory) 3596 m_host.TaskInventory.LockItemsForRead(true);
3597 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3288 { 3598 {
3289 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3599 m_host.TaskInventory.LockItemsForRead(false);
3290 return; 3600 return;
3291 else
3292 item = m_host.TaskInventory[InventorySelf()];
3293 } 3601 }
3294 3602 else
3603 {
3604 item = m_host.TaskInventory[InventorySelf()];
3605 }
3606 m_host.TaskInventory.LockItemsForRead(false);
3295 if (item.PermsGranter == UUID.Zero) 3607 if (item.PermsGranter == UUID.Zero)
3296 return; 3608 return;
3297 3609
@@ -3321,13 +3633,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3321 3633
3322 TaskInventoryItem item; 3634 TaskInventoryItem item;
3323 3635
3324 lock (m_host.TaskInventory) 3636 m_host.TaskInventory.LockItemsForRead(true);
3637 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3325 { 3638 {
3326 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3639 m_host.TaskInventory.LockItemsForRead(false);
3327 return; 3640 return;
3328 else 3641 }
3329 item = m_host.TaskInventory[InventorySelf()]; 3642 else
3643 {
3644 item = m_host.TaskInventory[InventorySelf()];
3330 } 3645 }
3646 m_host.TaskInventory.LockItemsForRead(false);
3647
3331 3648
3332 if (item.PermsGranter == UUID.Zero) 3649 if (item.PermsGranter == UUID.Zero)
3333 return; 3650 return;
@@ -3394,10 +3711,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3394 3711
3395 TaskInventoryItem item; 3712 TaskInventoryItem item;
3396 3713
3397 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
3398 { 3722 {
3399 item = m_host.TaskInventory[invItemID]; 3723 item = m_host.TaskInventory[invItemID];
3400 } 3724 }
3725 m_host.TaskInventory.LockItemsForRead(false);
3401 3726
3402 if (agentID == UUID.Zero || perm == 0) // Releasing permissions 3727 if (agentID == UUID.Zero || perm == 0) // Releasing permissions
3403 { 3728 {
@@ -3425,15 +3750,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3425 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 3750 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
3426 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3751 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
3427 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3752 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
3753 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
3428 ScriptBaseClass.PERMISSION_ATTACH; 3754 ScriptBaseClass.PERMISSION_ATTACH;
3429 3755
3430 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3756 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3431 { 3757 {
3432 lock (m_host.TaskInventory) 3758 m_host.TaskInventory.LockItemsForWrite(true);
3433 { 3759 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3434 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3760 m_host.TaskInventory[invItemID].PermsMask = perm;
3435 m_host.TaskInventory[invItemID].PermsMask = perm; 3761 m_host.TaskInventory.LockItemsForWrite(false);
3436 }
3437 3762
3438 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3763 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3439 "run_time_permissions", new Object[] { 3764 "run_time_permissions", new Object[] {
@@ -3443,28 +3768,44 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3443 return; 3768 return;
3444 } 3769 }
3445 } 3770 }
3446 else if (m_host.SitTargetAvatar == agentID) // Sitting avatar 3771 else
3447 { 3772 {
3448 // When agent is sitting, certain permissions are implicit if requested from sitting agent 3773 bool sitting = false;
3449 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3774 if (m_host.SitTargetAvatar == agentID)
3450 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3775 {
3451 ScriptBaseClass.PERMISSION_TRACK_CAMERA | 3776 sitting = true;
3452 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 }
3453 3786
3454 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3787 if (sitting)
3455 { 3788 {
3456 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
3457 { 3796 {
3797 m_host.TaskInventory.LockItemsForWrite(true);
3458 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3798 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3459 m_host.TaskInventory[invItemID].PermsMask = perm; 3799 m_host.TaskInventory[invItemID].PermsMask = perm;
3460 } 3800 m_host.TaskInventory.LockItemsForWrite(false);
3461 3801
3462 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3802 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3463 "run_time_permissions", new Object[] { 3803 "run_time_permissions", new Object[] {
3464 new LSL_Integer(perm) }, 3804 new LSL_Integer(perm) },
3465 new DetectParams[0])); 3805 new DetectParams[0]));
3466 3806
3467 return; 3807 return;
3808 }
3468 } 3809 }
3469 } 3810 }
3470 3811
@@ -3478,11 +3819,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3478 3819
3479 if (!m_waitingForScriptAnswer) 3820 if (!m_waitingForScriptAnswer)
3480 { 3821 {
3481 lock (m_host.TaskInventory) 3822 m_host.TaskInventory.LockItemsForWrite(true);
3482 { 3823 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3483 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3824 m_host.TaskInventory[invItemID].PermsMask = 0;
3484 m_host.TaskInventory[invItemID].PermsMask = 0; 3825 m_host.TaskInventory.LockItemsForWrite(false);
3485 }
3486 3826
3487 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3827 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3488 m_waitingForScriptAnswer=true; 3828 m_waitingForScriptAnswer=true;
@@ -3517,10 +3857,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3517 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3857 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3518 llReleaseControls(); 3858 llReleaseControls();
3519 3859
3520 lock (m_host.TaskInventory) 3860
3521 { 3861 m_host.TaskInventory.LockItemsForWrite(true);
3522 m_host.TaskInventory[invItemID].PermsMask = answer; 3862 m_host.TaskInventory[invItemID].PermsMask = answer;
3523 } 3863 m_host.TaskInventory.LockItemsForWrite(false);
3864
3524 3865
3525 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3866 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3526 "run_time_permissions", new Object[] { 3867 "run_time_permissions", new Object[] {
@@ -3532,16 +3873,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3532 { 3873 {
3533 m_host.AddScriptLPS(1); 3874 m_host.AddScriptLPS(1);
3534 3875
3535 lock (m_host.TaskInventory) 3876 m_host.TaskInventory.LockItemsForRead(true);
3877
3878 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3536 { 3879 {
3537 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3880 if (item.Type == 10 && item.ItemID == m_itemID)
3538 { 3881 {
3539 if (item.Type == 10 && item.ItemID == m_itemID) 3882 m_host.TaskInventory.LockItemsForRead(false);
3540 { 3883 return item.PermsGranter.ToString();
3541 return item.PermsGranter.ToString();
3542 }
3543 } 3884 }
3544 } 3885 }
3886 m_host.TaskInventory.LockItemsForRead(false);
3545 3887
3546 return UUID.Zero.ToString(); 3888 return UUID.Zero.ToString();
3547 } 3889 }
@@ -3550,19 +3892,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3550 { 3892 {
3551 m_host.AddScriptLPS(1); 3893 m_host.AddScriptLPS(1);
3552 3894
3553 lock (m_host.TaskInventory) 3895 m_host.TaskInventory.LockItemsForRead(true);
3896
3897 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3554 { 3898 {
3555 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3899 if (item.Type == 10 && item.ItemID == m_itemID)
3556 { 3900 {
3557 if (item.Type == 10 && item.ItemID == m_itemID) 3901 int perms = item.PermsMask;
3558 { 3902 if (m_automaticLinkPermission)
3559 int perms = item.PermsMask; 3903 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
3560 if (m_automaticLinkPermission) 3904 m_host.TaskInventory.LockItemsForRead(false);
3561 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 3905 return perms;
3562 return perms;
3563 }
3564 } 3906 }
3565 } 3907 }
3908 m_host.TaskInventory.LockItemsForRead(false);
3566 3909
3567 return 0; 3910 return 0;
3568 } 3911 }
@@ -3584,9 +3927,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3584 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 3927 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3585 { 3928 {
3586 List<SceneObjectPart> parts = GetLinkParts(linknumber); 3929 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3587 3930 if (parts.Count > 0)
3588 foreach (SceneObjectPart part in parts) 3931 {
3589 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 }
3590 } 3943 }
3591 3944
3592 public void llCreateLink(string target, int parent) 3945 public void llCreateLink(string target, int parent)
@@ -3599,11 +3952,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3599 return; 3952 return;
3600 3953
3601 TaskInventoryItem item; 3954 TaskInventoryItem item;
3602 lock (m_host.TaskInventory) 3955 m_host.TaskInventory.LockItemsForRead(true);
3603 { 3956 item = m_host.TaskInventory[invItemID];
3604 item = m_host.TaskInventory[invItemID]; 3957 m_host.TaskInventory.LockItemsForRead(false);
3605 } 3958
3606
3607 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3959 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3608 && !m_automaticLinkPermission) 3960 && !m_automaticLinkPermission)
3609 { 3961 {
@@ -3620,11 +3972,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3620 3972
3621 if (targetPart.ParentGroup.AttachmentPoint != 0) 3973 if (targetPart.ParentGroup.AttachmentPoint != 0)
3622 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
3623 SceneObjectGroup parentPrim = null, childPrim = null; 3979 SceneObjectGroup parentPrim = null, childPrim = null;
3624 3980
3625 if (targetPart != null) 3981 if (targetPart != null)
3626 { 3982 {
3627 if (parent != 0) { 3983 if (parent != 0)
3984 {
3628 parentPrim = m_host.ParentGroup; 3985 parentPrim = m_host.ParentGroup;
3629 childPrim = targetPart.ParentGroup; 3986 childPrim = targetPart.ParentGroup;
3630 } 3987 }
@@ -3636,7 +3993,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3636 3993
3637 // Required for linking 3994 // Required for linking
3638 childPrim.RootPart.ClearUpdateSchedule(); 3995 childPrim.RootPart.ClearUpdateSchedule();
3639 parentPrim.LinkToGroup(childPrim); 3996 parentPrim.LinkToGroup(childPrim, true);
3640 } 3997 }
3641 3998
3642 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 3999 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3655,16 +4012,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3655 m_host.AddScriptLPS(1); 4012 m_host.AddScriptLPS(1);
3656 UUID invItemID = InventorySelf(); 4013 UUID invItemID = InventorySelf();
3657 4014
3658 lock (m_host.TaskInventory) 4015 m_host.TaskInventory.LockItemsForRead(true);
3659 {
3660 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 4016 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3661 && !m_automaticLinkPermission) 4017 && !m_automaticLinkPermission)
3662 { 4018 {
3663 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);
3664 return; 4021 return;
3665 } 4022 }
3666 } 4023 m_host.TaskInventory.LockItemsForRead(false);
3667 4024
3668 if (linknum < ScriptBaseClass.LINK_THIS) 4025 if (linknum < ScriptBaseClass.LINK_THIS)
3669 return; 4026 return;
3670 4027
@@ -3703,10 +4060,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3703 // Restructuring Multiple Prims. 4060 // Restructuring Multiple Prims.
3704 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); 4061 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
3705 parts.Remove(parentPrim.RootPart); 4062 parts.Remove(parentPrim.RootPart);
3706 foreach (SceneObjectPart part in parts) 4063 if (parts.Count > 0)
3707 { 4064 {
3708 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 }
3709 } 4077 }
4078
3710 parentPrim.HasGroupChanged = true; 4079 parentPrim.HasGroupChanged = true;
3711 parentPrim.ScheduleGroupForFullUpdate(); 4080 parentPrim.ScheduleGroupForFullUpdate();
3712 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 4081 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3715,12 +4084,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3715 { 4084 {
3716 SceneObjectPart newRoot = parts[0]; 4085 SceneObjectPart newRoot = parts[0];
3717 parts.Remove(newRoot); 4086 parts.Remove(newRoot);
3718 foreach (SceneObjectPart part in parts) 4087
4088 try
3719 { 4089 {
3720 // Required for linking 4090 parts[0].ParentGroup.areUpdatesSuspended = true;
3721 part.ClearUpdateSchedule(); 4091 foreach (SceneObjectPart part in parts)
3722 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 4092 {
4093 part.ClearUpdateSchedule();
4094 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
4095 }
3723 } 4096 }
4097 finally
4098 {
4099 parts[0].ParentGroup.areUpdatesSuspended = false;
4100 }
4101
4102
3724 newRoot.ParentGroup.HasGroupChanged = true; 4103 newRoot.ParentGroup.HasGroupChanged = true;
3725 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 4104 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3726 } 4105 }
@@ -3740,6 +4119,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3740 public void llBreakAllLinks() 4119 public void llBreakAllLinks()
3741 { 4120 {
3742 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
3743 SceneObjectGroup parentPrim = m_host.ParentGroup; 4137 SceneObjectGroup parentPrim = m_host.ParentGroup;
3744 if (parentPrim.AttachmentPoint != 0) 4138 if (parentPrim.AttachmentPoint != 0)
3745 return; // Fail silently if attached 4139 return; // Fail silently if attached
@@ -3759,25 +4153,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3759 public LSL_String llGetLinkKey(int linknum) 4153 public LSL_String llGetLinkKey(int linknum)
3760 { 4154 {
3761 m_host.AddScriptLPS(1); 4155 m_host.AddScriptLPS(1);
3762 List<UUID> keytable = new List<UUID>();
3763 // parse for sitting avatare-uuids
3764 World.ForEachRootScenePresence(delegate(ScenePresence presence)
3765 {
3766 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
3767 keytable.Add(presence.UUID);
3768 });
3769
3770 int totalprims = m_host.ParentGroup.PrimCount + keytable.Count;
3771 if (linknum > m_host.ParentGroup.PrimCount && linknum <= totalprims)
3772 {
3773 return keytable[totalprims - linknum].ToString();
3774 }
3775
3776 if (linknum == 1 && m_host.ParentGroup.PrimCount == 1 && keytable.Count == 1)
3777 {
3778 return m_host.UUID.ToString();
3779 }
3780
3781 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); 4156 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
3782 if (part != null) 4157 if (part != null)
3783 { 4158 {
@@ -3785,6 +4160,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3785 } 4160 }
3786 else 4161 else
3787 { 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 }
3788 return UUID.Zero.ToString(); 4176 return UUID.Zero.ToString();
3789 } 4177 }
3790 } 4178 }
@@ -3884,17 +4272,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3884 m_host.AddScriptLPS(1); 4272 m_host.AddScriptLPS(1);
3885 int count = 0; 4273 int count = 0;
3886 4274
3887 lock (m_host.TaskInventory) 4275 m_host.TaskInventory.LockItemsForRead(true);
4276 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3888 { 4277 {
3889 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4278 if (inv.Value.Type == type || type == -1)
3890 { 4279 {
3891 if (inv.Value.Type == type || type == -1) 4280 count = count + 1;
3892 {
3893 count = count + 1;
3894 }
3895 } 4281 }
3896 } 4282 }
3897 4283
4284 m_host.TaskInventory.LockItemsForRead(false);
3898 return count; 4285 return count;
3899 } 4286 }
3900 4287
@@ -3903,16 +4290,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3903 m_host.AddScriptLPS(1); 4290 m_host.AddScriptLPS(1);
3904 ArrayList keys = new ArrayList(); 4291 ArrayList keys = new ArrayList();
3905 4292
3906 lock (m_host.TaskInventory) 4293 m_host.TaskInventory.LockItemsForRead(true);
4294 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3907 { 4295 {
3908 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4296 if (inv.Value.Type == type || type == -1)
3909 { 4297 {
3910 if (inv.Value.Type == type || type == -1) 4298 keys.Add(inv.Value.Name);
3911 {
3912 keys.Add(inv.Value.Name);
3913 }
3914 } 4299 }
3915 } 4300 }
4301 m_host.TaskInventory.LockItemsForRead(false);
3916 4302
3917 if (keys.Count == 0) 4303 if (keys.Count == 0)
3918 { 4304 {
@@ -3949,25 +4335,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3949 } 4335 }
3950 4336
3951 // move the first object found with this inventory name 4337 // move the first object found with this inventory name
3952 lock (m_host.TaskInventory) 4338 m_host.TaskInventory.LockItemsForRead(true);
4339 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3953 { 4340 {
3954 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4341 if (inv.Value.Name == inventory)
3955 { 4342 {
3956 if (inv.Value.Name == inventory) 4343 found = true;
3957 { 4344 objId = inv.Key;
3958 found = true; 4345 assetType = inv.Value.Type;
3959 objId = inv.Key; 4346 objName = inv.Value.Name;
3960 assetType = inv.Value.Type; 4347 break;
3961 objName = inv.Value.Name;
3962 break;
3963 }
3964 } 4348 }
3965 } 4349 }
4350 m_host.TaskInventory.LockItemsForRead(false);
3966 4351
3967 if (!found) 4352 if (!found)
3968 { 4353 {
3969 llSay(0, String.Format("Could not find object '{0}'", inventory)); 4354 llSay(0, String.Format("Could not find object '{0}'", inventory));
3970 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4355 return;
4356// throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
3971 } 4357 }
3972 4358
3973 // check if destination is an object 4359 // check if destination is an object
@@ -3993,48 +4379,68 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3993 return; 4379 return;
3994 } 4380 }
3995 } 4381 }
4382
3996 // destination is an avatar 4383 // destination is an avatar
3997 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4384 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
3998 4385
3999 if (agentItem == null) 4386 if (agentItem == null)
4000 return; 4387 return;
4001 4388
4002 byte[] bucket = new byte[17]; 4389 byte[] bucket = new byte[1];
4003 bucket[0] = (byte)assetType; 4390 bucket[0] = (byte)assetType;
4004 byte[] objBytes = agentItem.ID.GetBytes(); 4391 //byte[] objBytes = agentItem.ID.GetBytes();
4005 Array.Copy(objBytes, 0, bucket, 1, 16); 4392 //Array.Copy(objBytes, 0, bucket, 1, 16);
4006 4393
4007 GridInstantMessage msg = new GridInstantMessage(World, 4394 GridInstantMessage msg = new GridInstantMessage(World,
4008 m_host.UUID, m_host.Name+", an object owned by "+ 4395 m_host.OwnerID, m_host.Name, destId,
4009 resolveName(m_host.OwnerID)+",", destId,
4010 (byte)InstantMessageDialog.TaskInventoryOffered, 4396 (byte)InstantMessageDialog.TaskInventoryOffered,
4011 false, objName+"\n"+m_host.Name+" is located at "+ 4397 false, objName+". "+m_host.Name+" is located at "+
4012 World.RegionInfo.RegionName+" "+ 4398 World.RegionInfo.RegionName+" "+
4013 m_host.AbsolutePosition.ToString(), 4399 m_host.AbsolutePosition.ToString(),
4014 agentItem.ID, true, m_host.AbsolutePosition, 4400 agentItem.ID, true, m_host.AbsolutePosition,
4015 bucket); 4401 bucket);
4016 if (m_TransferModule != null) 4402
4017 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4403 ScenePresence sp;
4404
4405 if (World.TryGetScenePresence(destId, out sp))
4406 {
4407 sp.ControllingClient.SendInstantMessage(msg);
4408 }
4409 else
4410 {
4411 if (m_TransferModule != null)
4412 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4413 }
4414
4415 //This delay should only occur when giving inventory to avatars.
4018 ScriptSleep(3000); 4416 ScriptSleep(3000);
4019 } 4417 }
4020 } 4418 }
4021 4419
4420 [DebuggerNonUserCode]
4022 public void llRemoveInventory(string name) 4421 public void llRemoveInventory(string name)
4023 { 4422 {
4024 m_host.AddScriptLPS(1); 4423 m_host.AddScriptLPS(1);
4025 4424
4026 lock (m_host.TaskInventory) 4425 List<TaskInventoryItem> inv;
4426 try
4027 { 4427 {
4028 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4428 m_host.TaskInventory.LockItemsForRead(true);
4429 inv = new List<TaskInventoryItem>(m_host.TaskInventory.Values);
4430 }
4431 finally
4432 {
4433 m_host.TaskInventory.LockItemsForRead(false);
4434 }
4435 foreach (TaskInventoryItem item in inv)
4436 {
4437 if (item.Name == name)
4029 { 4438 {
4030 if (item.Name == name) 4439 if (item.ItemID == m_itemID)
4031 { 4440 throw new ScriptDeleteException();
4032 if (item.ItemID == m_itemID) 4441 else
4033 throw new ScriptDeleteException(); 4442 m_host.Inventory.RemoveInventoryItem(item.ItemID);
4034 else 4443 return;
4035 m_host.Inventory.RemoveInventoryItem(item.ItemID);
4036 return;
4037 }
4038 } 4444 }
4039 } 4445 }
4040 } 4446 }
@@ -4069,112 +4475,122 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4069 { 4475 {
4070 m_host.AddScriptLPS(1); 4476 m_host.AddScriptLPS(1);
4071 4477
4072 UUID uuid = (UUID)id; 4478 UUID uuid;
4073 PresenceInfo pinfo = null; 4479 if (UUID.TryParse(id, out uuid))
4074 UserAccount account;
4075
4076 UserInfoCacheEntry ce;
4077 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4078 { 4480 {
4079 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); 4481 PresenceInfo pinfo = null;
4080 if (account == null) 4482 UserAccount account;
4483
4484 UserInfoCacheEntry ce;
4485 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4081 { 4486 {
4082 m_userInfoCache[uuid] = null; // Cache negative 4487 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
4083 return UUID.Zero.ToString(); 4488 if (account == null)
4084 } 4489 {
4490 m_userInfoCache[uuid] = null; // Cache negative
4491 return UUID.Zero.ToString();
4492 }
4085 4493
4086 4494
4087 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); 4495 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4088 if (pinfos != null && pinfos.Length > 0) 4496 if (pinfos != null && pinfos.Length > 0)
4089 {
4090 foreach (PresenceInfo p in pinfos)
4091 { 4497 {
4092 if (p.RegionID != UUID.Zero) 4498 foreach (PresenceInfo p in pinfos)
4093 { 4499 {
4094 pinfo = p; 4500 if (p.RegionID != UUID.Zero)
4501 {
4502 pinfo = p;
4503 }
4095 } 4504 }
4096 } 4505 }
4097 }
4098 4506
4099 ce = new UserInfoCacheEntry(); 4507 ce = new UserInfoCacheEntry();
4100 ce.time = Util.EnvironmentTickCount(); 4508 ce.time = Util.EnvironmentTickCount();
4101 ce.account = account; 4509 ce.account = account;
4102 ce.pinfo = pinfo; 4510 ce.pinfo = pinfo;
4103 } 4511 m_userInfoCache[uuid] = ce;
4104 else 4512 }
4105 { 4513 else
4106 if (ce == null) 4514 {
4107 return UUID.Zero.ToString(); 4515 if (ce == null)
4516 return UUID.Zero.ToString();
4108 4517
4109 account = ce.account; 4518 account = ce.account;
4110 pinfo = ce.pinfo; 4519 pinfo = ce.pinfo;
4111 } 4520 }
4112 4521
4113 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) 4522 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
4114 {
4115 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4116 if (pinfos != null && pinfos.Length > 0)
4117 { 4523 {
4118 foreach (PresenceInfo p in pinfos) 4524 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4525 if (pinfos != null && pinfos.Length > 0)
4119 { 4526 {
4120 if (p.RegionID != UUID.Zero) 4527 foreach (PresenceInfo p in pinfos)
4121 { 4528 {
4122 pinfo = p; 4529 if (p.RegionID != UUID.Zero)
4530 {
4531 pinfo = p;
4532 }
4123 } 4533 }
4124 } 4534 }
4125 } 4535 else
4126 else 4536 pinfo = null;
4127 pinfo = null;
4128 4537
4129 ce.time = Util.EnvironmentTickCount(); 4538 ce.time = Util.EnvironmentTickCount();
4130 ce.pinfo = pinfo; 4539 ce.pinfo = pinfo;
4131 } 4540 }
4132 4541
4133 string reply = String.Empty; 4542 string reply = String.Empty;
4134 4543
4135 switch (data) 4544 switch (data)
4136 { 4545 {
4137 case 1: // DATA_ONLINE (0|1) 4546 case 1: // DATA_ONLINE (0|1)
4138 if (pinfo != null && pinfo.RegionID != UUID.Zero) 4547 if (pinfo != null && pinfo.RegionID != UUID.Zero)
4139 reply = "1"; 4548 reply = "1";
4140 else 4549 else
4141 reply = "0"; 4550 reply = "0";
4142 break; 4551 break;
4143 case 2: // DATA_NAME (First Last) 4552 case 2: // DATA_NAME (First Last)
4144 reply = account.FirstName + " " + account.LastName; 4553 reply = account.FirstName + " " + account.LastName;
4145 break; 4554 break;
4146 case 3: // DATA_BORN (YYYY-MM-DD) 4555 case 3: // DATA_BORN (YYYY-MM-DD)
4147 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); 4556 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
4148 born = born.AddSeconds(account.Created); 4557 born = born.AddSeconds(account.Created);
4149 reply = born.ToString("yyyy-MM-dd"); 4558 reply = born.ToString("yyyy-MM-dd");
4150 break; 4559 break;
4151 case 4: // DATA_RATING (0,0,0,0,0,0) 4560 case 4: // DATA_RATING (0,0,0,0,0,0)
4152 reply = "0,0,0,0,0,0"; 4561 reply = "0,0,0,0,0,0";
4153 break; 4562 break;
4154 case 8: // DATA_PAYINFO (0|1|2|3) 4563 case 8: // DATA_PAYINFO (0|1|2|3)
4155 reply = "0"; 4564 reply = "0";
4156 break; 4565 break;
4157 default: 4566 default:
4158 return UUID.Zero.ToString(); // Raise no event 4567 return UUID.Zero.ToString(); // Raise no event
4159 } 4568 }
4160 4569
4161 UUID rq = UUID.Random(); 4570 UUID rq = UUID.Random();
4162 4571
4163 UUID tid = AsyncCommands. 4572 UUID tid = AsyncCommands.
4164 DataserverPlugin.RegisterRequest(m_localID, 4573 DataserverPlugin.RegisterRequest(m_localID,
4165 m_itemID, rq.ToString()); 4574 m_itemID, rq.ToString());
4166 4575
4167 AsyncCommands. 4576 AsyncCommands.
4168 DataserverPlugin.DataserverReply(rq.ToString(), reply); 4577 DataserverPlugin.DataserverReply(rq.ToString(), reply);
4169 4578
4170 ScriptSleep(100); 4579 ScriptSleep(100);
4171 return tid.ToString(); 4580 return tid.ToString();
4581 }
4582 else
4583 {
4584 ShoutError("Invalid UUID passed to llRequestAgentData.");
4585 }
4586 return "";
4172 } 4587 }
4173 4588
4174 public LSL_String llRequestInventoryData(string name) 4589 public LSL_String llRequestInventoryData(string name)
4175 { 4590 {
4176 m_host.AddScriptLPS(1); 4591 m_host.AddScriptLPS(1);
4177 4592
4593 //Clone is thread safe
4178 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 4594 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
4179 4595
4180 foreach (TaskInventoryItem item in itemDictionary.Values) 4596 foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -4226,19 +4642,54 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4226 if (UUID.TryParse(agent, out agentId)) 4642 if (UUID.TryParse(agent, out agentId))
4227 { 4643 {
4228 ScenePresence presence = World.GetScenePresence(agentId); 4644 ScenePresence presence = World.GetScenePresence(agentId);
4229 if (presence != null) 4645 if (presence != null && presence.PresenceType != PresenceType.Npc)
4230 { 4646 {
4647 // agent must not be a god
4648 if (presence.UserLevel >= 200) return;
4649
4231 // agent must be over the owners land 4650 // agent must be over the owners land
4232 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4651 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4233 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 4652 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
4234 { 4653 {
4235 World.TeleportClientHome(agentId, presence.ControllingClient); 4654 if (!World.TeleportClientHome(agentId, presence.ControllingClient))
4655 {
4656 // They can't be teleported home for some reason
4657 GridRegion regionInfo = World.GridService.GetRegionByUUID(UUID.Zero, new UUID("2b02daac-e298-42fa-9a75-f488d37896e6"));
4658 if (regionInfo != null)
4659 {
4660 World.RequestTeleportLocation(
4661 presence.ControllingClient, regionInfo.RegionHandle, new Vector3(128, 128, 23), Vector3.Zero,
4662 (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
4663 }
4664 }
4236 } 4665 }
4237 } 4666 }
4238 } 4667 }
4239 ScriptSleep(5000); 4668 ScriptSleep(5000);
4240 } 4669 }
4241 4670
4671 public void llTeleportAgent(string agent, string simname, LSL_Vector pos, LSL_Vector lookAt)
4672 {
4673 m_host.AddScriptLPS(1);
4674 UUID agentId = new UUID();
4675 if (UUID.TryParse(agent, out agentId))
4676 {
4677 ScenePresence presence = World.GetScenePresence(agentId);
4678 if (presence != null && presence.PresenceType != PresenceType.Npc)
4679 {
4680 // agent must not be a god
4681 if (presence.GodLevel >= 200) return;
4682
4683 // agent must be over the owners land
4684 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4685 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
4686 {
4687 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);
4688 }
4689 }
4690 }
4691 }
4692
4242 public void llTextBox(string agent, string message, int chatChannel) 4693 public void llTextBox(string agent, string message, int chatChannel)
4243 { 4694 {
4244 IDialogModule dm = World.RequestModuleInterface<IDialogModule>(); 4695 IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
@@ -4250,7 +4701,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4250 UUID av = new UUID(); 4701 UUID av = new UUID();
4251 if (!UUID.TryParse(agent,out av)) 4702 if (!UUID.TryParse(agent,out av))
4252 { 4703 {
4253 LSLError("First parameter to llDialog needs to be a key"); 4704 //LSLError("First parameter to llDialog needs to be a key");
4254 return; 4705 return;
4255 } 4706 }
4256 4707
@@ -4287,17 +4738,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4287 UUID soundId = UUID.Zero; 4738 UUID soundId = UUID.Zero;
4288 if (!UUID.TryParse(impact_sound, out soundId)) 4739 if (!UUID.TryParse(impact_sound, out soundId))
4289 { 4740 {
4290 lock (m_host.TaskInventory) 4741 m_host.TaskInventory.LockItemsForRead(true);
4742 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4291 { 4743 {
4292 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4744 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
4293 { 4745 {
4294 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound) 4746 soundId = item.AssetID;
4295 { 4747 break;
4296 soundId = item.AssetID;
4297 break;
4298 }
4299 } 4748 }
4300 } 4749 }
4750 m_host.TaskInventory.LockItemsForRead(false);
4301 } 4751 }
4302 m_host.CollisionSound = soundId; 4752 m_host.CollisionSound = soundId;
4303 m_host.CollisionSoundVolume = (float)impact_volume; 4753 m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4337,6 +4787,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4337 UUID partItemID; 4787 UUID partItemID;
4338 foreach (SceneObjectPart part in parts) 4788 foreach (SceneObjectPart part in parts)
4339 { 4789 {
4790 //Clone is thread safe
4340 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 4791 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
4341 4792
4342 foreach (TaskInventoryItem item in itemsDictionary.Values) 4793 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4540,17 +4991,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4540 4991
4541 m_host.AddScriptLPS(1); 4992 m_host.AddScriptLPS(1);
4542 4993
4543 lock (m_host.TaskInventory) 4994 m_host.TaskInventory.LockItemsForRead(true);
4995 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4544 { 4996 {
4545 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4997 if (item.Type == 10 && item.ItemID == m_itemID)
4546 { 4998 {
4547 if (item.Type == 10 && item.ItemID == m_itemID) 4999 result = item.Name!=null?item.Name:String.Empty;
4548 { 5000 break;
4549 result = item.Name != null ? item.Name : String.Empty;
4550 break;
4551 }
4552 } 5001 }
4553 } 5002 }
5003 m_host.TaskInventory.LockItemsForRead(false);
4554 5004
4555 return result; 5005 return result;
4556 } 5006 }
@@ -4723,23 +5173,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4723 { 5173 {
4724 m_host.AddScriptLPS(1); 5174 m_host.AddScriptLPS(1);
4725 5175
4726 lock (m_host.TaskInventory) 5176 m_host.TaskInventory.LockItemsForRead(true);
5177 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
4727 { 5178 {
4728 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 5179 if (inv.Value.Name == name)
4729 { 5180 {
4730 if (inv.Value.Name == name) 5181 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
4731 { 5182 {
4732 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 5183 m_host.TaskInventory.LockItemsForRead(false);
4733 { 5184 return inv.Value.AssetID.ToString();
4734 return inv.Value.AssetID.ToString(); 5185 }
4735 } 5186 else
4736 else 5187 {
4737 { 5188 m_host.TaskInventory.LockItemsForRead(false);
4738 return UUID.Zero.ToString(); 5189 return UUID.Zero.ToString();
4739 }
4740 } 5190 }
4741 } 5191 }
4742 } 5192 }
5193 m_host.TaskInventory.LockItemsForRead(false);
4743 5194
4744 return UUID.Zero.ToString(); 5195 return UUID.Zero.ToString();
4745 } 5196 }
@@ -4892,14 +5343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4892 { 5343 {
4893 m_host.AddScriptLPS(1); 5344 m_host.AddScriptLPS(1);
4894 5345
4895 if (src == null) 5346 return src.Length;
4896 {
4897 return 0;
4898 }
4899 else
4900 {
4901 return src.Length;
4902 }
4903 } 5347 }
4904 5348
4905 public LSL_Integer llList2Integer(LSL_List src, int index) 5349 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -4945,7 +5389,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4945 else if (src.Data[index] is LSL_Float) 5389 else if (src.Data[index] is LSL_Float)
4946 return Convert.ToDouble(((LSL_Float) src.Data[index]).value); 5390 return Convert.ToDouble(((LSL_Float) src.Data[index]).value);
4947 else if (src.Data[index] is LSL_String) 5391 else if (src.Data[index] is LSL_String)
4948 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 }
4949 return Convert.ToDouble(src.Data[index]); 5406 return Convert.ToDouble(src.Data[index]);
4950 } 5407 }
4951 catch (FormatException) 5408 catch (FormatException)
@@ -5218,7 +5675,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5218 } 5675 }
5219 } 5676 }
5220 } 5677 }
5221 else { 5678 else
5679 {
5222 object[] array = new object[src.Length]; 5680 object[] array = new object[src.Length];
5223 Array.Copy(src.Data, 0, array, 0, src.Length); 5681 Array.Copy(src.Data, 0, array, 0, src.Length);
5224 result = new LSL_List(array); 5682 result = new LSL_List(array);
@@ -5325,7 +5783,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5325 public LSL_Integer llGetRegionAgentCount() 5783 public LSL_Integer llGetRegionAgentCount()
5326 { 5784 {
5327 m_host.AddScriptLPS(1); 5785 m_host.AddScriptLPS(1);
5328 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);
5329 } 5793 }
5330 5794
5331 public LSL_Vector llGetRegionCorner() 5795 public LSL_Vector llGetRegionCorner()
@@ -5605,6 +6069,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5605 flags |= ScriptBaseClass.AGENT_SITTING; 6069 flags |= ScriptBaseClass.AGENT_SITTING;
5606 } 6070 }
5607 6071
6072 if (agent.Appearance.VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MALE] > 0)
6073 {
6074 flags |= ScriptBaseClass.AGENT_MALE;
6075 }
6076
5608 return flags; 6077 return flags;
5609 } 6078 }
5610 6079
@@ -5667,10 +6136,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5667 m_host.AddScriptLPS(1); 6136 m_host.AddScriptLPS(1);
5668 6137
5669 List<SceneObjectPart> parts = GetLinkParts(linknumber); 6138 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5670 6139 if (parts.Count > 0)
5671 foreach (var part in parts)
5672 { 6140 {
5673 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); 6141 try
6142 {
6143 parts[0].ParentGroup.areUpdatesSuspended = true;
6144 foreach (var part in parts)
6145 {
6146 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
6147 }
6148 }
6149 finally
6150 {
6151 parts[0].ParentGroup.areUpdatesSuspended = false;
6152 }
5674 } 6153 }
5675 } 6154 }
5676 6155
@@ -5722,13 +6201,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5722 6201
5723 if (m_host.OwnerID == land.LandData.OwnerID) 6202 if (m_host.OwnerID == land.LandData.OwnerID)
5724 { 6203 {
5725 World.TeleportClientHome(agentID, presence.ControllingClient); 6204 Vector3 pos = World.GetNearestAllowedPosition(presence, land);
6205 presence.TeleportWithMomentum(pos);
6206 presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
5726 } 6207 }
5727 } 6208 }
5728 } 6209 }
5729 ScriptSleep(5000); 6210 ScriptSleep(5000);
5730 } 6211 }
5731 6212
6213 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
6214 {
6215 return ParseString2List(str, separators, in_spacers, false);
6216 }
6217
5732 public LSL_Integer llOverMyLand(string id) 6218 public LSL_Integer llOverMyLand(string id)
5733 { 6219 {
5734 m_host.AddScriptLPS(1); 6220 m_host.AddScriptLPS(1);
@@ -5793,8 +6279,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5793 UUID agentId = new UUID(); 6279 UUID agentId = new UUID();
5794 if (!UUID.TryParse(agent, out agentId)) 6280 if (!UUID.TryParse(agent, out agentId))
5795 return new LSL_Integer(0); 6281 return new LSL_Integer(0);
6282 if (agentId == m_host.GroupID)
6283 return new LSL_Integer(1);
5796 ScenePresence presence = World.GetScenePresence(agentId); 6284 ScenePresence presence = World.GetScenePresence(agentId);
5797 if (presence == null || presence.IsChildAgent) // Return flase for child agents 6285 if (presence == null || presence.IsChildAgent) // Return false for child agents
5798 return new LSL_Integer(0); 6286 return new LSL_Integer(0);
5799 IClientAPI client = presence.ControllingClient; 6287 IClientAPI client = presence.ControllingClient;
5800 if (m_host.GroupID == client.ActiveGroupId) 6288 if (m_host.GroupID == client.ActiveGroupId)
@@ -5929,7 +6417,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5929 return m_host.ParentGroup.AttachmentPoint; 6417 return m_host.ParentGroup.AttachmentPoint;
5930 } 6418 }
5931 6419
5932 public LSL_Integer llGetFreeMemory() 6420 public virtual LSL_Integer llGetFreeMemory()
5933 { 6421 {
5934 m_host.AddScriptLPS(1); 6422 m_host.AddScriptLPS(1);
5935 // Make scripts designed for LSO happy 6423 // Make scripts designed for LSO happy
@@ -6046,7 +6534,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6046 SetParticleSystem(m_host, rules); 6534 SetParticleSystem(m_host, rules);
6047 } 6535 }
6048 6536
6049 private void SetParticleSystem(SceneObjectPart part, LSL_List rules) { 6537 private void SetParticleSystem(SceneObjectPart part, LSL_List rules)
6538 {
6050 6539
6051 6540
6052 if (rules.Length == 0) 6541 if (rules.Length == 0)
@@ -6240,14 +6729,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6240 6729
6241 protected UUID GetTaskInventoryItem(string name) 6730 protected UUID GetTaskInventoryItem(string name)
6242 { 6731 {
6243 lock (m_host.TaskInventory) 6732 m_host.TaskInventory.LockItemsForRead(true);
6733 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6244 { 6734 {
6245 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6735 if (inv.Value.Name == name)
6246 { 6736 {
6247 if (inv.Value.Name == name) 6737 m_host.TaskInventory.LockItemsForRead(false);
6248 return inv.Key; 6738 return inv.Key;
6249 } 6739 }
6250 } 6740 }
6741 m_host.TaskInventory.LockItemsForRead(false);
6251 6742
6252 return UUID.Zero; 6743 return UUID.Zero;
6253 } 6744 }
@@ -6285,16 +6776,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6285 if (folderID == UUID.Zero) 6776 if (folderID == UUID.Zero)
6286 return; 6777 return;
6287 6778
6288 byte[] bucket = new byte[17]; 6779 byte[] bucket = new byte[1];
6289 bucket[0] = (byte)AssetType.Folder; 6780 bucket[0] = (byte)AssetType.Folder;
6290 byte[] objBytes = folderID.GetBytes(); 6781 //byte[] objBytes = folderID.GetBytes();
6291 Array.Copy(objBytes, 0, bucket, 1, 16); 6782 //Array.Copy(objBytes, 0, bucket, 1, 16);
6292 6783
6293 GridInstantMessage msg = new GridInstantMessage(World, 6784 GridInstantMessage msg = new GridInstantMessage(World,
6294 m_host.UUID, m_host.Name+", an object owned by "+ 6785 m_host.OwnerID, m_host.Name, destID,
6295 resolveName(m_host.OwnerID)+",", destID, 6786 (byte)InstantMessageDialog.TaskInventoryOffered,
6296 (byte)InstantMessageDialog.InventoryOffered, 6787 false, category+". "+m_host.Name+" is located at "+
6297 false, category+"\n"+m_host.Name+" is located at "+
6298 World.RegionInfo.RegionName+" "+ 6788 World.RegionInfo.RegionName+" "+
6299 m_host.AbsolutePosition.ToString(), 6789 m_host.AbsolutePosition.ToString(),
6300 folderID, true, m_host.AbsolutePosition, 6790 folderID, true, m_host.AbsolutePosition,
@@ -6532,13 +7022,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6532 UUID av = new UUID(); 7022 UUID av = new UUID();
6533 if (!UUID.TryParse(avatar,out av)) 7023 if (!UUID.TryParse(avatar,out av))
6534 { 7024 {
6535 LSLError("First parameter to llDialog needs to be a key"); 7025 //LSLError("First parameter to llDialog needs to be a key");
6536 return; 7026 return;
6537 } 7027 }
6538 if (buttons.Length < 1) 7028 if (buttons.Length < 1)
6539 { 7029 {
6540 LSLError("No less than 1 button can be shown"); 7030 buttons.Add("OK");
6541 return;
6542 } 7031 }
6543 if (buttons.Length > 12) 7032 if (buttons.Length > 12)
6544 { 7033 {
@@ -6555,7 +7044,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6555 } 7044 }
6556 if (buttons.Data[i].ToString().Length > 24) 7045 if (buttons.Data[i].ToString().Length > 24)
6557 { 7046 {
6558 LSLError("button label cannot be longer than 24 characters"); 7047 llWhisper(ScriptBaseClass.DEBUG_CHANNEL, "button label cannot be longer than 24 characters");
6559 return; 7048 return;
6560 } 7049 }
6561 buts[i] = buttons.Data[i].ToString(); 7050 buts[i] = buttons.Data[i].ToString();
@@ -6614,22 +7103,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6614 } 7103 }
6615 7104
6616 // copy the first script found with this inventory name 7105 // copy the first script found with this inventory name
6617 lock (m_host.TaskInventory) 7106 TaskInventoryItem scriptItem = null;
7107 m_host.TaskInventory.LockItemsForRead(true);
7108 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6618 { 7109 {
6619 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 7110 if (inv.Value.Name == name)
6620 { 7111 {
6621 if (inv.Value.Name == name) 7112 // make sure the object is a script
7113 if (10 == inv.Value.Type)
6622 { 7114 {
6623 // make sure the object is a script 7115 found = true;
6624 if (10 == inv.Value.Type) 7116 srcId = inv.Key;
6625 { 7117 scriptItem = inv.Value;
6626 found = true; 7118 break;
6627 srcId = inv.Key;
6628 break;
6629 }
6630 } 7119 }
6631 } 7120 }
6632 } 7121 }
7122 m_host.TaskInventory.LockItemsForRead(false);
6633 7123
6634 if (!found) 7124 if (!found)
6635 { 7125 {
@@ -6637,9 +7127,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6637 return; 7127 return;
6638 } 7128 }
6639 7129
6640 // the rest of the permission checks are done in RezScript, so check the pin there as well 7130 SceneObjectPart dest = World.GetSceneObjectPart(destId);
6641 World.RezScriptFromPrim(srcId, m_host, destId, pin, running, start_param); 7131 if (dest != null)
7132 {
7133 if ((scriptItem.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID)
7134 {
7135 // the rest of the permission checks are done in RezScript, so check the pin there as well
7136 World.RezScriptFromPrim(srcId, m_host, destId, pin, running, start_param);
6642 7137
7138 if ((scriptItem.BasePermissions & (uint)PermissionMask.Copy) == 0)
7139 m_host.Inventory.RemoveInventoryItem(srcId);
7140 }
7141 }
6643 // this will cause the delay even if the script pin or permissions were wrong - seems ok 7142 // this will cause the delay even if the script pin or permissions were wrong - seems ok
6644 ScriptSleep(3000); 7143 ScriptSleep(3000);
6645 } 7144 }
@@ -6702,19 +7201,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6702 public LSL_String llMD5String(string src, int nonce) 7201 public LSL_String llMD5String(string src, int nonce)
6703 { 7202 {
6704 m_host.AddScriptLPS(1); 7203 m_host.AddScriptLPS(1);
6705 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString())); 7204 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()), Encoding.UTF8);
6706 } 7205 }
6707 7206
6708 public LSL_String llSHA1String(string src) 7207 public LSL_String llSHA1String(string src)
6709 { 7208 {
6710 m_host.AddScriptLPS(1); 7209 m_host.AddScriptLPS(1);
6711 return Util.SHA1Hash(src).ToLower(); 7210 return Util.SHA1Hash(src, Encoding.UTF8).ToLower();
6712 } 7211 }
6713 7212
6714 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) 7213 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve)
6715 { 7214 {
6716 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7215 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6717 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7216 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7217 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7218 return shapeBlock;
6718 7219
6719 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 7220 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6720 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 7221 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6819,6 +7320,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6819 // Prim type box, cylinder and prism. 7320 // Prim type box, cylinder and prism.
6820 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) 7321 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)
6821 { 7322 {
7323 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7324 return;
7325
6822 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7326 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6823 ObjectShapePacket.ObjectDataBlock shapeBlock; 7327 ObjectShapePacket.ObjectDataBlock shapeBlock;
6824 7328
@@ -6872,6 +7376,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6872 // Prim type sphere. 7376 // Prim type sphere.
6873 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve) 7377 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve)
6874 { 7378 {
7379 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7380 return;
7381
6875 ObjectShapePacket.ObjectDataBlock shapeBlock; 7382 ObjectShapePacket.ObjectDataBlock shapeBlock;
6876 7383
6877 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve); 7384 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve);
@@ -6913,6 +7420,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6913 // Prim type torus, tube and ring. 7420 // Prim type torus, tube and ring.
6914 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) 7421 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)
6915 { 7422 {
7423 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7424 return;
7425
6916 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7426 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6917 ObjectShapePacket.ObjectDataBlock shapeBlock; 7427 ObjectShapePacket.ObjectDataBlock shapeBlock;
6918 7428
@@ -7048,6 +7558,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7048 // Prim type sculpt. 7558 // Prim type sculpt.
7049 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve) 7559 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve)
7050 { 7560 {
7561 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7562 return;
7563
7051 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7564 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7052 UUID sculptId; 7565 UUID sculptId;
7053 7566
@@ -7072,7 +7585,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7072 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag)) 7585 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag))
7073 { 7586 {
7074 // default 7587 // default
7075 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7588 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
7076 } 7589 }
7077 7590
7078 part.Shape.SetSculptProperties((byte)type, sculptId); 7591 part.Shape.SetSculptProperties((byte)type, sculptId);
@@ -7088,32 +7601,149 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7088 ScriptSleep(200); 7601 ScriptSleep(200);
7089 } 7602 }
7090 7603
7091 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) 7604 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
7092 { 7605 {
7093 m_host.AddScriptLPS(1); 7606 m_host.AddScriptLPS(1);
7094 7607
7095 setLinkPrimParams(linknumber, rules); 7608 setLinkPrimParams(linknumber, rules);
7609 }
7096 7610
7097 ScriptSleep(200); 7611 private void setLinkPrimParams(int linknumber, LSL_List rules)
7612 {
7613 List<SceneObjectPart> parts = GetLinkParts(linknumber);
7614 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7615 if (parts.Count>0)
7616 {
7617 try
7618 {
7619 parts[0].ParentGroup.areUpdatesSuspended = true;
7620 foreach (SceneObjectPart part in parts)
7621 SetPrimParams(part, rules);
7622 }
7623 finally
7624 {
7625 parts[0].ParentGroup.areUpdatesSuspended = false;
7626 }
7627 }
7628 if (avatars.Count > 0)
7629 {
7630 foreach (ScenePresence avatar in avatars)
7631 SetPrimParams(avatar, rules);
7632 }
7098 } 7633 }
7099 7634
7100 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7635 private void SetPhysicsMaterial(SceneObjectPart part, int material_bits,
7636 float material_density, float material_friction,
7637 float material_restitution, float material_gravity_modifier)
7101 { 7638 {
7102 m_host.AddScriptLPS(1); 7639 ExtraPhysicsData physdata = new ExtraPhysicsData();
7640 physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType;
7641 physdata.Density = part.Density;
7642 physdata.Friction = part.Friction;
7643 physdata.Bounce = part.Bounciness;
7644 physdata.GravitationModifier = part.GravityModifier;
7103 7645
7104 setLinkPrimParams(linknumber, rules); 7646 if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0)
7647 physdata.Density = material_density;
7648 if ((material_bits & (int)ScriptBaseClass.FRICTION) != 0)
7649 physdata.Friction = material_friction;
7650 if ((material_bits & (int)ScriptBaseClass.RESTITUTION) != 0)
7651 physdata.Bounce = material_restitution;
7652 if ((material_bits & (int)ScriptBaseClass.GRAVITY_MULTIPLIER) != 0)
7653 physdata.GravitationModifier = material_gravity_modifier;
7654
7655 part.UpdateExtraPhysics(physdata);
7105 } 7656 }
7106 7657
7107 protected void setLinkPrimParams(int linknumber, LSL_List rules) 7658 public void llSetPhysicsMaterial(int material_bits,
7659 float material_gravity_modifier, float material_restitution,
7660 float material_friction, float material_density)
7108 { 7661 {
7109 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7662 SetPhysicsMaterial(m_host, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
7663 }
7110 7664
7111 foreach (SceneObjectPart part in parts) 7665 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7112 SetPrimParams(part, rules); 7666 {
7667 llSetLinkPrimitiveParamsFast(linknumber, rules);
7668 ScriptSleep(200);
7669 }
7670
7671 protected void SetPrimParams(ScenePresence av, LSL_List rules)
7672 {
7673 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
7674 //We only support PRIM_POSITION and PRIM_ROTATION
7675
7676 int idx = 0;
7677
7678 while (idx < rules.Length)
7679 {
7680 int code = rules.GetLSLIntegerItem(idx++);
7681
7682 int remain = rules.Length - idx;
7683
7684 switch (code)
7685 {
7686 case (int)ScriptBaseClass.PRIM_POSITION:
7687 {
7688 if (remain < 1)
7689 return;
7690 LSL_Vector v;
7691 v = rules.GetVector3Item(idx++);
7692
7693 SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
7694 if (part == null)
7695 break;
7696
7697 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
7698 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
7699 if (llGetLinkNumber() > 1)
7700 {
7701 localRot = llGetLocalRot();
7702 localPos = llGetLocalPos();
7703 }
7704
7705 v -= localPos;
7706 v /= localRot;
7707
7708 LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
7709
7710 v = v + 2 * sitOffset;
7711
7712 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
7713 av.SendAvatarDataToAllAgents();
7714
7715 }
7716 break;
7717
7718 case (int)ScriptBaseClass.PRIM_ROTATION:
7719 {
7720 if (remain < 1)
7721 return;
7722
7723 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
7724 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
7725 if (llGetLinkNumber() > 1)
7726 {
7727 localRot = llGetLocalRot();
7728 localPos = llGetLocalPos();
7729 }
7730
7731 LSL_Rotation r;
7732 r = rules.GetQuaternionItem(idx++);
7733 r = r * llGetRootRotation() / localRot;
7734 av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
7735 av.SendAvatarDataToAllAgents();
7736 }
7737 break;
7738 }
7739 }
7113 } 7740 }
7114 7741
7115 protected void SetPrimParams(SceneObjectPart part, LSL_List rules) 7742 protected void SetPrimParams(SceneObjectPart part, LSL_List rules)
7116 { 7743 {
7744 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7745 return;
7746
7117 int idx = 0; 7747 int idx = 0;
7118 7748
7119 bool positionChanged = false; 7749 bool positionChanged = false;
@@ -7141,6 +7771,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7141 currentPosition = GetSetPosTarget(part, v, currentPosition); 7771 currentPosition = GetSetPosTarget(part, v, currentPosition);
7142 7772
7143 break; 7773 break;
7774 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
7775 if (remain < 1)
7776 return;
7777
7778 v=rules.GetVector3Item(idx++);
7779 positionChanged = true;
7780 currentPosition = GetSetPosTarget(part, v, currentPosition);
7781
7782 break;
7144 case (int)ScriptBaseClass.PRIM_SIZE: 7783 case (int)ScriptBaseClass.PRIM_SIZE:
7145 if (remain < 1) 7784 if (remain < 1)
7146 return; 7785 return;
@@ -7434,6 +8073,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7434 part.ScriptSetPhysicsStatus(physics); 8073 part.ScriptSetPhysicsStatus(physics);
7435 break; 8074 break;
7436 8075
8076 case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
8077 if (remain < 1)
8078 return;
8079
8080 int shape_type = rules.GetLSLIntegerItem(idx++);
8081
8082 ExtraPhysicsData physdata = new ExtraPhysicsData();
8083 physdata.Density = part.Density;
8084 physdata.Bounce = part.Bounciness;
8085 physdata.GravitationModifier = part.GravityModifier;
8086 physdata.PhysShapeType = (PhysShapeType)shape_type;
8087
8088 part.UpdateExtraPhysics(physdata);
8089
8090 break;
8091
8092 case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
8093 if (remain < 5)
8094 return;
8095
8096 int material_bits = rules.GetLSLIntegerItem(idx++);
8097 float material_density = (float)rules.GetLSLFloatItem(idx++);
8098 float material_friction = (float)rules.GetLSLFloatItem(idx++);
8099 float material_restitution = (float)rules.GetLSLFloatItem(idx++);
8100 float material_gravity_modifier = (float)rules.GetLSLFloatItem(idx++);
8101
8102 SetPhysicsMaterial(part, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
8103
8104 break;
8105
7437 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ: 8106 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
7438 if (remain < 1) 8107 if (remain < 1)
7439 return; 8108 return;
@@ -7507,7 +8176,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7507 if (part.ParentGroup.RootPart == part) 8176 if (part.ParentGroup.RootPart == part)
7508 { 8177 {
7509 SceneObjectGroup parent = part.ParentGroup; 8178 SceneObjectGroup parent = part.ParentGroup;
7510 parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z)); 8179 Util.FireAndForget(delegate(object x) {
8180 parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z));
8181 });
7511 } 8182 }
7512 else 8183 else
7513 { 8184 {
@@ -7518,6 +8189,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7518 } 8189 }
7519 } 8190 }
7520 } 8191 }
8192
8193 if (positionChanged)
8194 {
8195 if (part.ParentGroup.RootPart == part)
8196 {
8197 SceneObjectGroup parent = part.ParentGroup;
8198 Util.FireAndForget(delegate(object x) {
8199 parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z));
8200 });
8201 }
8202 else
8203 {
8204 part.OffsetPosition = new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z);
8205 SceneObjectGroup parent = part.ParentGroup;
8206 parent.HasGroupChanged = true;
8207 parent.ScheduleGroupForTerseUpdate();
8208 }
8209 }
7521 } 8210 }
7522 8211
7523 public LSL_String llStringToBase64(string str) 8212 public LSL_String llStringToBase64(string str)
@@ -7678,13 +8367,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7678 public LSL_Integer llGetNumberOfPrims() 8367 public LSL_Integer llGetNumberOfPrims()
7679 { 8368 {
7680 m_host.AddScriptLPS(1); 8369 m_host.AddScriptLPS(1);
7681 int avatarCount = 0; 8370 int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
7682 World.ForEachRootScenePresence(delegate(ScenePresence presence) 8371
7683 {
7684 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
7685 avatarCount++;
7686 });
7687
7688 return m_host.ParentGroup.PrimCount + avatarCount; 8372 return m_host.ParentGroup.PrimCount + avatarCount;
7689 } 8373 }
7690 8374
@@ -7700,55 +8384,98 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7700 m_host.AddScriptLPS(1); 8384 m_host.AddScriptLPS(1);
7701 UUID objID = UUID.Zero; 8385 UUID objID = UUID.Zero;
7702 LSL_List result = new LSL_List(); 8386 LSL_List result = new LSL_List();
8387
8388 // If the ID is not valid, return null result
7703 if (!UUID.TryParse(obj, out objID)) 8389 if (!UUID.TryParse(obj, out objID))
7704 { 8390 {
7705 result.Add(new LSL_Vector()); 8391 result.Add(new LSL_Vector());
7706 result.Add(new LSL_Vector()); 8392 result.Add(new LSL_Vector());
7707 return result; 8393 return result;
7708 } 8394 }
8395
8396 // Check if this is an attached prim. If so, replace
8397 // the UUID with the avatar UUID and report it's bounding box
8398 SceneObjectPart part = World.GetSceneObjectPart(objID);
8399 if (part != null && part.ParentGroup.IsAttachment)
8400 objID = part.ParentGroup.AttachedAvatar;
8401
8402 // Find out if this is an avatar ID. If so, return it's box
7709 ScenePresence presence = World.GetScenePresence(objID); 8403 ScenePresence presence = World.GetScenePresence(objID);
7710 if (presence != null) 8404 if (presence != null)
7711 { 8405 {
7712 if (presence.ParentID == 0) // not sat on an object 8406 // As per LSL Wiki, there is no difference between sitting
8407 // and standing avatar since server 1.36
8408 LSL_Vector lower;
8409 LSL_Vector upper;
8410 if (presence.Animator.Animations.DefaultAnimation.AnimID
8411 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
7713 { 8412 {
7714 LSL_Vector lower; 8413 // This is for ground sitting avatars
7715 LSL_Vector upper; 8414 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7716 if (presence.Animator.Animations.DefaultAnimation.AnimID 8415 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7717 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 8416 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7718 {
7719 // This is for ground sitting avatars
7720 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7721 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7722 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7723 }
7724 else
7725 {
7726 // This is for standing/flying avatars
7727 float height = presence.Appearance.AvatarHeight / 2.0f;
7728 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7729 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7730 }
7731 result.Add(lower);
7732 result.Add(upper);
7733 return result;
7734 } 8417 }
7735 else 8418 else
7736 { 8419 {
7737 // sitting on an object so we need the bounding box of that 8420 // This is for standing/flying avatars
7738 // which should include the avatar so set the UUID to the 8421 float height = presence.Appearance.AvatarHeight / 2.0f;
7739 // UUID of the object the avatar is sat on and allow it to fall through 8422 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7740 // to processing an object 8423 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7741 SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
7742 objID = p.UUID;
7743 } 8424 }
8425
8426 // Adjust to the documented error offsets (see LSL Wiki)
8427 lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
8428 upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
8429
8430 if (lower.x > upper.x)
8431 lower.x = upper.x;
8432 if (lower.y > upper.y)
8433 lower.y = upper.y;
8434 if (lower.z > upper.z)
8435 lower.z = upper.z;
8436
8437 result.Add(lower);
8438 result.Add(upper);
8439 return result;
7744 } 8440 }
7745 SceneObjectPart part = World.GetSceneObjectPart(objID); 8441
8442 part = World.GetSceneObjectPart(objID);
7746 // Currently only works for single prims without a sitting avatar 8443 // Currently only works for single prims without a sitting avatar
7747 if (part != null) 8444 if (part != null)
7748 { 8445 {
7749 Vector3 halfSize = part.Scale / 2.0f; 8446 float minX;
7750 LSL_Vector lower = new LSL_Vector(halfSize.X * -1.0f, halfSize.Y * -1.0f, halfSize.Z * -1.0f); 8447 float maxX;
7751 LSL_Vector upper = new LSL_Vector(halfSize.X, halfSize.Y, halfSize.Z); 8448 float minY;
8449 float maxY;
8450 float minZ;
8451 float maxZ;
8452
8453 // This BBox is in sim coordinates, with the offset being
8454 // a contained point.
8455 Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
8456 out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
8457
8458 minX -= offsets[0].X;
8459 maxX -= offsets[0].X;
8460 minY -= offsets[0].Y;
8461 maxY -= offsets[0].Y;
8462 minZ -= offsets[0].Z;
8463 maxZ -= offsets[0].Z;
8464
8465 LSL_Vector lower;
8466 LSL_Vector upper;
8467
8468 // Adjust to the documented error offsets (see LSL Wiki)
8469 lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
8470 upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
8471
8472 if (lower.x > upper.x)
8473 lower.x = upper.x;
8474 if (lower.y > upper.y)
8475 lower.y = upper.y;
8476 if (lower.z > upper.z)
8477 lower.z = upper.z;
8478
7752 result.Add(lower); 8479 result.Add(lower);
7753 result.Add(upper); 8480 result.Add(upper);
7754 return result; 8481 return result;
@@ -7828,13 +8555,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7828 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X, 8555 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
7829 part.AbsolutePosition.Y, 8556 part.AbsolutePosition.Y,
7830 part.AbsolutePosition.Z); 8557 part.AbsolutePosition.Z);
7831 // For some reason, the part.AbsolutePosition.* values do not change if the
7832 // linkset is rotated; they always reflect the child prim's world position
7833 // as though the linkset is unrotated. This is incompatible behavior with SL's
7834 // implementation, so will break scripts imported from there (not to mention it
7835 // makes it more difficult to determine a child prim's actual inworld position).
7836 if (part.ParentID != 0)
7837 v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition();
7838 res.Add(v); 8558 res.Add(v);
7839 break; 8559 break;
7840 8560
@@ -8005,56 +8725,92 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8005 case (int)ScriptBaseClass.PRIM_BUMP_SHINY: 8725 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
8006 if (remain < 1) 8726 if (remain < 1)
8007 return res; 8727 return res;
8008 8728 face = (int)rules.GetLSLIntegerItem(idx++);
8009 face=(int)rules.GetLSLIntegerItem(idx++);
8010 8729
8011 tex = part.Shape.Textures; 8730 tex = part.Shape.Textures;
8731 int shiny;
8012 if (face == ScriptBaseClass.ALL_SIDES) 8732 if (face == ScriptBaseClass.ALL_SIDES)
8013 { 8733 {
8014 for (face = 0; face < GetNumberOfSides(part); face++) 8734 for (face = 0; face < GetNumberOfSides(part); face++)
8015 { 8735 {
8016 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8736 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8017 // Convert Shininess to PRIM_SHINY_* 8737 if (shinyness == Shininess.High)
8018 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 8738 {
8019 // PRIM_BUMP_* 8739 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8020 res.Add(new LSL_Integer((int)texface.Bump)); 8740 }
8741 else if (shinyness == Shininess.Medium)
8742 {
8743 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8744 }
8745 else if (shinyness == Shininess.Low)
8746 {
8747 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8748 }
8749 else
8750 {
8751 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8752 }
8753 res.Add(new LSL_Integer(shiny));
8754 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8021 } 8755 }
8022 } 8756 }
8023 else 8757 else
8024 { 8758 {
8025 if (face >= 0 && face < GetNumberOfSides(part)) 8759 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8760 if (shinyness == Shininess.High)
8026 { 8761 {
8027 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8762 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8028 // Convert Shininess to PRIM_SHINY_*
8029 res.Add(new LSL_Integer((uint)texface.Shiny >> 6));
8030 // PRIM_BUMP_*
8031 res.Add(new LSL_Integer((int)texface.Bump));
8032 } 8763 }
8764 else if (shinyness == Shininess.Medium)
8765 {
8766 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8767 }
8768 else if (shinyness == Shininess.Low)
8769 {
8770 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8771 }
8772 else
8773 {
8774 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8775 }
8776 res.Add(new LSL_Integer(shiny));
8777 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8033 } 8778 }
8034 break; 8779 break;
8035 8780
8036 case (int)ScriptBaseClass.PRIM_FULLBRIGHT: 8781 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
8037 if (remain < 1) 8782 if (remain < 1)
8038 return res; 8783 return res;
8039 8784 face = (int)rules.GetLSLIntegerItem(idx++);
8040 face=(int)rules.GetLSLIntegerItem(idx++);
8041 8785
8042 tex = part.Shape.Textures; 8786 tex = part.Shape.Textures;
8787 int fullbright;
8043 if (face == ScriptBaseClass.ALL_SIDES) 8788 if (face == ScriptBaseClass.ALL_SIDES)
8044 { 8789 {
8045 for (face = 0; face < GetNumberOfSides(part); face++) 8790 for (face = 0; face < GetNumberOfSides(part); face++)
8046 { 8791 {
8047 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8792 if (tex.GetFace((uint)face).Fullbright == true)
8048 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 8793 {
8794 fullbright = ScriptBaseClass.TRUE;
8795 }
8796 else
8797 {
8798 fullbright = ScriptBaseClass.FALSE;
8799 }
8800 res.Add(new LSL_Integer(fullbright));
8049 } 8801 }
8050 } 8802 }
8051 else 8803 else
8052 { 8804 {
8053 if (face >= 0 && face < GetNumberOfSides(part)) 8805 if (tex.GetFace((uint)face).Fullbright == true)
8054 { 8806 {
8055 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8807 fullbright = ScriptBaseClass.TRUE;
8056 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0));
8057 } 8808 }
8809 else
8810 {
8811 fullbright = ScriptBaseClass.FALSE;
8812 }
8813 res.Add(new LSL_Integer(fullbright));
8058 } 8814 }
8059 break; 8815 break;
8060 8816
@@ -8076,27 +8832,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8076 break; 8832 break;
8077 8833
8078 case (int)ScriptBaseClass.PRIM_TEXGEN: 8834 case (int)ScriptBaseClass.PRIM_TEXGEN:
8835 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
8079 if (remain < 1) 8836 if (remain < 1)
8080 return res; 8837 return res;
8081 8838 face = (int)rules.GetLSLIntegerItem(idx++);
8082 face=(int)rules.GetLSLIntegerItem(idx++);
8083 8839
8084 tex = part.Shape.Textures; 8840 tex = part.Shape.Textures;
8085 if (face == ScriptBaseClass.ALL_SIDES) 8841 if (face == ScriptBaseClass.ALL_SIDES)
8086 { 8842 {
8087 for (face = 0; face < GetNumberOfSides(part); face++) 8843 for (face = 0; face < GetNumberOfSides(part); face++)
8088 { 8844 {
8089 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8845 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8090 // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc. 8846 {
8091 res.Add(new LSL_Integer((uint)texgen >> 1)); 8847 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8848 }
8849 else
8850 {
8851 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8852 }
8092 } 8853 }
8093 } 8854 }
8094 else 8855 else
8095 { 8856 {
8096 if (face >= 0 && face < GetNumberOfSides(part)) 8857 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8097 { 8858 {
8098 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8859 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8099 res.Add(new LSL_Integer((uint)texgen >> 1)); 8860 }
8861 else
8862 {
8863 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8100 } 8864 }
8101 } 8865 }
8102 break; 8866 break;
@@ -8119,28 +8883,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8119 case (int)ScriptBaseClass.PRIM_GLOW: 8883 case (int)ScriptBaseClass.PRIM_GLOW:
8120 if (remain < 1) 8884 if (remain < 1)
8121 return res; 8885 return res;
8122 8886 face = (int)rules.GetLSLIntegerItem(idx++);
8123 face=(int)rules.GetLSLIntegerItem(idx++);
8124 8887
8125 tex = part.Shape.Textures; 8888 tex = part.Shape.Textures;
8889 float primglow;
8126 if (face == ScriptBaseClass.ALL_SIDES) 8890 if (face == ScriptBaseClass.ALL_SIDES)
8127 { 8891 {
8128 for (face = 0; face < GetNumberOfSides(part); face++) 8892 for (face = 0; face < GetNumberOfSides(part); face++)
8129 { 8893 {
8130 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8894 primglow = tex.GetFace((uint)face).Glow;
8131 res.Add(new LSL_Float(texface.Glow)); 8895 res.Add(new LSL_Float(primglow));
8132 } 8896 }
8133 } 8897 }
8134 else 8898 else
8135 { 8899 {
8136 if (face >= 0 && face < GetNumberOfSides(part)) 8900 primglow = tex.GetFace((uint)face).Glow;
8137 { 8901 res.Add(new LSL_Float(primglow));
8138 Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
8139 res.Add(new LSL_Float(texface.Glow));
8140 }
8141 } 8902 }
8142 break; 8903 break;
8143
8144 case (int)ScriptBaseClass.PRIM_TEXT: 8904 case (int)ScriptBaseClass.PRIM_TEXT:
8145 Color4 textColor = part.GetTextColor(); 8905 Color4 textColor = part.GetTextColor();
8146 res.Add(new LSL_String(part.Text)); 8906 res.Add(new LSL_String(part.Text));
@@ -8752,8 +9512,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8752 // The function returns an ordered list 9512 // The function returns an ordered list
8753 // representing the tokens found in the supplied 9513 // representing the tokens found in the supplied
8754 // sources string. If two successive tokenizers 9514 // sources string. If two successive tokenizers
8755 // are encountered, then a NULL entry is added 9515 // are encountered, then a null-string entry is
8756 // to the list. 9516 // added to the list.
8757 // 9517 //
8758 // It is a precondition that the source and 9518 // It is a precondition that the source and
8759 // toekizer lisst are non-null. If they are null, 9519 // toekizer lisst are non-null. If they are null,
@@ -8761,7 +9521,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8761 // while their lengths are being determined. 9521 // while their lengths are being determined.
8762 // 9522 //
8763 // A small amount of working memoryis required 9523 // A small amount of working memoryis required
8764 // of approximately 8*#tokenizers. 9524 // of approximately 8*#tokenizers + 8*srcstrlen.
8765 // 9525 //
8766 // There are many ways in which this function 9526 // There are many ways in which this function
8767 // can be implemented, this implementation is 9527 // can be implemented, this implementation is
@@ -8777,155 +9537,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8777 // and eliminates redundant tokenizers as soon 9537 // and eliminates redundant tokenizers as soon
8778 // as is possible. 9538 // as is possible.
8779 // 9539 //
8780 // The implementation tries to avoid any copying 9540 // The implementation tries to minimize temporary
8781 // of arrays or other objects. 9541 // garbage generation.
8782 // </remarks> 9542 // </remarks>
8783 9543
8784 private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) 9544 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8785 { 9545 {
8786 int beginning = 0; 9546 return ParseString2List(src, separators, spacers, true);
8787 int srclen = src.Length; 9547 }
8788 int seplen = separators.Length;
8789 object[] separray = separators.Data;
8790 int spclen = spacers.Length;
8791 object[] spcarray = spacers.Data;
8792 int mlen = seplen+spclen;
8793
8794 int[] offset = new int[mlen+1];
8795 bool[] active = new bool[mlen];
8796
8797 int best;
8798 int j;
8799
8800 // Initial capacity reduces resize cost
8801 9548
8802 LSL_List tokens = new LSL_List(); 9549 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
9550 {
9551 int srclen = src.Length;
9552 int seplen = separators.Length;
9553 object[] separray = separators.Data;
9554 int spclen = spacers.Length;
9555 object[] spcarray = spacers.Data;
9556 int dellen = 0;
9557 string[] delarray = new string[seplen+spclen];
8803 9558
8804 // All entries are initially valid 9559 int outlen = 0;
9560 string[] outarray = new string[srclen*2+1];
8805 9561
8806 for (int i = 0; i < mlen; i++) 9562 int i, j;
8807 active[i] = true; 9563 string d;
8808 9564
8809 offset[mlen] = srclen; 9565 m_host.AddScriptLPS(1);
8810 9566
8811 while (beginning < srclen) 9567 /*
9568 * Convert separator and spacer lists to C# strings.
9569 * Also filter out null strings so we don't hang.
9570 */
9571 for (i = 0; i < seplen; i ++)
8812 { 9572 {
9573 d = separray[i].ToString();
9574 if (d.Length > 0)
9575 {
9576 delarray[dellen++] = d;
9577 }
9578 }
9579 seplen = dellen;
8813 9580
8814 best = mlen; // as bad as it gets 9581 for (i = 0; i < spclen; i ++)
9582 {
9583 d = spcarray[i].ToString();
9584 if (d.Length > 0)
9585 {
9586 delarray[dellen++] = d;
9587 }
9588 }
8815 9589
8816 // Scan for separators 9590 /*
9591 * Scan through source string from beginning to end.
9592 */
9593 for (i = 0;;)
9594 {
8817 9595
8818 for (j = 0; j < seplen; j++) 9596 /*
9597 * Find earliest delimeter in src starting at i (if any).
9598 */
9599 int earliestDel = -1;
9600 int earliestSrc = srclen;
9601 string earliestStr = null;
9602 for (j = 0; j < dellen; j ++)
8819 { 9603 {
8820 if (separray[j].ToString() == String.Empty) 9604 d = delarray[j];
8821 active[j] = false; 9605 if (d != null)
8822
8823 if (active[j])
8824 { 9606 {
8825 // scan all of the markers 9607 int index = src.IndexOf(d, i);
8826 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) 9608 if (index < 0)
8827 { 9609 {
8828 // not present at all 9610 delarray[j] = null; // delim nowhere in src, don't check it anymore
8829 active[j] = false;
8830 } 9611 }
8831 else 9612 else if (index < earliestSrc)
8832 { 9613 {
8833 // present and correct 9614 earliestSrc = index; // where delimeter starts in source string
8834 if (offset[j] < offset[best]) 9615 earliestDel = j; // where delimeter is in delarray[]
8835 { 9616 earliestStr = d; // the delimeter string from delarray[]
8836 // closest so far 9617 if (index == i) break; // can't do any better than found at beg of string
8837 best = j;
8838 if (offset[best] == beginning)
8839 break;
8840 }
8841 } 9618 }
8842 } 9619 }
8843 } 9620 }
8844 9621
8845 // Scan for spacers 9622 /*
8846 9623 * Output source string starting at i through start of earliest delimeter.
8847 if (offset[best] != beginning) 9624 */
9625 if (keepNulls || (earliestSrc > i))
8848 { 9626 {
8849 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 9627 outarray[outlen++] = src.Substring(i, earliestSrc - i);
8850 {
8851 if (spcarray[j-seplen].ToString() == String.Empty)
8852 active[j] = false;
8853
8854 if (active[j])
8855 {
8856 // scan all of the markers
8857 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
8858 {
8859 // not present at all
8860 active[j] = false;
8861 }
8862 else
8863 {
8864 // present and correct
8865 if (offset[j] < offset[best])
8866 {
8867 // closest so far
8868 best = j;
8869 }
8870 }
8871 }
8872 }
8873 } 9628 }
8874 9629
8875 // This is the normal exit from the scanning loop 9630 /*
9631 * If no delimeter found at or after i, we're done scanning.
9632 */
9633 if (earliestDel < 0) break;
8876 9634
8877 if (best == mlen) 9635 /*
9636 * If delimeter was a spacer, output the spacer.
9637 */
9638 if (earliestDel >= seplen)
8878 { 9639 {
8879 // no markers were found on this pass 9640 outarray[outlen++] = earliestStr;
8880 // so we're pretty much done
8881 if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
8882 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
8883 break;
8884 } 9641 }
8885 9642
8886 // Otherwise we just add the newly delimited token 9643 /*
8887 // and recalculate where the search should continue. 9644 * Look at rest of src string following delimeter.
8888 if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) 9645 */
8889 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 9646 i = earliestSrc + earliestStr.Length;
8890
8891 if (best < seplen)
8892 {
8893 beginning = offset[best] + (separray[best].ToString()).Length;
8894 }
8895 else
8896 {
8897 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
8898 string str = spcarray[best - seplen].ToString();
8899 if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
8900 tokens.Add(new LSL_String(str));
8901 }
8902 } 9647 }
8903 9648
8904 // This an awkward an not very intuitive boundary case. If the 9649 /*
8905 // last substring is a tokenizer, then there is an implied trailing 9650 * Make up an exact-sized output array suitable for an LSL_List object.
8906 // null list entry. Hopefully the single comparison will not be too 9651 */
8907 // arduous. Alternatively the 'break' could be replced with a return 9652 object[] outlist = new object[outlen];
8908 // but that's shabby programming. 9653 for (i = 0; i < outlen; i ++)
8909
8910 if ((beginning == srclen) && (keepNulls))
8911 { 9654 {
8912 if (srclen != 0) 9655 outlist[i] = new LSL_String(outarray[i]);
8913 tokens.Add(new LSL_String(""));
8914 } 9656 }
8915 9657 return new LSL_List(outlist);
8916 return tokens;
8917 }
8918
8919 public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
8920 {
8921 m_host.AddScriptLPS(1);
8922 return this.ParseString(src, separators, spacers, false);
8923 }
8924
8925 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8926 {
8927 m_host.AddScriptLPS(1);
8928 return this.ParseString(src, separators, spacers, true);
8929 } 9658 }
8930 9659
8931 public LSL_Integer llGetObjectPermMask(int mask) 9660 public LSL_Integer llGetObjectPermMask(int mask)
@@ -9002,28 +9731,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9002 { 9731 {
9003 m_host.AddScriptLPS(1); 9732 m_host.AddScriptLPS(1);
9004 9733
9005 lock (m_host.TaskInventory) 9734 m_host.TaskInventory.LockItemsForRead(true);
9735 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9006 { 9736 {
9007 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9737 if (inv.Value.Name == item)
9008 { 9738 {
9009 if (inv.Value.Name == item) 9739 m_host.TaskInventory.LockItemsForRead(false);
9740 switch (mask)
9010 { 9741 {
9011 switch (mask) 9742 case 0:
9012 { 9743 return (int)inv.Value.BasePermissions;
9013 case 0: 9744 case 1:
9014 return (int)inv.Value.BasePermissions; 9745 return (int)inv.Value.CurrentPermissions;
9015 case 1: 9746 case 2:
9016 return (int)inv.Value.CurrentPermissions; 9747 return (int)inv.Value.GroupPermissions;
9017 case 2: 9748 case 3:
9018 return (int)inv.Value.GroupPermissions; 9749 return (int)inv.Value.EveryonePermissions;
9019 case 3: 9750 case 4:
9020 return (int)inv.Value.EveryonePermissions; 9751 return (int)inv.Value.NextPermissions;
9021 case 4:
9022 return (int)inv.Value.NextPermissions;
9023 }
9024 } 9752 }
9025 } 9753 }
9026 } 9754 }
9755 m_host.TaskInventory.LockItemsForRead(false);
9027 9756
9028 return -1; 9757 return -1;
9029 } 9758 }
@@ -9070,16 +9799,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9070 { 9799 {
9071 m_host.AddScriptLPS(1); 9800 m_host.AddScriptLPS(1);
9072 9801
9073 lock (m_host.TaskInventory) 9802 m_host.TaskInventory.LockItemsForRead(true);
9803 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9074 { 9804 {
9075 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9805 if (inv.Value.Name == item)
9076 { 9806 {
9077 if (inv.Value.Name == item) 9807 m_host.TaskInventory.LockItemsForRead(false);
9078 { 9808 return inv.Value.CreatorID.ToString();
9079 return inv.Value.CreatorID.ToString();
9080 }
9081 } 9809 }
9082 } 9810 }
9811 m_host.TaskInventory.LockItemsForRead(false);
9083 9812
9084 llSay(0, "No item name '" + item + "'"); 9813 llSay(0, "No item name '" + item + "'");
9085 9814
@@ -9227,7 +9956,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9227 } 9956 }
9228 9957
9229 /// <summary> 9958 /// <summary>
9230 /// illListReplaceList removes the sub-list defined by the inclusive indices 9959 /// llListReplaceList removes the sub-list defined by the inclusive indices
9231 /// start and end and inserts the src list in its place. The inclusive 9960 /// start and end and inserts the src list in its place. The inclusive
9232 /// nature of the indices means that at least one element must be deleted 9961 /// nature of the indices means that at least one element must be deleted
9233 /// if the indices are within the bounds of the existing list. I.e. 2,2 9962 /// if the indices are within the bounds of the existing list. I.e. 2,2
@@ -9284,16 +10013,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9284 // based upon end. Note that if end exceeds the upper 10013 // based upon end. Note that if end exceeds the upper
9285 // bound in this case, the entire destination list 10014 // bound in this case, the entire destination list
9286 // is removed. 10015 // is removed.
9287 else 10016 else if (start == 0)
9288 { 10017 {
9289 if (end + 1 < dest.Length) 10018 if (end + 1 < dest.Length)
9290 {
9291 return src + dest.GetSublist(end + 1, -1); 10019 return src + dest.GetSublist(end + 1, -1);
9292 }
9293 else 10020 else
9294 {
9295 return src; 10021 return src;
9296 } 10022 }
10023 else // Start < 0
10024 {
10025 if (end + 1 < dest.Length)
10026 return dest.GetSublist(end + 1, -1);
10027 else
10028 return new LSL_List();
9297 } 10029 }
9298 } 10030 }
9299 // Finally, if start > end, we strip away a prefix and 10031 // Finally, if start > end, we strip away a prefix and
@@ -9344,17 +10076,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9344 int width = 0; 10076 int width = 0;
9345 int height = 0; 10077 int height = 0;
9346 10078
9347 ParcelMediaCommandEnum? commandToSend = null; 10079 uint commandToSend = 0;
9348 float time = 0.0f; // default is from start 10080 float time = 0.0f; // default is from start
9349 10081
9350 ScenePresence presence = null; 10082 ScenePresence presence = null;
9351 10083
9352 for (int i = 0; i < commandList.Data.Length; i++) 10084 for (int i = 0; i < commandList.Data.Length; i++)
9353 { 10085 {
9354 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 10086 uint command = (uint)(commandList.GetLSLIntegerItem(i));
9355 switch (command) 10087 switch (command)
9356 { 10088 {
9357 case ParcelMediaCommandEnum.Agent: 10089 case (uint)ParcelMediaCommandEnum.Agent:
9358 // we send only to one agent 10090 // we send only to one agent
9359 if ((i + 1) < commandList.Length) 10091 if ((i + 1) < commandList.Length)
9360 { 10092 {
@@ -9371,25 +10103,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9371 } 10103 }
9372 break; 10104 break;
9373 10105
9374 case ParcelMediaCommandEnum.Loop: 10106 case (uint)ParcelMediaCommandEnum.Loop:
9375 loop = 1; 10107 loop = 1;
9376 commandToSend = command; 10108 commandToSend = command;
9377 update = true; //need to send the media update packet to set looping 10109 update = true; //need to send the media update packet to set looping
9378 break; 10110 break;
9379 10111
9380 case ParcelMediaCommandEnum.Play: 10112 case (uint)ParcelMediaCommandEnum.Play:
9381 loop = 0; 10113 loop = 0;
9382 commandToSend = command; 10114 commandToSend = command;
9383 update = true; //need to send the media update packet to make sure it doesn't loop 10115 update = true; //need to send the media update packet to make sure it doesn't loop
9384 break; 10116 break;
9385 10117
9386 case ParcelMediaCommandEnum.Pause: 10118 case (uint)ParcelMediaCommandEnum.Pause:
9387 case ParcelMediaCommandEnum.Stop: 10119 case (uint)ParcelMediaCommandEnum.Stop:
9388 case ParcelMediaCommandEnum.Unload: 10120 case (uint)ParcelMediaCommandEnum.Unload:
9389 commandToSend = command; 10121 commandToSend = command;
9390 break; 10122 break;
9391 10123
9392 case ParcelMediaCommandEnum.Url: 10124 case (uint)ParcelMediaCommandEnum.Url:
9393 if ((i + 1) < commandList.Length) 10125 if ((i + 1) < commandList.Length)
9394 { 10126 {
9395 if (commandList.Data[i + 1] is LSL_String) 10127 if (commandList.Data[i + 1] is LSL_String)
@@ -9402,7 +10134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9402 } 10134 }
9403 break; 10135 break;
9404 10136
9405 case ParcelMediaCommandEnum.Texture: 10137 case (uint)ParcelMediaCommandEnum.Texture:
9406 if ((i + 1) < commandList.Length) 10138 if ((i + 1) < commandList.Length)
9407 { 10139 {
9408 if (commandList.Data[i + 1] is LSL_String) 10140 if (commandList.Data[i + 1] is LSL_String)
@@ -9415,7 +10147,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9415 } 10147 }
9416 break; 10148 break;
9417 10149
9418 case ParcelMediaCommandEnum.Time: 10150 case (uint)ParcelMediaCommandEnum.Time:
9419 if ((i + 1) < commandList.Length) 10151 if ((i + 1) < commandList.Length)
9420 { 10152 {
9421 if (commandList.Data[i + 1] is LSL_Float) 10153 if (commandList.Data[i + 1] is LSL_Float)
@@ -9427,7 +10159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9427 } 10159 }
9428 break; 10160 break;
9429 10161
9430 case ParcelMediaCommandEnum.AutoAlign: 10162 case (uint)ParcelMediaCommandEnum.AutoAlign:
9431 if ((i + 1) < commandList.Length) 10163 if ((i + 1) < commandList.Length)
9432 { 10164 {
9433 if (commandList.Data[i + 1] is LSL_Integer) 10165 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9441,7 +10173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9441 } 10173 }
9442 break; 10174 break;
9443 10175
9444 case ParcelMediaCommandEnum.Type: 10176 case (uint)ParcelMediaCommandEnum.Type:
9445 if ((i + 1) < commandList.Length) 10177 if ((i + 1) < commandList.Length)
9446 { 10178 {
9447 if (commandList.Data[i + 1] is LSL_String) 10179 if (commandList.Data[i + 1] is LSL_String)
@@ -9454,7 +10186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9454 } 10186 }
9455 break; 10187 break;
9456 10188
9457 case ParcelMediaCommandEnum.Desc: 10189 case (uint)ParcelMediaCommandEnum.Desc:
9458 if ((i + 1) < commandList.Length) 10190 if ((i + 1) < commandList.Length)
9459 { 10191 {
9460 if (commandList.Data[i + 1] is LSL_String) 10192 if (commandList.Data[i + 1] is LSL_String)
@@ -9467,7 +10199,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9467 } 10199 }
9468 break; 10200 break;
9469 10201
9470 case ParcelMediaCommandEnum.Size: 10202 case (uint)ParcelMediaCommandEnum.Size:
9471 if ((i + 2) < commandList.Length) 10203 if ((i + 2) < commandList.Length)
9472 { 10204 {
9473 if (commandList.Data[i + 1] is LSL_Integer) 10205 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9537,7 +10269,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9537 } 10269 }
9538 } 10270 }
9539 10271
9540 if (commandToSend != null) 10272 if (commandToSend != 0)
9541 { 10273 {
9542 // the commandList contained a start/stop/... command, too 10274 // the commandList contained a start/stop/... command, too
9543 if (presence == null) 10275 if (presence == null)
@@ -9574,7 +10306,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9574 10306
9575 if (aList.Data[i] != null) 10307 if (aList.Data[i] != null)
9576 { 10308 {
9577 switch ((ParcelMediaCommandEnum) aList.Data[i]) 10309 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
9578 { 10310 {
9579 case ParcelMediaCommandEnum.Url: 10311 case ParcelMediaCommandEnum.Url:
9580 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); 10312 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL));
@@ -9617,16 +10349,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9617 { 10349 {
9618 m_host.AddScriptLPS(1); 10350 m_host.AddScriptLPS(1);
9619 10351
9620 lock (m_host.TaskInventory) 10352 m_host.TaskInventory.LockItemsForRead(true);
10353 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9621 { 10354 {
9622 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 10355 if (inv.Value.Name == name)
9623 { 10356 {
9624 if (inv.Value.Name == name) 10357 m_host.TaskInventory.LockItemsForRead(false);
9625 { 10358 return inv.Value.Type;
9626 return inv.Value.Type;
9627 }
9628 } 10359 }
9629 } 10360 }
10361 m_host.TaskInventory.LockItemsForRead(false);
9630 10362
9631 return -1; 10363 return -1;
9632 } 10364 }
@@ -9637,15 +10369,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9637 10369
9638 if (quick_pay_buttons.Data.Length < 4) 10370 if (quick_pay_buttons.Data.Length < 4)
9639 { 10371 {
9640 LSLError("List must have at least 4 elements"); 10372 int x;
9641 return; 10373 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
10374 {
10375 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
10376 }
9642 } 10377 }
9643 m_host.ParentGroup.RootPart.PayPrice[0]=price; 10378 int[] nPrice = new int[5];
9644 10379 nPrice[0] = price;
9645 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 10380 nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
9646 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 10381 nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
9647 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 10382 nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
9648 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 10383 nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
10384 m_host.ParentGroup.RootPart.PayPrice = nPrice;
9649 m_host.ParentGroup.HasGroupChanged = true; 10385 m_host.ParentGroup.HasGroupChanged = true;
9650 } 10386 }
9651 10387
@@ -9657,17 +10393,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9657 if (invItemID == UUID.Zero) 10393 if (invItemID == UUID.Zero)
9658 return new LSL_Vector(); 10394 return new LSL_Vector();
9659 10395
9660 lock (m_host.TaskInventory) 10396 m_host.TaskInventory.LockItemsForRead(true);
10397 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9661 { 10398 {
9662 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 10399 m_host.TaskInventory.LockItemsForRead(false);
9663 return new LSL_Vector(); 10400 return new LSL_Vector();
10401 }
9664 10402
9665 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 10403 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9666 { 10404 {
9667 ShoutError("No permissions to track the camera"); 10405 ShoutError("No permissions to track the camera");
9668 return new LSL_Vector(); 10406 m_host.TaskInventory.LockItemsForRead(false);
9669 } 10407 return new LSL_Vector();
9670 } 10408 }
10409 m_host.TaskInventory.LockItemsForRead(false);
9671 10410
9672 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10411 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9673 if (presence != null) 10412 if (presence != null)
@@ -9685,17 +10424,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9685 if (invItemID == UUID.Zero) 10424 if (invItemID == UUID.Zero)
9686 return new LSL_Rotation(); 10425 return new LSL_Rotation();
9687 10426
9688 lock (m_host.TaskInventory) 10427 m_host.TaskInventory.LockItemsForRead(true);
10428 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9689 { 10429 {
9690 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 10430 m_host.TaskInventory.LockItemsForRead(false);
9691 return new LSL_Rotation(); 10431 return new LSL_Rotation();
9692 10432 }
9693 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 10433 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9694 { 10434 {
9695 ShoutError("No permissions to track the camera"); 10435 ShoutError("No permissions to track the camera");
9696 return new LSL_Rotation(); 10436 m_host.TaskInventory.LockItemsForRead(false);
9697 } 10437 return new LSL_Rotation();
9698 } 10438 }
10439 m_host.TaskInventory.LockItemsForRead(false);
9699 10440
9700 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10441 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9701 if (presence != null) 10442 if (presence != null)
@@ -9757,8 +10498,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9757 { 10498 {
9758 m_host.AddScriptLPS(1); 10499 m_host.AddScriptLPS(1);
9759 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0); 10500 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0);
9760 if (detectedParams == null) return; // only works on the first detected avatar 10501 if (detectedParams == null)
9761 10502 {
10503 if (m_host.ParentGroup.IsAttachment == true)
10504 {
10505 detectedParams = new DetectParams();
10506 detectedParams.Key = m_host.OwnerID;
10507 }
10508 else
10509 {
10510 return;
10511 }
10512 }
10513
9762 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 10514 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
9763 if (avatar != null) 10515 if (avatar != null)
9764 { 10516 {
@@ -9766,6 +10518,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9766 new Vector3((float)pos.x, (float)pos.y, (float)pos.z), 10518 new Vector3((float)pos.x, (float)pos.y, (float)pos.z),
9767 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z)); 10519 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z));
9768 } 10520 }
10521
9769 ScriptSleep(1000); 10522 ScriptSleep(1000);
9770 } 10523 }
9771 10524
@@ -9877,14 +10630,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9877 if (objectID == UUID.Zero) return; 10630 if (objectID == UUID.Zero) return;
9878 10631
9879 UUID agentID; 10632 UUID agentID;
9880 lock (m_host.TaskInventory) 10633 m_host.TaskInventory.LockItemsForRead(true);
9881 { 10634 // we need the permission first, to know which avatar we want to set the camera for
9882 // we need the permission first, to know which avatar we want to set the camera for 10635 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9883 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9884 10636
9885 if (agentID == UUID.Zero) return; 10637 if (agentID == UUID.Zero)
9886 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 10638 {
10639 m_host.TaskInventory.LockItemsForRead(false);
10640 return;
10641 }
10642 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10643 {
10644 m_host.TaskInventory.LockItemsForRead(false);
10645 return;
9887 } 10646 }
10647 m_host.TaskInventory.LockItemsForRead(false);
9888 10648
9889 ScenePresence presence = World.GetScenePresence(agentID); 10649 ScenePresence presence = World.GetScenePresence(agentID);
9890 10650
@@ -9893,12 +10653,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9893 10653
9894 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 10654 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
9895 object[] data = rules.Data; 10655 object[] data = rules.Data;
9896 for (int i = 0; i < data.Length; ++i) { 10656 for (int i = 0; i < data.Length; ++i)
10657 {
9897 int type = Convert.ToInt32(data[i++].ToString()); 10658 int type = Convert.ToInt32(data[i++].ToString());
9898 if (i >= data.Length) break; // odd number of entries => ignore the last 10659 if (i >= data.Length) break; // odd number of entries => ignore the last
9899 10660
9900 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 10661 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
9901 switch (type) { 10662 switch (type)
10663 {
9902 case ScriptBaseClass.CAMERA_FOCUS: 10664 case ScriptBaseClass.CAMERA_FOCUS:
9903 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 10665 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
9904 case ScriptBaseClass.CAMERA_POSITION: 10666 case ScriptBaseClass.CAMERA_POSITION:
@@ -9934,12 +10696,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9934 10696
9935 // we need the permission first, to know which avatar we want to clear the camera for 10697 // we need the permission first, to know which avatar we want to clear the camera for
9936 UUID agentID; 10698 UUID agentID;
9937 lock (m_host.TaskInventory) 10699 m_host.TaskInventory.LockItemsForRead(true);
10700 agentID = m_host.TaskInventory[invItemID].PermsGranter;
10701 if (agentID == UUID.Zero)
9938 { 10702 {
9939 agentID = m_host.TaskInventory[invItemID].PermsGranter; 10703 m_host.TaskInventory.LockItemsForRead(false);
9940 if (agentID == UUID.Zero) return; 10704 return;
9941 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
9942 } 10705 }
10706 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10707 {
10708 m_host.TaskInventory.LockItemsForRead(false);
10709 return;
10710 }
10711 m_host.TaskInventory.LockItemsForRead(false);
9943 10712
9944 ScenePresence presence = World.GetScenePresence(agentID); 10713 ScenePresence presence = World.GetScenePresence(agentID);
9945 10714
@@ -10006,19 +10775,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10006 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 10775 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
10007 { 10776 {
10008 m_host.AddScriptLPS(1); 10777 m_host.AddScriptLPS(1);
10009 string ret = String.Empty; 10778
10010 string src1 = llBase64ToString(str1); 10779 if (str1 == String.Empty)
10011 string src2 = llBase64ToString(str2); 10780 return String.Empty;
10012 int c = 0; 10781 if (str2 == String.Empty)
10013 for (int i = 0; i < src1.Length; i++) 10782 return str1;
10783
10784 int len = str2.Length;
10785 if ((len % 4) != 0) // LL is EVIL!!!!
10014 { 10786 {
10015 ret += (char) (src1[i] ^ src2[c]); 10787 while (str2.EndsWith("="))
10788 str2 = str2.Substring(0, str2.Length - 1);
10016 10789
10017 c++; 10790 len = str2.Length;
10018 if (c >= src2.Length) 10791 int mod = len % 4;
10019 c = 0; 10792
10793 if (mod == 1)
10794 str2 = str2.Substring(0, str2.Length - 1);
10795 else if (mod == 2)
10796 str2 += "==";
10797 else if (mod == 3)
10798 str2 += "=";
10020 } 10799 }
10021 return llStringToBase64(ret); 10800
10801 byte[] data1;
10802 byte[] data2;
10803 try
10804 {
10805 data1 = Convert.FromBase64String(str1);
10806 data2 = Convert.FromBase64String(str2);
10807 }
10808 catch (Exception)
10809 {
10810 return new LSL_String(String.Empty);
10811 }
10812
10813 byte[] d2 = new Byte[data1.Length];
10814 int pos = 0;
10815
10816 if (data1.Length <= data2.Length)
10817 {
10818 Array.Copy(data2, 0, d2, 0, data1.Length);
10819 }
10820 else
10821 {
10822 while (pos < data1.Length)
10823 {
10824 len = data1.Length - pos;
10825 if (len > data2.Length)
10826 len = data2.Length;
10827
10828 Array.Copy(data2, 0, d2, pos, len);
10829 pos += len;
10830 }
10831 }
10832
10833 for (pos = 0 ; pos < data1.Length ; pos++ )
10834 data1[pos] ^= d2[pos];
10835
10836 return Convert.ToBase64String(data1);
10022 } 10837 }
10023 10838
10024 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 10839 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -10075,12 +10890,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10075 Regex r = new Regex(authregex); 10890 Regex r = new Regex(authregex);
10076 int[] gnums = r.GetGroupNumbers(); 10891 int[] gnums = r.GetGroupNumbers();
10077 Match m = r.Match(url); 10892 Match m = r.Match(url);
10078 if (m.Success) { 10893 if (m.Success)
10079 for (int i = 1; i < gnums.Length; i++) { 10894 {
10895 for (int i = 1; i < gnums.Length; i++)
10896 {
10080 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 10897 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
10081 //CaptureCollection cc = g.Captures; 10898 //CaptureCollection cc = g.Captures;
10082 } 10899 }
10083 if (m.Groups.Count == 5) { 10900 if (m.Groups.Count == 5)
10901 {
10084 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 10902 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
10085 url = m.Groups[1].ToString() + m.Groups[4].ToString(); 10903 url = m.Groups[1].ToString() + m.Groups[4].ToString();
10086 } 10904 }
@@ -10366,15 +11184,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10366 11184
10367 internal UUID ScriptByName(string name) 11185 internal UUID ScriptByName(string name)
10368 { 11186 {
10369 lock (m_host.TaskInventory) 11187 m_host.TaskInventory.LockItemsForRead(true);
11188
11189 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
10370 { 11190 {
10371 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 11191 if (item.Type == 10 && item.Name == name)
10372 { 11192 {
10373 if (item.Type == 10 && item.Name == name) 11193 m_host.TaskInventory.LockItemsForRead(false);
10374 return item.ItemID; 11194 return item.ItemID;
10375 } 11195 }
10376 } 11196 }
10377 11197
11198 m_host.TaskInventory.LockItemsForRead(false);
11199
10378 return UUID.Zero; 11200 return UUID.Zero;
10379 } 11201 }
10380 11202
@@ -10415,6 +11237,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10415 { 11237 {
10416 m_host.AddScriptLPS(1); 11238 m_host.AddScriptLPS(1);
10417 11239
11240 //Clone is thread safe
10418 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 11241 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10419 11242
10420 UUID assetID = UUID.Zero; 11243 UUID assetID = UUID.Zero;
@@ -10477,6 +11300,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10477 { 11300 {
10478 m_host.AddScriptLPS(1); 11301 m_host.AddScriptLPS(1);
10479 11302
11303 //Clone is thread safe
10480 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 11304 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10481 11305
10482 UUID assetID = UUID.Zero; 11306 UUID assetID = UUID.Zero;
@@ -10557,15 +11381,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10557 return GetLinkPrimitiveParams(obj, rules); 11381 return GetLinkPrimitiveParams(obj, rules);
10558 } 11382 }
10559 11383
10560 public void print(string str) 11384 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
10561 { 11385 {
10562 // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print 11386 List<SceneObjectPart> parts = GetLinkParts(link);
10563 IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_itemID, "OSSL"); 11387 if (parts.Count < 1)
10564 if (ossl != null) 11388 return 0;
10565 { 11389
10566 ossl.CheckThreatLevel(ThreatLevel.High, "print"); 11390 return GetNumberOfSides(parts[0]);
10567 m_log.Info("LSL print():" + str);
10568 }
10569 } 11391 }
10570 11392
10571 private string Name2Username(string name) 11393 private string Name2Username(string name)
@@ -10611,153 +11433,397 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10611 return rq.ToString(); 11433 return rq.ToString();
10612 } 11434 }
10613 11435
11436 private void SayShoutTimerElapsed(Object sender, ElapsedEventArgs args)
11437 {
11438 m_SayShoutCount = 0;
11439 }
11440
11441 private struct Tri
11442 {
11443 public Vector3 p1;
11444 public Vector3 p2;
11445 public Vector3 p3;
11446 }
11447
11448 private bool InBoundingBox(ScenePresence avatar, Vector3 point)
11449 {
11450 float height = avatar.Appearance.AvatarHeight;
11451 Vector3 b1 = avatar.AbsolutePosition + new Vector3(-0.22f, -0.22f, -height/2);
11452 Vector3 b2 = avatar.AbsolutePosition + new Vector3(0.22f, 0.22f, height/2);
11453
11454 if (point.X > b1.X && point.X < b2.X &&
11455 point.Y > b1.Y && point.Y < b2.Y &&
11456 point.Z > b1.Z && point.Z < b2.Z)
11457 return true;
11458 return false;
11459 }
11460
11461 private ContactResult[] AvatarIntersection(Vector3 rayStart, Vector3 rayEnd)
11462 {
11463 List<ContactResult> contacts = new List<ContactResult>();
11464
11465 Vector3 ab = rayEnd - rayStart;
11466
11467 World.ForEachScenePresence(delegate(ScenePresence sp)
11468 {
11469 Vector3 ac = sp.AbsolutePosition - rayStart;
11470 Vector3 bc = sp.AbsolutePosition - rayEnd;
11471
11472 double d = Math.Abs(Vector3.Mag(Vector3.Cross(ab, ac)) / Vector3.Distance(rayStart, rayEnd));
11473
11474 if (d > 1.5)
11475 return;
11476
11477 double d2 = Vector3.Dot(Vector3.Negate(ab), ac);
11478
11479 if (d2 > 0)
11480 return;
11481
11482 double dp = Math.Sqrt(Vector3.Mag(ac) * Vector3.Mag(ac) - d * d);
11483 Vector3 p = rayStart + Vector3.Divide(Vector3.Multiply(ab, (float)dp), (float)Vector3.Mag(ab));
11484
11485 if (!InBoundingBox(sp, p))
11486 return;
11487
11488 ContactResult result = new ContactResult ();
11489 result.ConsumerID = sp.LocalId;
11490 result.Depth = Vector3.Distance(rayStart, p);
11491 result.Normal = Vector3.Zero;
11492 result.Pos = p;
11493
11494 contacts.Add(result);
11495 });
11496
11497 return contacts.ToArray();
11498 }
11499
11500 private ContactResult[] ObjectIntersection(Vector3 rayStart, Vector3 rayEnd, bool includePhysical, bool includeNonPhysical, bool includePhantom)
11501 {
11502 Ray ray = new Ray(rayStart, Vector3.Normalize(rayEnd - rayStart));
11503 List<ContactResult> contacts = new List<ContactResult>();
11504
11505 Vector3 ab = rayEnd - rayStart;
11506
11507 World.ForEachSOG(delegate(SceneObjectGroup group)
11508 {
11509 if (m_host.ParentGroup == group)
11510 return;
11511
11512 if (group.IsAttachment)
11513 return;
11514
11515 if (group.RootPart.PhysActor == null)
11516 {
11517 if (!includePhantom)
11518 return;
11519 }
11520 else
11521 {
11522 if (group.RootPart.PhysActor.IsPhysical)
11523 {
11524 if (!includePhysical)
11525 return;
11526 }
11527 else
11528 {
11529 if (!includeNonPhysical)
11530 return;
11531 }
11532 }
11533
11534 // Find the radius ouside of which we don't even need to hit test
11535 float minX;
11536 float maxX;
11537 float minY;
11538 float maxY;
11539 float minZ;
11540 float maxZ;
11541
11542 float radius = 0.0f;
11543
11544 group.GetAxisAlignedBoundingBoxRaw(out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
11545
11546 if (Math.Abs(minX) > radius)
11547 radius = Math.Abs(minX);
11548 if (Math.Abs(minY) > radius)
11549 radius = Math.Abs(minY);
11550 if (Math.Abs(minZ) > radius)
11551 radius = Math.Abs(minZ);
11552 if (Math.Abs(maxX) > radius)
11553 radius = Math.Abs(maxX);
11554 if (Math.Abs(maxY) > radius)
11555 radius = Math.Abs(maxY);
11556 if (Math.Abs(maxZ) > radius)
11557 radius = Math.Abs(maxZ);
11558
11559 Vector3 ac = group.AbsolutePosition - rayStart;
11560 Vector3 bc = group.AbsolutePosition - rayEnd;
11561
11562 double d = Math.Abs(Vector3.Mag(Vector3.Cross(ab, ac)) / Vector3.Distance(rayStart, rayEnd));
11563
11564 // Too far off ray, don't bother
11565 if (d > radius)
11566 return;
11567
11568 // Behind ray, drop
11569 double d2 = Vector3.Dot(Vector3.Negate(ab), ac);
11570 if (d2 > 0)
11571 return;
11572
11573 EntityIntersection intersection = group.TestIntersection(ray, true, false);
11574 // Miss.
11575 if (!intersection.HitTF)
11576 return;
11577
11578 ContactResult result = new ContactResult ();
11579 result.ConsumerID = group.LocalId;
11580 result.Depth = intersection.distance;
11581 result.Normal = intersection.normal;
11582 result.Pos = intersection.ipoint;
11583
11584 contacts.Add(result);
11585 });
11586
11587 return contacts.ToArray();
11588 }
11589
11590 private ContactResult? GroundIntersection(Vector3 rayStart, Vector3 rayEnd)
11591 {
11592 double[,] heightfield = World.Heightmap.GetDoubles();
11593 List<ContactResult> contacts = new List<ContactResult>();
11594
11595 double min = 2048.0;
11596 double max = 0.0;
11597
11598 // Find the min and max of the heightfield
11599 for (int x = 0 ; x < World.Heightmap.Width ; x++)
11600 {
11601 for (int y = 0 ; y < World.Heightmap.Height ; y++)
11602 {
11603 if (heightfield[x, y] > max)
11604 max = heightfield[x, y];
11605 if (heightfield[x, y] < min)
11606 min = heightfield[x, y];
11607 }
11608 }
11609
11610
11611 // A ray extends past rayEnd, but doesn't go back before
11612 // rayStart. If the start is above the highest point of the ground
11613 // and the ray goes up, we can't hit the ground. Ever.
11614 if (rayStart.Z > max && rayEnd.Z >= rayStart.Z)
11615 return null;
11616
11617 // Same for going down
11618 if (rayStart.Z < min && rayEnd.Z <= rayStart.Z)
11619 return null;
11620
11621 List<Tri> trilist = new List<Tri>();
11622
11623 // Create our triangle list
11624 for (int x = 1 ; x < World.Heightmap.Width ; x++)
11625 {
11626 for (int y = 1 ; y < World.Heightmap.Height ; y++)
11627 {
11628 Tri t1 = new Tri();
11629 Tri t2 = new Tri();
11630
11631 Vector3 p1 = new Vector3(x-1, y-1, (float)heightfield[x-1, y-1]);
11632 Vector3 p2 = new Vector3(x, y-1, (float)heightfield[x, y-1]);
11633 Vector3 p3 = new Vector3(x, y, (float)heightfield[x, y]);
11634 Vector3 p4 = new Vector3(x-1, y, (float)heightfield[x-1, y]);
11635
11636 t1.p1 = p1;
11637 t1.p2 = p2;
11638 t1.p3 = p3;
11639
11640 t2.p1 = p3;
11641 t2.p2 = p4;
11642 t2.p3 = p1;
11643
11644 trilist.Add(t1);
11645 trilist.Add(t2);
11646 }
11647 }
11648
11649 // Ray direction
11650 Vector3 rayDirection = rayEnd - rayStart;
11651
11652 foreach (Tri t in trilist)
11653 {
11654 // Compute triangle plane normal and edges
11655 Vector3 u = t.p2 - t.p1;
11656 Vector3 v = t.p3 - t.p1;
11657 Vector3 n = Vector3.Cross(u, v);
11658
11659 if (n == Vector3.Zero)
11660 continue;
11661
11662 Vector3 w0 = rayStart - t.p1;
11663 double a = -Vector3.Dot(n, w0);
11664 double b = Vector3.Dot(n, rayDirection);
11665
11666 // Not intersecting the plane, or in plane (same thing)
11667 // Ignoring this MAY cause the ground to not be detected
11668 // sometimes
11669 if (Math.Abs(b) < 0.000001)
11670 continue;
11671
11672 double r = a / b;
11673
11674 // ray points away from plane
11675 if (r < 0.0)
11676 continue;
11677
11678 Vector3 ip = rayStart + Vector3.Multiply(rayDirection, (float)r);
11679
11680 float uu = Vector3.Dot(u, u);
11681 float uv = Vector3.Dot(u, v);
11682 float vv = Vector3.Dot(v, v);
11683 Vector3 w = ip - t.p1;
11684 float wu = Vector3.Dot(w, u);
11685 float wv = Vector3.Dot(w, v);
11686 float d = uv * uv - uu * vv;
11687
11688 float cs = (uv * wv - vv * wu) / d;
11689 if (cs < 0 || cs > 1.0)
11690 continue;
11691 float ct = (uv * wu - uu * wv) / d;
11692 if (ct < 0 || (cs + ct) > 1.0)
11693 continue;
11694
11695 // Add contact point
11696 ContactResult result = new ContactResult ();
11697 result.ConsumerID = 0;
11698 result.Depth = Vector3.Distance(rayStart, ip);
11699 result.Normal = n;
11700 result.Pos = ip;
11701
11702 contacts.Add(result);
11703 }
11704
11705 if (contacts.Count == 0)
11706 return null;
11707
11708 contacts.Sort(delegate(ContactResult a, ContactResult b)
11709 {
11710 return (int)(a.Depth - b.Depth);
11711 });
11712
11713 return contacts[0];
11714 }
11715
10614 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) 11716 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
10615 { 11717 {
11718 LSL_List list = new LSL_List();
11719
10616 m_host.AddScriptLPS(1); 11720 m_host.AddScriptLPS(1);
10617 11721
10618 Vector3 dir = new Vector3((float)(end-start).x, (float)(end-start).y, (float)(end-start).z); 11722 Vector3 rayStart = new Vector3((float)start.x, (float)start.y, (float)start.z);
10619 Vector3 startvector = new Vector3((float)start.x, (float)start.y, (float)start.z); 11723 Vector3 rayEnd = new Vector3((float)end.x, (float)end.y, (float)end.z);
10620 Vector3 endvector = new Vector3((float)end.x, (float)end.y, (float)end.z); 11724 Vector3 dir = rayEnd - rayStart;
10621 11725
10622 int count = 0; 11726 float dist = Vector3.Mag(dir);
10623// int detectPhantom = 0; 11727
11728 int count = 1;
11729 bool detectPhantom = false;
10624 int dataFlags = 0; 11730 int dataFlags = 0;
10625 int rejectTypes = 0; 11731 int rejectTypes = 0;
10626 11732
10627 for (int i = 0; i < options.Length; i += 2) 11733 for (int i = 0; i < options.Length; i += 2)
10628 { 11734 {
10629 if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_MAX_HITS) 11735 if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_MAX_HITS)
10630 {
10631 count = options.GetLSLIntegerItem(i + 1); 11736 count = options.GetLSLIntegerItem(i + 1);
10632 } 11737 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DETECT_PHANTOM)
10633// else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DETECT_PHANTOM) 11738 detectPhantom = (options.GetLSLIntegerItem(i + 1) > 0);
10634// {
10635// detectPhantom = options.GetLSLIntegerItem(i + 1);
10636// }
10637 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DATA_FLAGS) 11739 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_DATA_FLAGS)
10638 {
10639 dataFlags = options.GetLSLIntegerItem(i + 1); 11740 dataFlags = options.GetLSLIntegerItem(i + 1);
10640 }
10641 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_REJECT_TYPES) 11741 else if (options.GetLSLIntegerItem(i) == ScriptBaseClass.RC_REJECT_TYPES)
10642 {
10643 rejectTypes = options.GetLSLIntegerItem(i + 1); 11742 rejectTypes = options.GetLSLIntegerItem(i + 1);
10644 }
10645 } 11743 }
10646 11744
10647 LSL_List list = new LSL_List(); 11745 if (count > 16)
10648 List<ContactResult> results = World.PhysicsScene.RaycastWorld(startvector, dir, dir.Length(), count); 11746 count = 16;
10649
10650 double distance = Util.GetDistanceTo(startvector, endvector);
10651 11747
10652 if (distance == 0) 11748 List<ContactResult> results = new List<ContactResult>();
10653 distance = 0.001;
10654
10655 Vector3 posToCheck = startvector;
10656 ITerrainChannel channel = World.RequestModuleInterface<ITerrainChannel>();
10657 11749
10658 bool checkTerrain = !((rejectTypes & ScriptBaseClass.RC_REJECT_LAND) == ScriptBaseClass.RC_REJECT_LAND); 11750 bool checkTerrain = !((rejectTypes & ScriptBaseClass.RC_REJECT_LAND) == ScriptBaseClass.RC_REJECT_LAND);
10659 bool checkAgents = !((rejectTypes & ScriptBaseClass.RC_REJECT_AGENTS) == ScriptBaseClass.RC_REJECT_AGENTS); 11751 bool checkAgents = !((rejectTypes & ScriptBaseClass.RC_REJECT_AGENTS) == ScriptBaseClass.RC_REJECT_AGENTS);
10660 bool checkNonPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_NONPHYSICAL) == ScriptBaseClass.RC_REJECT_NONPHYSICAL); 11752 bool checkNonPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_NONPHYSICAL) == ScriptBaseClass.RC_REJECT_NONPHYSICAL);
10661 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); 11753 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL);
10662 11754
10663 for (float i = 0; i <= distance; i += 0.1f) 11755 if (checkTerrain)
10664 { 11756 {
10665 posToCheck = startvector + (dir * (i / (float)distance)); 11757 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd);
11758 if (groundContact != null)
11759 results.Add((ContactResult)groundContact);
11760 }
10666 11761
10667 if (checkTerrain && channel[(int)(posToCheck.X + startvector.X), (int)(posToCheck.Y + startvector.Y)] < posToCheck.Z) 11762 if (checkAgents)
10668 { 11763 {
10669 ContactResult result = new ContactResult(); 11764 ContactResult[] agentHits = AvatarIntersection(rayStart, rayEnd);
10670 result.ConsumerID = 0; 11765 foreach (ContactResult r in agentHits)
10671 result.Depth = 0; 11766 results.Add(r);
10672 result.Normal = Vector3.Zero; 11767 }
10673 result.Pos = posToCheck;
10674 results.Add(result);
10675 checkTerrain = false;
10676 }
10677 11768
10678 if (checkAgents) 11769 if (checkPhysical || checkNonPhysical)
10679 { 11770 {
10680 World.ForEachRootScenePresence(delegate(ScenePresence sp) 11771 ContactResult[] objectHits = ObjectIntersection(rayStart, rayEnd, checkPhysical, checkNonPhysical, detectPhantom);
10681 { 11772 foreach (ContactResult r in objectHits)
10682 if (sp.AbsolutePosition.ApproxEquals(posToCheck, sp.PhysicsActor.Size.X)) 11773 results.Add(r);
10683 {
10684 ContactResult result = new ContactResult ();
10685 result.ConsumerID = sp.LocalId;
10686 result.Depth = 0;
10687 result.Normal = Vector3.Zero;
10688 result.Pos = posToCheck;
10689 results.Add(result);
10690 }
10691 });
10692 }
10693 } 11774 }
10694 11775
10695 int refcount = 0; 11776 results.Sort(delegate(ContactResult a, ContactResult b)
11777 {
11778 return (int)(a.Depth - b.Depth);
11779 });
11780
11781 int values = 0;
10696 foreach (ContactResult result in results) 11782 foreach (ContactResult result in results)
10697 { 11783 {
10698 if ((rejectTypes & ScriptBaseClass.RC_REJECT_LAND) 11784 if (result.Depth > dist)
10699 == ScriptBaseClass.RC_REJECT_LAND && result.ConsumerID == 0)
10700 continue; 11785 continue;
10701 11786
10702 ISceneEntity entity = World.GetSceneObjectPart(result.ConsumerID); 11787 UUID itemID = UUID.Zero;
11788 int linkNum = 0;
10703 11789
10704 if (entity == null && (rejectTypes & ScriptBaseClass.RC_REJECT_AGENTS) != ScriptBaseClass.RC_REJECT_AGENTS) 11790 SceneObjectPart part = World.GetSceneObjectPart(result.ConsumerID);
10705 entity = World.GetScenePresence(result.ConsumerID); //Only check if we should be looking for agents 11791 // It's a prim!
10706 11792 if (part != null)
10707 if (entity == null)
10708 { 11793 {
10709 list.Add(UUID.Zero); 11794 if ((dataFlags & ScriptBaseClass.RC_GET_ROOT_KEY) == ScriptBaseClass.RC_GET_ROOT_KEY)
10710 11795 itemID = part.ParentGroup.UUID;
10711 if ((dataFlags & ScriptBaseClass.RC_GET_LINK_NUM) == ScriptBaseClass.RC_GET_LINK_NUM) 11796 else
10712 list.Add(0); 11797 itemID = part.UUID;
10713
10714 list.Add(result.Pos);
10715
10716 if ((dataFlags & ScriptBaseClass.RC_GET_NORMAL) == ScriptBaseClass.RC_GET_NORMAL)
10717 list.Add(result.Normal);
10718 11798
10719 continue; //Can't find it, so add UUID.Zero 11799 linkNum = part.LinkNum;
10720 } 11800 }
10721 11801 else
10722 /*if (detectPhantom == 0 && intersection.obj is ISceneChildEntity &&
10723 ((ISceneChildEntity)intersection.obj).PhysActor == null)
10724 continue;*/ //Can't do this ATM, physics engine knows only of non phantom objects
10725
10726 if (entity is SceneObjectPart)
10727 { 11802 {
10728 if (((SceneObjectPart)entity).PhysActor != null && ((SceneObjectPart)entity).PhysActor.IsPhysical) 11803 ScenePresence sp = World.GetScenePresence(result.ConsumerID);
10729 { 11804 /// It it a boy? a girl?
10730 if (!checkPhysical) 11805 if (sp != null)
10731 continue; 11806 itemID = sp.UUID;
10732 }
10733 else
10734 {
10735 if (!checkNonPhysical)
10736 continue;
10737 }
10738 } 11807 }
10739 11808
10740 refcount++; 11809 list.Add(new LSL_String(itemID.ToString()));
10741 if ((dataFlags & ScriptBaseClass.RC_GET_ROOT_KEY) == ScriptBaseClass.RC_GET_ROOT_KEY && entity is SceneObjectPart) 11810 list.Add(new LSL_String(result.Pos.ToString()));
10742 list.Add(((SceneObjectPart)entity).ParentGroup.UUID);
10743 else
10744 list.Add(entity.UUID);
10745 11811
10746 if ((dataFlags & ScriptBaseClass.RC_GET_LINK_NUM) == ScriptBaseClass.RC_GET_LINK_NUM) 11812 if ((dataFlags & ScriptBaseClass.RC_GET_LINK_NUM) == ScriptBaseClass.RC_GET_LINK_NUM)
10747 { 11813 list.Add(new LSL_Integer(linkNum));
10748 if (entity is SceneObjectPart)
10749 list.Add(((SceneObjectPart)entity).LinkNum);
10750 else
10751 list.Add(0);
10752 }
10753 11814
10754 list.Add(result.Pos);
10755 11815
10756 if ((dataFlags & ScriptBaseClass.RC_GET_NORMAL) == ScriptBaseClass.RC_GET_NORMAL) 11816 if ((dataFlags & ScriptBaseClass.RC_GET_NORMAL) == ScriptBaseClass.RC_GET_NORMAL)
10757 list.Add(result.Normal); 11817 list.Add(new LSL_Vector(result.Normal.X, result.Normal.Y, result.Normal.Z));
11818
11819 values++;
11820 count--;
11821
11822 if (count == 0)
11823 break;
10758 } 11824 }
10759 11825
10760 list.Add(refcount); //The status code, either the # of contacts, RCERR_SIM_PERF_LOW, or RCERR_CAST_TIME_EXCEEDED 11826 list.Add(new LSL_Integer(values));
10761 11827
10762 return list; 11828 return list;
10763 } 11829 }
@@ -10797,7 +11863,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10797 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD: 11863 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD:
10798 if (!isAccount) return 0; 11864 if (!isAccount) return 0;
10799 if (estate.HasAccess(id)) return 1; 11865 if (estate.HasAccess(id)) return 1;
10800 if (estate.IsBanned(id)) 11866 if (estate.IsBanned(id, World.GetUserFlags(id)))
10801 estate.RemoveBan(id); 11867 estate.RemoveBan(id);
10802 estate.AddEstateUser(id); 11868 estate.AddEstateUser(id);
10803 break; 11869 break;
@@ -10816,14 +11882,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10816 break; 11882 break;
10817 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD: 11883 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD:
10818 if (!isAccount) return 0; 11884 if (!isAccount) return 0;
10819 if (estate.IsBanned(id)) return 1; 11885 if (estate.IsBanned(id, World.GetUserFlags(id))) return 1;
10820 EstateBan ban = new EstateBan(); 11886 EstateBan ban = new EstateBan();
10821 ban.EstateID = estate.EstateID; 11887 ban.EstateID = estate.EstateID;
10822 ban.BannedUserID = id; 11888 ban.BannedUserID = id;
10823 estate.AddBan(ban); 11889 estate.AddBan(ban);
10824 break; 11890 break;
10825 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE: 11891 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE:
10826 if (!isAccount || !estate.IsBanned(id)) return 0; 11892 if (!isAccount || !estate.IsBanned(id, World.GetUserFlags(id))) return 0;
10827 estate.RemoveBan(id); 11893 estate.RemoveBan(id);
10828 break; 11894 break;
10829 default: return 0; 11895 default: return 0;
@@ -10849,22 +11915,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10849 NotImplemented("llGetSPMaxMemory"); 11915 NotImplemented("llGetSPMaxMemory");
10850 } 11916 }
10851 11917
10852 public void llGetUsedMemory() 11918 public virtual LSL_Integer llGetUsedMemory()
10853 { 11919 {
10854 m_host.AddScriptLPS(1); 11920 m_host.AddScriptLPS(1);
10855 NotImplemented("llGetUsedMemory"); 11921 NotImplemented("llGetUsedMemory");
11922 return 0;
10856 } 11923 }
10857 11924
10858 public void llScriptProfiler(LSL_Integer flags) 11925 public void llScriptProfiler(LSL_Integer flags)
10859 { 11926 {
10860 m_host.AddScriptLPS(1); 11927 m_host.AddScriptLPS(1);
10861 NotImplemented("llScriptProfiler"); 11928 //NotImplemented("llScriptProfiler");
10862 } 11929 }
10863 11930
10864 public void llSetSoundQueueing(int queue) 11931 public void llSetSoundQueueing(int queue)
10865 { 11932 {
10866 m_host.AddScriptLPS(1); 11933 m_host.AddScriptLPS(1);
10867 NotImplemented("llSetSoundQueueing");
10868 } 11934 }
10869 11935
10870 public void llCollisionSprite(string impact_sprite) 11936 public void llCollisionSprite(string impact_sprite)
@@ -10876,10 +11942,274 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10876 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 11942 public void llGodLikeRezObject(string inventory, LSL_Vector pos)
10877 { 11943 {
10878 m_host.AddScriptLPS(1); 11944 m_host.AddScriptLPS(1);
10879 NotImplemented("llGodLikeRezObject"); 11945
11946 if (!World.Permissions.IsGod(m_host.OwnerID))
11947 NotImplemented("llGodLikeRezObject");
11948
11949 AssetBase rezAsset = World.AssetService.Get(inventory);
11950 if (rezAsset == null)
11951 {
11952 llSay(0, "Asset not found");
11953 return;
11954 }
11955
11956 SceneObjectGroup group = null;
11957
11958 try
11959 {
11960 string xmlData = Utils.BytesToString(rezAsset.Data);
11961 group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
11962 }
11963 catch
11964 {
11965 llSay(0, "Asset not found");
11966 return;
11967 }
11968
11969 if (group == null)
11970 {
11971 llSay(0, "Asset not found");
11972 return;
11973 }
11974
11975 group.RootPart.AttachPoint = group.RootPart.Shape.State;
11976 group.RootPart.AttachOffset = group.AbsolutePosition;
11977
11978 group.ResetIDs();
11979
11980 Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
11981 World.AddNewSceneObject(group, true, llpos, Quaternion.Identity, Vector3.Zero);
11982 group.CreateScriptInstances(0, true, World.DefaultScriptEngine, 3);
11983 group.ScheduleGroupForFullUpdate();
11984
11985 // objects rezzed with this method are die_at_edge by default.
11986 group.RootPart.SetDieAtEdge(true);
11987
11988 group.ResumeScripts();
11989
11990 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
11991 "object_rez", new Object[] {
11992 new LSL_String(
11993 group.RootPart.UUID.ToString()) },
11994 new DetectParams[0]));
11995 }
11996
11997 public LSL_String llTransferLindenDollars(string destination, int amount)
11998 {
11999 UUID txn = UUID.Random();
12000
12001 Util.FireAndForget(delegate(object x)
12002 {
12003 int replycode = 0;
12004 string replydata = destination + "," + amount.ToString();
12005
12006 try
12007 {
12008 UUID invItemID=InventorySelf();
12009 if (invItemID == UUID.Zero)
12010 {
12011 replydata = "SERVICE_ERROR";
12012 return;
12013 }
12014
12015 m_host.AddScriptLPS(1);
12016
12017 m_host.TaskInventory.LockItemsForRead(true);
12018 TaskInventoryItem item = m_host.TaskInventory[invItemID];
12019 m_host.TaskInventory.LockItemsForRead(false);
12020
12021 if (item.PermsGranter == UUID.Zero)
12022 {
12023 replydata = "MISSING_PERMISSION_DEBIT";
12024 return;
12025 }
12026
12027 if ((item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0)
12028 {
12029 replydata = "MISSING_PERMISSION_DEBIT";
12030 return;
12031 }
12032
12033 UUID toID = new UUID();
12034
12035 if (!UUID.TryParse(destination, out toID))
12036 {
12037 replydata = "INVALID_AGENT";
12038 return;
12039 }
12040
12041 IMoneyModule money = World.RequestModuleInterface<IMoneyModule>();
12042
12043 if (money == null)
12044 {
12045 replydata = "TRANSFERS_DISABLED";
12046 return;
12047 }
12048
12049 bool result = money.ObjectGiveMoney(
12050 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount);
12051
12052 if (result)
12053 {
12054 replycode = 1;
12055 return;
12056 }
12057
12058 replydata = "LINDENDOLLAR_INSUFFICIENTFUNDS";
12059 }
12060 finally
12061 {
12062 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
12063 "transaction_result", new Object[] {
12064 new LSL_String(txn.ToString()),
12065 new LSL_Integer(replycode),
12066 new LSL_String(replydata) },
12067 new DetectParams[0]));
12068 }
12069 });
12070
12071 return txn.ToString();
10880 } 12072 }
10881 12073
10882 #endregion 12074 #endregion
12075
12076 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
12077 {
12078 SceneObjectGroup group = m_host.ParentGroup;
12079
12080 if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
12081 return;
12082 if (group.IsAttachment)
12083 return;
12084
12085 if (frames.Data.Length > 0) // We are getting a new motion
12086 {
12087 if (group.RootPart.KeyframeMotion != null)
12088 group.RootPart.KeyframeMotion.Stop();
12089 group.RootPart.KeyframeMotion = null;
12090
12091 int idx = 0;
12092
12093 KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
12094 KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
12095
12096 while (idx < options.Data.Length)
12097 {
12098 int option = (int)options.GetLSLIntegerItem(idx++);
12099 int remain = options.Data.Length - idx;
12100
12101 switch (option)
12102 {
12103 case ScriptBaseClass.KFM_MODE:
12104 if (remain < 1)
12105 break;
12106 int modeval = (int)options.GetLSLIntegerItem(idx++);
12107 switch(modeval)
12108 {
12109 case ScriptBaseClass.KFM_FORWARD:
12110 mode = KeyframeMotion.PlayMode.Forward;
12111 break;
12112 case ScriptBaseClass.KFM_REVERSE:
12113 mode = KeyframeMotion.PlayMode.Reverse;
12114 break;
12115 case ScriptBaseClass.KFM_LOOP:
12116 mode = KeyframeMotion.PlayMode.Loop;
12117 break;
12118 case ScriptBaseClass.KFM_PING_PONG:
12119 mode = KeyframeMotion.PlayMode.PingPong;
12120 break;
12121 }
12122 break;
12123 case ScriptBaseClass.KFM_DATA:
12124 if (remain < 1)
12125 break;
12126 int dataval = (int)options.GetLSLIntegerItem(idx++);
12127 data = (KeyframeMotion.DataFormat)dataval;
12128 break;
12129 }
12130 }
12131
12132 group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data);
12133
12134 idx = 0;
12135
12136 int elemLength = 2;
12137 if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation))
12138 elemLength = 3;
12139
12140 List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>();
12141 while (idx < frames.Data.Length)
12142 {
12143 int remain = frames.Data.Length - idx;
12144
12145 if (remain < elemLength)
12146 break;
12147
12148 KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe();
12149 frame.Position = null;
12150 frame.Rotation = null;
12151
12152 if ((data & KeyframeMotion.DataFormat.Translation) != 0)
12153 {
12154 LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++);
12155 frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z);
12156 }
12157 if ((data & KeyframeMotion.DataFormat.Rotation) != 0)
12158 {
12159 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
12160 frame.Rotation = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
12161 }
12162
12163 float tempf = (float)frames.GetLSLFloatItem(idx++);
12164 frame.TimeMS = (int)(tempf * 1000.0f);
12165
12166 keyframes.Add(frame);
12167 }
12168
12169 group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray());
12170 group.RootPart.KeyframeMotion.Start();
12171 }
12172 else
12173 {
12174 if (group.RootPart.KeyframeMotion == null)
12175 return;
12176
12177 if (options.Data.Length == 0)
12178 {
12179 group.RootPart.KeyframeMotion.Stop();
12180 return;
12181 }
12182
12183 int code = (int)options.GetLSLIntegerItem(0);
12184
12185 int idx = 0;
12186
12187 while (idx < options.Data.Length)
12188 {
12189 int option = (int)options.GetLSLIntegerItem(idx++);
12190 int remain = options.Data.Length - idx;
12191
12192 switch (option)
12193 {
12194 case ScriptBaseClass.KFM_COMMAND:
12195 int cmd = (int)options.GetLSLIntegerItem(idx++);
12196 switch (cmd)
12197 {
12198 case ScriptBaseClass.KFM_CMD_PLAY:
12199 group.RootPart.KeyframeMotion.Start();
12200 break;
12201 case ScriptBaseClass.KFM_CMD_STOP:
12202 group.RootPart.KeyframeMotion.Stop();
12203 break;
12204 case ScriptBaseClass.KFM_CMD_PAUSE:
12205 group.RootPart.KeyframeMotion.Pause();
12206 break;
12207 }
12208 break;
12209 }
12210 }
12211 }
12212 }
10883 } 12213 }
10884 12214
10885 public class NotecardCache 12215 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 2ecd890..d140c26 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)
@@ -2272,7 +2281,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2272 CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); 2281 CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
2273 m_host.AddScriptLPS(1); 2282 m_host.AddScriptLPS(1);
2274 2283
2275 return NpcCreate(firstname, lastname, position, notecard, false, false); 2284 return NpcCreate(firstname, lastname, position, notecard, true, false);
2276 } 2285 }
2277 2286
2278 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) 2287 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
@@ -2283,24 +2292,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2283 return NpcCreate( 2292 return NpcCreate(
2284 firstname, lastname, position, notecard, 2293 firstname, lastname, position, notecard,
2285 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, 2294 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0,
2286 (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0); 2295 false);
2296// (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
2287 } 2297 }
2288 2298
2289 private LSL_Key NpcCreate( 2299 private LSL_Key NpcCreate(
2290 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent) 2300 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent)
2291 { 2301 {
2302 if (!owned)
2303 OSSLError("Unowned NPCs are unsupported");
2304
2305 string groupTitle = String.Empty;
2306
2307 if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z)))
2308 return new LSL_Key(UUID.Zero.ToString());
2309
2310 if (firstname != String.Empty || lastname != String.Empty)
2311 {
2312 if (firstname != "Shown outfit:")
2313 groupTitle = "- NPC -";
2314 }
2315
2292 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2316 INPCModule module = World.RequestModuleInterface<INPCModule>();
2293 if (module != null) 2317 if (module != null)
2294 { 2318 {
2295 AvatarAppearance appearance = null; 2319 AvatarAppearance appearance = null;
2296 2320
2297 UUID id; 2321// UUID id;
2298 if (UUID.TryParse(notecard, out id)) 2322// if (UUID.TryParse(notecard, out id))
2299 { 2323// {
2300 ScenePresence clonePresence = World.GetScenePresence(id); 2324// ScenePresence clonePresence = World.GetScenePresence(id);
2301 if (clonePresence != null) 2325// if (clonePresence != null)
2302 appearance = clonePresence.Appearance; 2326// appearance = clonePresence.Appearance;
2303 } 2327// }
2304 2328
2305 if (appearance == null) 2329 if (appearance == null)
2306 { 2330 {
@@ -2328,6 +2352,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2328 World, 2352 World,
2329 appearance); 2353 appearance);
2330 2354
2355 ScenePresence sp;
2356 if (World.TryGetScenePresence(x, out sp))
2357 {
2358 sp.Grouptitle = groupTitle;
2359 sp.SendAvatarDataToAllAgents();
2360 }
2331 return new LSL_Key(x.ToString()); 2361 return new LSL_Key(x.ToString());
2332 } 2362 }
2333 2363
@@ -2596,16 +2626,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2596 CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); 2626 CheckThreatLevel(ThreatLevel.High, "osNpcRemove");
2597 m_host.AddScriptLPS(1); 2627 m_host.AddScriptLPS(1);
2598 2628
2599 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2629 ManualResetEvent ev = new ManualResetEvent(false);
2600 if (module != null)
2601 {
2602 UUID npcId = new UUID(npc.m_string);
2603 2630
2604 if (!module.CheckPermissions(npcId, m_host.OwnerID)) 2631 Util.FireAndForget(delegate(object x) {
2605 return; 2632 try
2633 {
2634 INPCModule module = World.RequestModuleInterface<INPCModule>();
2635 if (module != null)
2636 {
2637 UUID npcId = new UUID(npc.m_string);
2606 2638
2607 module.DeleteNPC(npcId, World); 2639 ILandObject l = World.LandChannel.GetLandObject(m_host.GroupPosition.X, m_host.GroupPosition.Y);
2608 } 2640 if (l == null || m_host.OwnerID != l.LandData.OwnerID)
2641 {
2642 if (!module.CheckPermissions(npcId, m_host.OwnerID))
2643 return;
2644 }
2645
2646 module.DeleteNPC(npcId, World);
2647 }
2648 }
2649 finally
2650 {
2651 ev.Set();
2652 }
2653 });
2654 ev.WaitOne();
2609 } 2655 }
2610 2656
2611 public void osNpcPlayAnimation(LSL_Key npc, string animation) 2657 public void osNpcPlayAnimation(LSL_Key npc, string animation)
@@ -2981,4 +3027,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2981 return String.Empty; 3027 return String.Empty;
2982 } 3028 }
2983 } 3029 }
2984} \ No newline at end of file 3030}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 1c272f8..1373971 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
222 // Is the sensor type is AGENT and not SCRIPTED then include agents 222 // Is the sensor type is AGENT and not SCRIPTED then include agents
223 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0) 223 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0)
224 { 224 {
225 sensedEntities.AddRange(doAgentSensor(ts)); 225 sensedEntities.AddRange(doAgentSensor(ts));
226 } 226 }
227 227
228 // If SCRIPTED or PASSIVE or ACTIVE check objects 228 // If SCRIPTED or PASSIVE or ACTIVE check objects
@@ -319,13 +319,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
319 float dy; 319 float dy;
320 float dz; 320 float dz;
321 321
322 Quaternion q = SensePoint.RotationOffset; 322// Quaternion q = SensePoint.RotationOffset;
323 Quaternion q = SensePoint.GetWorldRotation(); // non-attached prim Sensor *always* uses World rotation!
323 if (SensePoint.ParentGroup.IsAttachment) 324 if (SensePoint.ParentGroup.IsAttachment)
324 { 325 {
325 // In attachments, the sensor cone always orients with the 326 // In attachments, the sensor cone always orients with the
326 // avatar rotation. This may include a nonzero elevation if 327 // avatar rotation. This may include a nonzero elevation if
327 // in mouselook. 328 // in mouselook.
328 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 329 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
330 fromRegionPos = avatar.AbsolutePosition;
329 q = avatar.Rotation; 331 q = avatar.Rotation;
330 } 332 }
331 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 333 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
@@ -448,6 +450,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
448 // avatar rotation. This may include a nonzero elevation if 450 // avatar rotation. This may include a nonzero elevation if
449 // in mouselook. 451 // in mouselook.
450 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 452 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
453 if (avatar == null)
454 return sensedEntities;
455 fromRegionPos = avatar.AbsolutePosition;
451 q = avatar.Rotation; 456 q = avatar.Rotation;
452 } 457 }
453 458
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index bc63030..9ee6946 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -118,25 +118,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
118 if (Timers.Count == 0) 118 if (Timers.Count == 0)
119 return; 119 return;
120 120
121 Dictionary<string, TimerClass>.ValueCollection tvals;
121 lock (TimerListLock) 122 lock (TimerListLock)
122 { 123 {
123 // Go through all timers 124 // Go through all timers
124 Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values; 125 tvals = Timers.Values;
125 foreach (TimerClass ts in tvals) 126 }
127
128 foreach (TimerClass ts in tvals)
129 {
130 // Time has passed?
131 if (ts.next < DateTime.Now.Ticks)
126 { 132 {
127 // Time has passed? 133 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
128 if (ts.next < DateTime.Now.Ticks) 134 // Add it to queue
129 { 135 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
130 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 136 new EventParams("timer", new Object[0],
131 // Add it to queue 137 new DetectParams[0]));
132 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 138 // set next interval
133 new EventParams("timer", new Object[0], 139
134 new DetectParams[0])); 140 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
135 // set next interval 141 ts.next = DateTime.Now.Ticks + ts.interval;
136
137 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
138 ts.next = DateTime.Now.Ticks + ts.interval;
139 }
140 } 142 }
141 } 143 }
142 } 144 }
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..b976dc3 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,11 @@ 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);
420 void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density);
416 421
417 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 422 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
418 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 423 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
424 void llSetKeyframedMotion(LSL_List frames, LSL_List options);
419 } 425 }
420} 426}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 8f9efc0..1f4c4b1 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..4ce3cf1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
94 public const int AGENT_CROUCHING = 1024; 94 public const int AGENT_CROUCHING = 1024;
95 public const int AGENT_BUSY = 2048; 95 public const int AGENT_BUSY = 2048;
96 public const int AGENT_ALWAYS_RUN = 4096; 96 public const int AGENT_ALWAYS_RUN = 4096;
97 public const int AGENT_MALE = 8192;
97 98
98 //Particle Systems 99 //Particle Systems
99 public const int PSYS_PART_INTERP_COLOR_MASK = 1; 100 public const int PSYS_PART_INTERP_COLOR_MASK = 1;
@@ -282,6 +283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
282 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART 283 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
283 public const int CHANGED_MEDIA = 2048; 284 public const int CHANGED_MEDIA = 2048;
284 public const int CHANGED_ANIMATION = 16384; 285 public const int CHANGED_ANIMATION = 16384;
286 public const int CHANGED_POSITION = 32768;
285 public const int TYPE_INVALID = 0; 287 public const int TYPE_INVALID = 0;
286 public const int TYPE_INTEGER = 1; 288 public const int TYPE_INTEGER = 1;
287 public const int TYPE_FLOAT = 2; 289 public const int TYPE_FLOAT = 2;
@@ -568,6 +570,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
568 public const int PRIM_MEDIA_PERM_OWNER = 1; 570 public const int PRIM_MEDIA_PERM_OWNER = 1;
569 public const int PRIM_MEDIA_PERM_GROUP = 2; 571 public const int PRIM_MEDIA_PERM_GROUP = 2;
570 public const int PRIM_MEDIA_PERM_ANYONE = 4; 572 public const int PRIM_MEDIA_PERM_ANYONE = 4;
573
574 public const int PRIM_PHYSICS_SHAPE_TYPE = 30;
575 public const int PRIM_PHYSICS_SHAPE_PRIM = 0;
576 public const int PRIM_PHYSICS_SHAPE_CONVEX = 2;
577 public const int PRIM_PHYSICS_SHAPE_NONE = 1;
578
579 public const int PRIM_PHYSICS_MATERIAL = 31;
580 public const int DENSITY = 1;
581 public const int FRICTION = 2;
582 public const int RESTITUTION = 4;
583 public const int GRAVITY_MULTIPLIER = 8;
571 584
572 // extra constants for llSetPrimMediaParams 585 // extra constants for llSetPrimMediaParams
573 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); 586 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0);
@@ -640,5 +653,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
640 public static readonly LSLInteger RCERR_UNKNOWN = -1; 653 public static readonly LSLInteger RCERR_UNKNOWN = -1;
641 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; 654 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2;
642 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3; 655 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3;
656
657 public const int KFM_MODE = 1;
658 public const int KFM_LOOP = 1;
659 public const int KFM_REVERSE = 3;
660 public const int KFM_FORWARD = 0;
661 public const int KFM_PING_PONG = 2;
662 public const int KFM_DATA = 2;
663 public const int KFM_TRANSLATION = 2;
664 public const int KFM_ROTATION = 1;
665 public const int KFM_COMMAND = 0;
666 public const int KFM_CMD_PLAY = 0;
667 public const int KFM_CMD_STOP = 1;
668 public const int KFM_CMD_PAUSE = 2;
643 } 669 }
644} 670}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index f8e3c36..bf58d13 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,19 @@ 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)
1949 {
1950 m_LSL_Functions.llSetKeyframedMotion(frames, options);
1951 }
1952
1953 public void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density)
1917 { 1954 {
1918 m_LSL_Functions.print(str); 1955 m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density);
1919 } 1956 }
1920 } 1957 }
1921} 1958}
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 6e36742..ff1f277 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;
@@ -218,13 +219,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
218 219
219 if (part != null) 220 if (part != null)
220 { 221 {
221 lock (part.TaskInventory) 222 part.TaskInventory.LockItemsForRead(true);
223 if (part.TaskInventory.ContainsKey(ItemID))
222 { 224 {
223 if (part.TaskInventory.ContainsKey(ItemID)) 225 ScriptTask = part.TaskInventory[ItemID];
224 {
225 ScriptTask = part.TaskInventory[ItemID];
226 }
227 } 226 }
227 part.TaskInventory.LockItemsForRead(false);
228 } 228 }
229 229
230 ApiManager am = new ApiManager(); 230 ApiManager am = new ApiManager();
@@ -416,14 +416,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
416 { 416 {
417 int permsMask; 417 int permsMask;
418 UUID permsGranter; 418 UUID permsGranter;
419 lock (part.TaskInventory) 419 part.TaskInventory.LockItemsForRead(true);
420 if (!part.TaskInventory.ContainsKey(ItemID))
420 { 421 {
421 if (!part.TaskInventory.ContainsKey(ItemID)) 422 part.TaskInventory.LockItemsForRead(false);
422 return; 423 return;
423
424 permsGranter = part.TaskInventory[ItemID].PermsGranter;
425 permsMask = part.TaskInventory[ItemID].PermsMask;
426 } 424 }
425 permsGranter = part.TaskInventory[ItemID].PermsGranter;
426 permsMask = part.TaskInventory[ItemID].PermsMask;
427 part.TaskInventory.LockItemsForRead(false);
427 428
428 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) 429 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
429 { 430 {
@@ -551,6 +552,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
551 return true; 552 return true;
552 } 553 }
553 554
555 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
554 public void SetState(string state) 556 public void SetState(string state)
555 { 557 {
556 if (state == State) 558 if (state == State)
@@ -562,7 +564,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
562 new DetectParams[0])); 564 new DetectParams[0]));
563 PostEvent(new EventParams("state_entry", new Object[0], 565 PostEvent(new EventParams("state_entry", new Object[0],
564 new DetectParams[0])); 566 new DetectParams[0]));
565 567
566 throw new EventAbortException(); 568 throw new EventAbortException();
567 } 569 }
568 570
@@ -652,45 +654,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
652 /// <returns></returns> 654 /// <returns></returns>
653 public object EventProcessor() 655 public object EventProcessor()
654 { 656 {
657 EventParams data = null;
655 // We check here as the thread stopping this instance from running may itself hold the m_Script lock. 658 // We check here as the thread stopping this instance from running may itself hold the m_Script lock.
656 if (!Running) 659 if (!Running)
657 return 0; 660 return 0;
658 661
659 lock (m_Script)
660 {
661// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName); 662// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
662 663
663 if (Suspended) 664 if (Suspended)
664 return 0; 665 return 0;
665
666 EventParams data = null;
667 666
668 lock (EventQueue) 667 lock (EventQueue)
668 {
669 data = (EventParams) EventQueue.Dequeue();
670 if (data == null) // Shouldn't happen
669 { 671 {
670 data = (EventParams)EventQueue.Dequeue(); 672 if (EventQueue.Count > 0 && Running && !ShuttingDown)
671 if (data == null) // Shouldn't happen
672 { 673 {
673 if (EventQueue.Count > 0 && Running && !ShuttingDown) 674 m_CurrentWorkItem = Engine.QueueEventHandler(this);
674 {
675 m_CurrentWorkItem = Engine.QueueEventHandler(this);
676 }
677 else
678 {
679 m_CurrentWorkItem = null;
680 }
681 return 0;
682 } 675 }
683 676 else
684 if (data.EventName == "timer")
685 m_TimerQueued = false;
686 if (data.EventName == "control")
687 { 677 {
688 if (m_ControlEventsInQueue > 0) 678 m_CurrentWorkItem = null;
689 m_ControlEventsInQueue--;
690 } 679 }
691 if (data.EventName == "collision") 680 return 0;
692 m_CollisionInQueue = false;
693 } 681 }
682
683 if (data.EventName == "timer")
684 m_TimerQueued = false;
685 if (data.EventName == "control")
686 {
687 if (m_ControlEventsInQueue > 0)
688 m_ControlEventsInQueue--;
689 }
690 if (data.EventName == "collision")
691 m_CollisionInQueue = false;
692 }
693
694 lock(m_Script)
695 {
694 696
695// m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this); 697// m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
696 698
@@ -859,6 +861,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
859 new Object[0], new DetectParams[0])); 861 new Object[0], new DetectParams[0]));
860 } 862 }
861 863
864 [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
862 public void ApiResetScript() 865 public void ApiResetScript()
863 { 866 {
864 // bool running = Running; 867 // bool running = Running;
@@ -890,10 +893,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
890 893
891 public Dictionary<string, object> GetVars() 894 public Dictionary<string, object> GetVars()
892 { 895 {
893 if (m_Script != null) 896 return m_Script.GetVars();
894 return m_Script.GetVars();
895 else
896 return new Dictionary<string, object>();
897 } 897 }
898 898
899 public void SetVars(Dictionary<string, object> vars) 899 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..8adf4c5 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 }
@@ -864,7 +858,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
864 ret = Math.Sign(Quaternion.Mag(l) - Quaternion.Mag(r)); 858 ret = Math.Sign(Quaternion.Mag(l) - Quaternion.Mag(r));
865 } 859 }
866 860
867 if (ascending == 0) 861 if (ascending != 1)
868 { 862 {
869 ret = 0 - ret; 863 ret = 0 - ret;
870 } 864 }
@@ -897,6 +891,9 @@ namespace OpenSim.Region.ScriptEngine.Shared
897 stride = 1; 891 stride = 1;
898 } 892 }
899 893
894 if ((Data.Length % stride) != 0)
895 return new list(ret);
896
900 // we can optimize here in the case where stride == 1 and the list 897 // we can optimize here in the case where stride == 1 and the list
901 // consists of homogeneous types 898 // consists of homogeneous types
902 899
@@ -916,7 +913,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
916 if (homogeneous) 913 if (homogeneous)
917 { 914 {
918 Array.Sort(ret, new HomogeneousComparer()); 915 Array.Sort(ret, new HomogeneousComparer());
919 if (ascending == 0) 916 if (ascending != 1)
920 { 917 {
921 Array.Reverse(ret); 918 Array.Reverse(ret);
922 } 919 }
@@ -1064,7 +1061,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1064 { 1061 {
1065 list ret = new list(); 1062 list ret = new list();
1066 double entry; 1063 double entry;
1067 for (int i = 0; i < src.Data.Length - 1; i++) 1064 for (int i = 0; i < src.Data.Length; i++)
1068 { 1065 {
1069 if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry)) 1066 if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry))
1070 { 1067 {
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 7712076..1e0f01f 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;
@@ -112,6 +113,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
112 private Dictionary<UUID, IScriptInstance> m_Scripts = 113 private Dictionary<UUID, IScriptInstance> m_Scripts =
113 new Dictionary<UUID, IScriptInstance>(); 114 new Dictionary<UUID, IScriptInstance>();
114 115
116 private OpenMetaverse.ReaderWriterLockSlim m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
117
115 // Maps the asset ID to the assembly 118 // Maps the asset ID to the assembly
116 119
117 private Dictionary<UUID, string> m_Assemblies = 120 private Dictionary<UUID, string> m_Assemblies =
@@ -134,6 +137,71 @@ namespace OpenSim.Region.ScriptEngine.XEngine
134 IWorkItemResult m_CurrentCompile = null; 137 IWorkItemResult m_CurrentCompile = null;
135 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>(); 138 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>();
136 139
140 private void lockScriptsForRead(bool locked)
141 {
142 if (locked)
143 {
144 if (m_scriptsLock.RecursiveReadCount > 0)
145 {
146 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.");
147 m_scriptsLock.ExitReadLock();
148 }
149 if (m_scriptsLock.RecursiveWriteCount > 0)
150 {
151 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
152 m_scriptsLock.ExitWriteLock();
153 }
154
155 while (!m_scriptsLock.TryEnterReadLock(60000))
156 {
157 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.");
158 if (m_scriptsLock.IsWriteLockHeld)
159 {
160 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
161 }
162 }
163 }
164 else
165 {
166 if (m_scriptsLock.RecursiveReadCount > 0)
167 {
168 m_scriptsLock.ExitReadLock();
169 }
170 }
171 }
172 private void lockScriptsForWrite(bool locked)
173 {
174 if (locked)
175 {
176 if (m_scriptsLock.RecursiveReadCount > 0)
177 {
178 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.");
179 m_scriptsLock.ExitReadLock();
180 }
181 if (m_scriptsLock.RecursiveWriteCount > 0)
182 {
183 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
184 m_scriptsLock.ExitWriteLock();
185 }
186
187 while (!m_scriptsLock.TryEnterWriteLock(60000))
188 {
189 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.");
190 if (m_scriptsLock.IsWriteLockHeld)
191 {
192 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
193 }
194 }
195 }
196 else
197 {
198 if (m_scriptsLock.RecursiveWriteCount > 0)
199 {
200 m_scriptsLock.ExitWriteLock();
201 }
202 }
203 }
204
137 public string ScriptEngineName 205 public string ScriptEngineName
138 { 206 {
139 get { return "XEngine"; } 207 get { return "XEngine"; }
@@ -527,44 +595,37 @@ namespace OpenSim.Region.ScriptEngine.XEngine
527 { 595 {
528 if (!m_Enabled) 596 if (!m_Enabled)
529 return; 597 return;
530 598 lockScriptsForRead(true);
531 lock (m_Scripts) 599 foreach (IScriptInstance instance in m_Scripts.Values)
532 { 600 {
533 m_log.InfoFormat( 601 // Force a final state save
534 "[XEngine]: Shutting down {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName); 602 //
535 603 if (m_Assemblies.ContainsKey(instance.AssetID))
536 foreach (IScriptInstance instance in m_Scripts.Values)
537 { 604 {
538 // Force a final state save 605 string assembly = m_Assemblies[instance.AssetID];
539 // 606 instance.SaveState(assembly);
540 if (m_Assemblies.ContainsKey(instance.AssetID)) 607 }
541 {
542 string assembly = m_Assemblies[instance.AssetID];
543 instance.SaveState(assembly);
544 }
545 608
546 // Clear the event queue and abort the instance thread 609 // Clear the event queue and abort the instance thread
547 // 610 //
548 instance.ClearQueue(); 611 instance.ClearQueue();
549 instance.Stop(0); 612 instance.Stop(0);
550 613
551 // Release events, timer, etc 614 // Release events, timer, etc
552 // 615 //
553 instance.DestroyScriptInstance(); 616 instance.DestroyScriptInstance();
554 617
555 // Unload scripts and app domains. 618 // Unload scripts and app domains
556 // Must be done explicitly because they have infinite 619 // Must be done explicitly because they have infinite
557 // lifetime. 620 // lifetime
558 // However, don't bother to do this if the simulator is shutting 621 //
559 // down since it takes a long time with many scripts. 622 if (!m_SimulatorShuttingDown)
560 if (!m_SimulatorShuttingDown) 623 {
624 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
625 if (m_DomainScripts[instance.AppDomain].Count == 0)
561 { 626 {
562 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID); 627 m_DomainScripts.Remove(instance.AppDomain);
563 if (m_DomainScripts[instance.AppDomain].Count == 0) 628 UnloadAppDomain(instance.AppDomain);
564 {
565 m_DomainScripts.Remove(instance.AppDomain);
566 UnloadAppDomain(instance.AppDomain);
567 }
568 } 629 }
569 } 630 }
570 631
@@ -573,6 +634,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
573 m_Assemblies.Clear(); 634 m_Assemblies.Clear();
574 m_DomainScripts.Clear(); 635 m_DomainScripts.Clear();
575 } 636 }
637 lockScriptsForRead(false);
638 lockScriptsForWrite(true);
639 m_Scripts.Clear();
640 lockScriptsForWrite(false);
641 m_PrimObjects.Clear();
642 m_Assemblies.Clear();
643 m_DomainScripts.Clear();
644
576 lock (m_ScriptEngines) 645 lock (m_ScriptEngines)
577 { 646 {
578 m_ScriptEngines.Remove(this); 647 m_ScriptEngines.Remove(this);
@@ -637,22 +706,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
637 706
638 List<IScriptInstance> instances = new List<IScriptInstance>(); 707 List<IScriptInstance> instances = new List<IScriptInstance>();
639 708
640 lock (m_Scripts) 709 lockScriptsForRead(true);
641 { 710 foreach (IScriptInstance instance in m_Scripts.Values)
642 foreach (IScriptInstance instance in m_Scripts.Values)
643 instances.Add(instance); 711 instances.Add(instance);
644 } 712 lockScriptsForRead(false);
645 713
646 foreach (IScriptInstance i in instances) 714 foreach (IScriptInstance i in instances)
647 { 715 {
648 string assembly = String.Empty; 716 string assembly = String.Empty;
649 717
650 lock (m_Scripts) 718
651 {
652 if (!m_Assemblies.ContainsKey(i.AssetID)) 719 if (!m_Assemblies.ContainsKey(i.AssetID))
653 continue; 720 continue;
654 assembly = m_Assemblies[i.AssetID]; 721 assembly = m_Assemblies[i.AssetID];
655 } 722
656 723
657 i.SaveState(assembly); 724 i.SaveState(assembly);
658 } 725 }
@@ -996,91 +1063,95 @@ namespace OpenSim.Region.ScriptEngine.XEngine
996 } 1063 }
997 1064
998 ScriptInstance instance = null; 1065 ScriptInstance instance = null;
999 lock (m_Scripts) 1066 // Create the object record
1067 lockScriptsForRead(true);
1068 if ((!m_Scripts.ContainsKey(itemID)) ||
1069 (m_Scripts[itemID].AssetID != assetID))
1000 { 1070 {
1001 // Create the object record 1071 lockScriptsForRead(false);
1002 if ((!m_Scripts.ContainsKey(itemID)) ||
1003 (m_Scripts[itemID].AssetID != assetID))
1004 {
1005 UUID appDomain = assetID;
1006 1072
1007 if (part.ParentGroup.IsAttachment) 1073 UUID appDomain = assetID;
1008 appDomain = part.ParentGroup.RootPart.UUID;
1009 1074
1010 if (!m_AppDomains.ContainsKey(appDomain)) 1075 if (part.ParentGroup.IsAttachment)
1011 { 1076 appDomain = part.ParentGroup.RootPart.UUID;
1012 try
1013 {
1014 AppDomainSetup appSetup = new AppDomainSetup();
1015 appSetup.PrivateBinPath = Path.Combine(
1016 m_ScriptEnginesPath,
1017 m_Scene.RegionInfo.RegionID.ToString());
1018
1019 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
1020 Evidence evidence = new Evidence(baseEvidence);
1021
1022 AppDomain sandbox;
1023 if (m_AppDomainLoading)
1024 sandbox = AppDomain.CreateDomain(
1025 m_Scene.RegionInfo.RegionID.ToString(),
1026 evidence, appSetup);
1027 else
1028 sandbox = AppDomain.CurrentDomain;
1029
1030 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
1031 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
1032 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
1033 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
1034 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
1035 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
1036 //sandbox.SetAppDomainPolicy(sandboxPolicy);
1037
1038 m_AppDomains[appDomain] = sandbox;
1039 1077
1040 m_AppDomains[appDomain].AssemblyResolve += 1078 if (!m_AppDomains.ContainsKey(appDomain))
1041 new ResolveEventHandler( 1079 {
1042 AssemblyResolver.OnAssemblyResolve); 1080 try
1043 m_DomainScripts[appDomain] = new List<UUID>(); 1081 {
1044 } 1082 AppDomainSetup appSetup = new AppDomainSetup();
1045 catch (Exception e) 1083 appSetup.PrivateBinPath = Path.Combine(
1084 m_ScriptEnginesPath,
1085 m_Scene.RegionInfo.RegionID.ToString());
1086
1087 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
1088 Evidence evidence = new Evidence(baseEvidence);
1089
1090 AppDomain sandbox;
1091 if (m_AppDomainLoading)
1092 sandbox = AppDomain.CreateDomain(
1093 m_Scene.RegionInfo.RegionID.ToString(),
1094 evidence, appSetup);
1095 else
1096 sandbox = AppDomain.CurrentDomain;
1097
1098 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
1099 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
1100 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
1101 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
1102 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
1103 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
1104 //sandbox.SetAppDomainPolicy(sandboxPolicy);
1105
1106 m_AppDomains[appDomain] = sandbox;
1107
1108 m_AppDomains[appDomain].AssemblyResolve +=
1109 new ResolveEventHandler(
1110 AssemblyResolver.OnAssemblyResolve);
1111 m_DomainScripts[appDomain] = new List<UUID>();
1112 }
1113 catch (Exception e)
1114 {
1115 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
1116 m_ScriptErrorMessage += "Exception creating app domain:\n";
1117 m_ScriptFailCount++;
1118 lock (m_AddingAssemblies)
1046 { 1119 {
1047 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString()); 1120 m_AddingAssemblies[assembly]--;
1048 m_ScriptErrorMessage += "Exception creating app domain:\n";
1049 m_ScriptFailCount++;
1050 lock (m_AddingAssemblies)
1051 {
1052 m_AddingAssemblies[assembly]--;
1053 }
1054 return false;
1055 } 1121 }
1122 return false;
1056 } 1123 }
1057 m_DomainScripts[appDomain].Add(itemID); 1124 }
1058 1125 m_DomainScripts[appDomain].Add(itemID);
1059 instance = new ScriptInstance(this, part, 1126
1060 itemID, assetID, assembly, 1127 instance = new ScriptInstance(this, part,
1061 m_AppDomains[appDomain], 1128 itemID, assetID, assembly,
1062 part.ParentGroup.RootPart.Name, 1129 m_AppDomains[appDomain],
1063 item.Name, startParam, postOnRez, 1130 part.ParentGroup.RootPart.Name,
1064 stateSource, m_MaxScriptQueue); 1131 item.Name, startParam, postOnRez,
1065 1132 stateSource, m_MaxScriptQueue);
1066 m_log.DebugFormat( 1133
1067 "[XEngine] Loaded script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}", 1134 m_log.DebugFormat(
1068 part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID, 1135 "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
1136 part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID,
1069 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName); 1137 part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
1070 1138
1071 if (presence != null) 1139 if (presence != null)
1072 { 1140 {
1073 ShowScriptSaveResponse(item.OwnerID, 1141 ShowScriptSaveResponse(item.OwnerID,
1074 assetID, "Compile successful", true); 1142 assetID, "Compile successful", true);
1075 }
1076
1077 instance.AppDomain = appDomain;
1078 instance.LineMap = linemap;
1079
1080 m_Scripts[itemID] = instance;
1081 } 1143 }
1082 }
1083 1144
1145 instance.AppDomain = appDomain;
1146 instance.LineMap = linemap;
1147 lockScriptsForWrite(true);
1148 m_Scripts[itemID] = instance;
1149 lockScriptsForWrite(false);
1150 }
1151 else
1152 {
1153 lockScriptsForRead(false);
1154 }
1084 lock (m_PrimObjects) 1155 lock (m_PrimObjects)
1085 { 1156 {
1086 if (!m_PrimObjects.ContainsKey(localID)) 1157 if (!m_PrimObjects.ContainsKey(localID))
@@ -1098,9 +1169,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1098 m_AddingAssemblies[assembly]--; 1169 m_AddingAssemblies[assembly]--;
1099 } 1170 }
1100 1171
1101 if (instance != null) 1172 if (instance!=null)
1102 instance.Init(); 1173 instance.Init();
1103 1174
1104 return true; 1175 return true;
1105 } 1176 }
1106 1177
@@ -1113,18 +1184,28 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1113 m_CompileDict.Remove(itemID); 1184 m_CompileDict.Remove(itemID);
1114 } 1185 }
1115 1186
1116 IScriptInstance instance = null; 1187 lockScriptsForRead(true);
1117 1188 // Do we even have it?
1118 lock (m_Scripts) 1189 if (!m_Scripts.ContainsKey(itemID))
1119 { 1190 {
1120 // Do we even have it? 1191 // Do we even have it?
1121 if (!m_Scripts.ContainsKey(itemID)) 1192 if (!m_Scripts.ContainsKey(itemID))
1122 return; 1193 return;
1123 1194
1124 instance = m_Scripts[itemID]; 1195 lockScriptsForRead(false);
1196 lockScriptsForWrite(true);
1125 m_Scripts.Remove(itemID); 1197 m_Scripts.Remove(itemID);
1198 lockScriptsForWrite(false);
1199
1200 return;
1126 } 1201 }
1202
1127 1203
1204 IScriptInstance instance=m_Scripts[itemID];
1205 lockScriptsForRead(false);
1206 lockScriptsForWrite(true);
1207 m_Scripts.Remove(itemID);
1208 lockScriptsForWrite(false);
1128 instance.ClearQueue(); 1209 instance.ClearQueue();
1129 1210
1130 // Give the script some time to finish processing its last event. Simply aborting the script thread can 1211 // Give the script some time to finish processing its last event. Simply aborting the script thread can
@@ -1163,8 +1244,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1163 1244
1164 ObjectRemoved handlerObjectRemoved = OnObjectRemoved; 1245 ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
1165 if (handlerObjectRemoved != null) 1246 if (handlerObjectRemoved != null)
1166 handlerObjectRemoved(instance.ObjectID); 1247 {
1248 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
1249 handlerObjectRemoved(part.UUID);
1250 }
1167 1251
1252 CleanAssemblies();
1253
1168 ScriptRemoved handlerScriptRemoved = OnScriptRemoved; 1254 ScriptRemoved handlerScriptRemoved = OnScriptRemoved;
1169 if (handlerScriptRemoved != null) 1255 if (handlerScriptRemoved != null)
1170 handlerScriptRemoved(itemID); 1256 handlerScriptRemoved(itemID);
@@ -1306,7 +1392,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1306 return false; 1392 return false;
1307 1393
1308 uuids = m_PrimObjects[localID]; 1394 uuids = m_PrimObjects[localID];
1309 } 1395
1310 1396
1311 foreach (UUID itemID in uuids) 1397 foreach (UUID itemID in uuids)
1312 { 1398 {
@@ -1324,6 +1410,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1324 result = true; 1410 result = true;
1325 } 1411 }
1326 } 1412 }
1413 }
1327 1414
1328 return result; 1415 return result;
1329 } 1416 }
@@ -1425,12 +1512,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1425 private IScriptInstance GetInstance(UUID itemID) 1512 private IScriptInstance GetInstance(UUID itemID)
1426 { 1513 {
1427 IScriptInstance instance; 1514 IScriptInstance instance;
1428 lock (m_Scripts) 1515 lockScriptsForRead(true);
1516 if (!m_Scripts.ContainsKey(itemID))
1429 { 1517 {
1430 if (!m_Scripts.ContainsKey(itemID)) 1518 lockScriptsForRead(false);
1431 return null; 1519 return null;
1432 instance = m_Scripts[itemID];
1433 } 1520 }
1521 instance = m_Scripts[itemID];
1522 lockScriptsForRead(false);
1434 return instance; 1523 return instance;
1435 } 1524 }
1436 1525
@@ -1454,6 +1543,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1454 return false; 1543 return false;
1455 } 1544 }
1456 1545
1546 [DebuggerNonUserCode]
1457 public void ApiResetScript(UUID itemID) 1547 public void ApiResetScript(UUID itemID)
1458 { 1548 {
1459 IScriptInstance instance = GetInstance(itemID); 1549 IScriptInstance instance = GetInstance(itemID);
@@ -1505,6 +1595,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1505 return UUID.Zero; 1595 return UUID.Zero;
1506 } 1596 }
1507 1597
1598 [DebuggerNonUserCode]
1508 public void SetState(UUID itemID, string newState) 1599 public void SetState(UUID itemID, string newState)
1509 { 1600 {
1510 IScriptInstance instance = GetInstance(itemID); 1601 IScriptInstance instance = GetInstance(itemID);
@@ -1527,11 +1618,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1527 1618
1528 List<IScriptInstance> instances = new List<IScriptInstance>(); 1619 List<IScriptInstance> instances = new List<IScriptInstance>();
1529 1620
1530 lock (m_Scripts) 1621 lockScriptsForRead(true);
1531 { 1622 foreach (IScriptInstance instance in m_Scripts.Values)
1532 foreach (IScriptInstance instance in m_Scripts.Values)
1533 instances.Add(instance); 1623 instances.Add(instance);
1534 } 1624 lockScriptsForRead(false);
1535 1625
1536 foreach (IScriptInstance i in instances) 1626 foreach (IScriptInstance i in instances)
1537 { 1627 {
@@ -1969,5 +2059,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1969// else 2059// else
1970// m_log.DebugFormat("[XEngine]: Could not find script with ID {0} to resume", itemID); 2060// m_log.DebugFormat("[XEngine]: Could not find script with ID {0} to resume", itemID);
1971 } 2061 }
2062
2063 public bool HasScript(UUID itemID, out bool running)
2064 {
2065 running = true;
2066
2067 IScriptInstance instance = GetInstance(itemID);
2068 if (instance == null)
2069 return false;
2070
2071 running = instance.Running;
2072 return true;
2073 }
1972 } 2074 }
1973} \ No newline at end of file 2075}
generated by cgit v1.1 at 2024-12-30 07:48:17 +0000