aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs118
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2217
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs53
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs16
-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.cs3
-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.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs11
-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.cs52
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs32
18 files changed, 1878 insertions, 831 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index ee32755..61e4934 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -248,6 +248,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
248 248
249 } 249 }
250 250
251 public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
252 {
253 // Remove a specific script
254
255 // Remove dataserver events
256 m_Dataserver[engine].RemoveEvents(localID, itemID);
257
258 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
259 if (comms != null)
260 comms.DeleteListener(itemID);
261
262 IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
263 xmlrpc.DeleteChannels(itemID);
264 xmlrpc.CancelSRDRequests(itemID);
265
266 // Remove Sensors
267 m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
268
269 }
270
251 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) 271 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
252 { 272 {
253 List<Object> data = new List<Object>(); 273 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 ce7d97c..f7c44d1 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{
@@ -81,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
81 /// </summary> 85 /// </summary>
82 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi 86 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
83 { 87 {
84 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 88// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
85 protected IScriptEngine m_ScriptEngine; 89 protected IScriptEngine m_ScriptEngine;
86 protected SceneObjectPart m_host; 90 protected SceneObjectPart m_host;
87 protected uint m_localID; 91 protected uint m_localID;
@@ -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);
@@ -161,6 +175,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
161 get { return m_ScriptEngine.World; } 175 get { return m_ScriptEngine.World; }
162 } 176 }
163 177
178 [DebuggerNonUserCode]
164 public void state(string newState) 179 public void state(string newState)
165 { 180 {
166 m_ScriptEngine.SetState(m_itemID, newState); 181 m_ScriptEngine.SetState(m_itemID, newState);
@@ -170,6 +185,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
170 /// Reset the named script. The script must be present 185 /// Reset the named script. The script must be present
171 /// in the same prim. 186 /// in the same prim.
172 /// </summary> 187 /// </summary>
188 [DebuggerNonUserCode]
173 public void llResetScript() 189 public void llResetScript()
174 { 190 {
175 m_host.AddScriptLPS(1); 191 m_host.AddScriptLPS(1);
@@ -226,9 +242,62 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
226 } 242 }
227 } 243 }
228 244
245 public List<ScenePresence> GetLinkAvatars(int linkType)
246 {
247 List<ScenePresence> ret = new List<ScenePresence>();
248 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
249 return ret;
250
251 List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars();
252
253 switch (linkType)
254 {
255 case ScriptBaseClass.LINK_SET:
256 return avs;
257
258 case ScriptBaseClass.LINK_ROOT:
259 return ret;
260
261 case ScriptBaseClass.LINK_ALL_OTHERS:
262 return avs;
263
264 case ScriptBaseClass.LINK_ALL_CHILDREN:
265 return avs;
266
267 case ScriptBaseClass.LINK_THIS:
268 return ret;
269
270 default:
271 if (linkType < 0)
272 return ret;
273
274 int partCount = m_host.ParentGroup.GetPartCount();
275
276 if (linkType <= partCount)
277 {
278 return ret;
279 }
280 else
281 {
282 linkType = linkType - partCount;
283 if (linkType > avs.Count)
284 {
285 return ret;
286 }
287 else
288 {
289 ret.Add(avs[linkType-1]);
290 return ret;
291 }
292 }
293 }
294 }
295
229 public List<SceneObjectPart> GetLinkParts(int linkType) 296 public List<SceneObjectPart> GetLinkParts(int linkType)
230 { 297 {
231 List<SceneObjectPart> ret = new List<SceneObjectPart>(); 298 List<SceneObjectPart> ret = new List<SceneObjectPart>();
299 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
300 return ret;
232 ret.Add(m_host); 301 ret.Add(m_host);
233 302
234 switch (linkType) 303 switch (linkType)
@@ -288,40 +357,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
288 protected UUID InventorySelf() 357 protected UUID InventorySelf()
289 { 358 {
290 UUID invItemID = new UUID(); 359 UUID invItemID = new UUID();
291 360 bool unlock = false;
292 lock (m_host.TaskInventory) 361 if (!m_host.TaskInventory.IsReadLockedByMe())
362 {
363 m_host.TaskInventory.LockItemsForRead(true);
364 unlock = true;
365 }
366 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
293 { 367 {
294 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 368 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
295 { 369 {
296 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) 370 invItemID = inv.Key;
297 { 371 break;
298 invItemID = inv.Key;
299 break;
300 }
301 } 372 }
302 } 373 }
303 374 if (unlock)
375 {
376 m_host.TaskInventory.LockItemsForRead(false);
377 }
304 return invItemID; 378 return invItemID;
305 } 379 }
306 380
307 protected UUID InventoryKey(string name, int type) 381 protected UUID InventoryKey(string name, int type)
308 { 382 {
309 m_host.AddScriptLPS(1); 383 m_host.AddScriptLPS(1);
310 384 m_host.TaskInventory.LockItemsForRead(true);
311 lock (m_host.TaskInventory) 385
386 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
312 { 387 {
313 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 388 if (inv.Value.Name == name)
314 { 389 {
315 if (inv.Value.Name == name) 390 m_host.TaskInventory.LockItemsForRead(false);
391
392 if (inv.Value.Type != type)
316 { 393 {
317 if (inv.Value.Type != type) 394 return UUID.Zero;
318 return UUID.Zero;
319
320 return inv.Value.AssetID;
321 } 395 }
396
397 return inv.Value.AssetID;
322 } 398 }
323 } 399 }
324 400
401 m_host.TaskInventory.LockItemsForRead(false);
325 return UUID.Zero; 402 return UUID.Zero;
326 } 403 }
327 404
@@ -329,17 +406,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
329 { 406 {
330 m_host.AddScriptLPS(1); 407 m_host.AddScriptLPS(1);
331 408
332 lock (m_host.TaskInventory) 409
410 m_host.TaskInventory.LockItemsForRead(true);
411
412 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
333 { 413 {
334 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 414 if (inv.Value.Name == name)
335 { 415 {
336 if (inv.Value.Name == name) 416 m_host.TaskInventory.LockItemsForRead(false);
337 { 417 return inv.Value.AssetID;
338 return inv.Value.AssetID;
339 }
340 } 418 }
341 } 419 }
342 420
421 m_host.TaskInventory.LockItemsForRead(false);
422
423
343 return UUID.Zero; 424 return UUID.Zero;
344 } 425 }
345 426
@@ -481,26 +562,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
481 562
482 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke 563 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
483 564
484 // Old implementation of llRot2Euler. Normalization not required as Atan2 function will 565 // Utility function for llRot2Euler
485 // only return values >= -PI (-180 degrees) and <= PI (180 degrees). 566
567 // normalize an angle between -PI and PI (-180 to +180 degrees)
568 protected double NormalizeAngle(double angle)
569 {
570 if (angle > -Math.PI && angle < Math.PI)
571 return angle;
572
573 int numPis = (int)(Math.PI / angle);
574 double remainder = angle - Math.PI * numPis;
575 if (numPis % 2 == 1)
576 return Math.PI - angle;
577 return remainder;
578 }
486 579
487 public LSL_Vector llRot2Euler(LSL_Rotation r) 580 public LSL_Vector llRot2Euler(LSL_Rotation q1)
488 { 581 {
489 m_host.AddScriptLPS(1); 582 m_host.AddScriptLPS(1);
490 //This implementation is from http://lslwiki.net/lslwiki/wakka.php?wakka=LibraryRotationFunctions. ckrinke 583 LSL_Vector eul = new LSL_Vector();
491 LSL_Rotation t = new LSL_Rotation(r.x * r.x, r.y * r.y, r.z * r.z, r.s * r.s); 584
492 double m = (t.x + t.y + t.z + t.s); 585 double sqw = q1.s*q1.s;
493 if (m == 0) return new LSL_Vector(); 586 double sqx = q1.x*q1.x;
494 double n = 2 * (r.y * r.s + r.x * r.z); 587 double sqy = q1.z*q1.z;
495 double p = m * m - n * n; 588 double sqz = q1.y*q1.y;
496 if (p > 0) 589 double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
497 return new LSL_Vector(Math.Atan2(2.0 * (r.x * r.s - r.y * r.z), (-t.x - t.y + t.z + t.s)), 590 double test = q1.x*q1.z + q1.y*q1.s;
498 Math.Atan2(n, Math.Sqrt(p)), 591 if (test > 0.4999*unit) { // singularity at north pole
499 Math.Atan2(2.0 * (r.z * r.s - r.x * r.y), (t.x - t.y - t.z + t.s))); 592 eul.z = 2 * Math.Atan2(q1.x,q1.s);
500 else if (n > 0) 593 eul.y = Math.PI/2;
501 return new LSL_Vector(0.0, Math.PI * 0.5, Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)); 594 eul.x = 0;
502 else 595 return eul;
503 return new LSL_Vector(0.0, -Math.PI * 0.5, Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)); 596 }
597 if (test < -0.4999*unit) { // singularity at south pole
598 eul.z = -2 * Math.Atan2(q1.x,q1.s);
599 eul.y = -Math.PI/2;
600 eul.x = 0;
601 return eul;
602 }
603 eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw);
604 eul.y = Math.Asin(2*test/unit);
605 eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw);
606 return eul;
504 } 607 }
505 608
506 /* From wiki: 609 /* From wiki:
@@ -702,77 +805,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
702 { 805 {
703 //A and B should both be normalized 806 //A and B should both be normalized
704 m_host.AddScriptLPS(1); 807 m_host.AddScriptLPS(1);
705 LSL_Rotation rotBetween; 808 /* This method is more accurate than the SL one, and thus causes problems
706 // Check for zero vectors. If either is zero, return zero rotation. Otherwise, 809 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
707 // continue calculation. 810
708 if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f)) 811 double dotProduct = LSL_Vector.Dot(a, b);
812 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
813 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
814 double angle = Math.Acos(dotProduct / magProduct);
815 LSL_Vector axis = LSL_Vector.Norm(crossProduct);
816 double s = Math.Sin(angle / 2);
817
818 double x = axis.x * s;
819 double y = axis.y * s;
820 double z = axis.z * s;
821 double w = Math.Cos(angle / 2);
822
823 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
824 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
825
826 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
827 */
828
829 // This method mimics the 180 errors found in SL
830 // See www.euclideanspace.com... angleBetween
831 LSL_Vector vec_a = a;
832 LSL_Vector vec_b = b;
833
834 // Eliminate zero length
835 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
836 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
837 if (vec_a_mag < 0.00001 ||
838 vec_b_mag < 0.00001)
709 { 839 {
710 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 840 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
711 } 841 }
712 else 842
843 // Normalize
844 vec_a = llVecNorm(vec_a);
845 vec_b = llVecNorm(vec_b);
846
847 // Calculate axis and rotation angle
848 LSL_Vector axis = vec_a % vec_b;
849 LSL_Float cos_theta = vec_a * vec_b;
850
851 // Check if parallel
852 if (cos_theta > 0.99999)
713 { 853 {
714 a = LSL_Vector.Norm(a); 854 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
715 b = LSL_Vector.Norm(b); 855 }
716 double dotProduct = LSL_Vector.Dot(a, b); 856
717 // There are two degenerate cases possible. These are for vectors 180 or 857 // Check if anti-parallel
718 // 0 degrees apart. These have to be detected and handled individually. 858 else if (cos_theta < -0.99999)
719 // 859 {
720 // Check for vectors 180 degrees apart. 860 LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
721 // A dot product of -1 would mean the angle between vectors is 180 degrees. 861 if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
722 if (dotProduct < -0.9999999f) 862 return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
723 { 863 }
724 // First assume X axis is orthogonal to the vectors. 864 else // other rotation
725 LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f); 865 {
726 orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a)); 866 LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
727 // Check for near zero vector. A very small non-zero number here will create 867 axis = llVecNorm(axis);
728 // a rotation in an undesired direction. 868 double x, y, z, s, t;
729 if (LSL_Vector.Mag(orthoVector) > 0.0001) 869 s = Math.Cos(theta);
730 { 870 t = Math.Sin(theta);
731 rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f); 871 x = axis.x * t;
732 } 872 y = axis.y * t;
733 // If the magnitude of the vector was near zero, then assume the X axis is not 873 z = axis.z * t;
734 // orthogonal and use the Z axis instead. 874 return new LSL_Rotation(x,y,z,s);
735 else
736 {
737 // Set 180 z rotation.
738 rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f);
739 }
740 }
741 // Check for parallel vectors.
742 // A dot product of 1 would mean the angle between vectors is 0 degrees.
743 else if (dotProduct > 0.9999999f)
744 {
745 // Set zero rotation.
746 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
747 }
748 else
749 {
750 // All special checks have been performed so get the axis of rotation.
751 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
752 // Quarternion s value is the length of the unit vector + dot product.
753 double qs = 1.0 + dotProduct;
754 rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs);
755 // Normalize the rotation.
756 double mag = LSL_Rotation.Mag(rotBetween);
757 // We shouldn't have to worry about a divide by zero here. The qs value will be
758 // non-zero because we already know if we're here, then the dotProduct is not -1 so
759 // qs will not be zero. Also, we've already handled the input vectors being zero so the
760 // crossProduct vector should also not be zero.
761 rotBetween.x = rotBetween.x / mag;
762 rotBetween.y = rotBetween.y / mag;
763 rotBetween.z = rotBetween.z / mag;
764 rotBetween.s = rotBetween.s / mag;
765 // Check for undefined values and set zero rotation if any found. This code might not actually be required
766 // any longer since zero vectors are checked for at the top.
767 if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s))
768 {
769 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
770 }
771 }
772 } 875 }
773 return rotBetween;
774 } 876 }
775 877
776 public void llWhisper(int channelID, string text) 878 public void llWhisper(int channelID, string text)
777 { 879 {
778 m_host.AddScriptLPS(1); 880 m_host.AddScriptLPS(1);
@@ -792,6 +894,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
792 { 894 {
793 m_host.AddScriptLPS(1); 895 m_host.AddScriptLPS(1);
794 896
897 if (channelID == 0)
898 m_SayShoutCount++;
899
900 if (m_SayShoutCount >= 11)
901 ScriptSleep(2000);
902
795 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel)) 903 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel))
796 { 904 {
797 Console.WriteLine(text); 905 Console.WriteLine(text);
@@ -814,6 +922,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
814 { 922 {
815 m_host.AddScriptLPS(1); 923 m_host.AddScriptLPS(1);
816 924
925 if (channelID == 0)
926 m_SayShoutCount++;
927
928 if (m_SayShoutCount >= 11)
929 ScriptSleep(2000);
930
817 if (text.Length > 1023) 931 if (text.Length > 1023)
818 text = text.Substring(0, 1023); 932 text = text.Substring(0, 1023);
819 933
@@ -1096,10 +1210,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1096 return detectedParams.TouchUV; 1210 return detectedParams.TouchUV;
1097 } 1211 }
1098 1212
1213 [DebuggerNonUserCode]
1099 public virtual void llDie() 1214 public virtual void llDie()
1100 { 1215 {
1101 m_host.AddScriptLPS(1); 1216 m_host.AddScriptLPS(1);
1102 throw new SelfDeleteException(); 1217 if (!m_host.IsAttachment) throw new SelfDeleteException();
1103 } 1218 }
1104 1219
1105 public LSL_Float llGround(LSL_Vector offset) 1220 public LSL_Float llGround(LSL_Vector offset)
@@ -1172,6 +1287,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1172 1287
1173 public void llSetStatus(int status, int value) 1288 public void llSetStatus(int status, int value)
1174 { 1289 {
1290 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
1291 return;
1175 m_host.AddScriptLPS(1); 1292 m_host.AddScriptLPS(1);
1176 1293
1177 int statusrotationaxis = 0; 1294 int statusrotationaxis = 0;
@@ -1402,6 +1519,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1402 { 1519 {
1403 m_host.AddScriptLPS(1); 1520 m_host.AddScriptLPS(1);
1404 1521
1522 SetColor(m_host, color, face);
1523 }
1524
1525 protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
1526 {
1527 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1528 return;
1529
1530 Primitive.TextureEntry tex = part.Shape.Textures;
1531 Color4 texcolor;
1532 if (face >= 0 && face < GetNumberOfSides(part))
1533 {
1534 texcolor = tex.CreateFace((uint)face).RGBA;
1535 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1536 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1537 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1538 tex.FaceTextures[face].RGBA = texcolor;
1539 part.UpdateTexture(tex);
1540 return;
1541 }
1542 else if (face == ScriptBaseClass.ALL_SIDES)
1543 {
1544 for (uint i = 0; i < GetNumberOfSides(part); i++)
1545 {
1546 if (tex.FaceTextures[i] != null)
1547 {
1548 texcolor = tex.FaceTextures[i].RGBA;
1549 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1550 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1551 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1552 tex.FaceTextures[i].RGBA = texcolor;
1553 }
1554 texcolor = tex.DefaultTexture.RGBA;
1555 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1556 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1557 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1558 tex.DefaultTexture.RGBA = texcolor;
1559 }
1560 part.UpdateTexture(tex);
1561 return;
1562 }
1563
1405 if (face == ScriptBaseClass.ALL_SIDES) 1564 if (face == ScriptBaseClass.ALL_SIDES)
1406 face = SceneObjectPart.ALL_SIDES; 1565 face = SceneObjectPart.ALL_SIDES;
1407 1566
@@ -1410,6 +1569,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1410 1569
1411 public void SetTexGen(SceneObjectPart part, int face,int style) 1570 public void SetTexGen(SceneObjectPart part, int face,int style)
1412 { 1571 {
1572 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1573 return;
1574
1413 Primitive.TextureEntry tex = part.Shape.Textures; 1575 Primitive.TextureEntry tex = part.Shape.Textures;
1414 MappingType textype; 1576 MappingType textype;
1415 textype = MappingType.Default; 1577 textype = MappingType.Default;
@@ -1440,6 +1602,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1440 1602
1441 public void SetGlow(SceneObjectPart part, int face, float glow) 1603 public void SetGlow(SceneObjectPart part, int face, float glow)
1442 { 1604 {
1605 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1606 return;
1607
1443 Primitive.TextureEntry tex = part.Shape.Textures; 1608 Primitive.TextureEntry tex = part.Shape.Textures;
1444 if (face >= 0 && face < GetNumberOfSides(part)) 1609 if (face >= 0 && face < GetNumberOfSides(part))
1445 { 1610 {
@@ -1465,6 +1630,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1465 1630
1466 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1631 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1467 { 1632 {
1633 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1634 return;
1468 1635
1469 Shininess sval = new Shininess(); 1636 Shininess sval = new Shininess();
1470 1637
@@ -1515,6 +1682,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1515 1682
1516 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1683 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1517 { 1684 {
1685 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1686 return;
1687
1518 Primitive.TextureEntry tex = part.Shape.Textures; 1688 Primitive.TextureEntry tex = part.Shape.Textures;
1519 if (face >= 0 && face < GetNumberOfSides(part)) 1689 if (face >= 0 && face < GetNumberOfSides(part))
1520 { 1690 {
@@ -1575,13 +1745,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1575 m_host.AddScriptLPS(1); 1745 m_host.AddScriptLPS(1);
1576 1746
1577 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1747 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1578 1748 if (parts.Count > 0)
1579 foreach (SceneObjectPart part in parts) 1749 {
1580 SetAlpha(part, alpha, face); 1750 try
1751 {
1752 parts[0].ParentGroup.areUpdatesSuspended = true;
1753 foreach (SceneObjectPart part in parts)
1754 SetAlpha(part, alpha, face);
1755 }
1756 finally
1757 {
1758 parts[0].ParentGroup.areUpdatesSuspended = false;
1759 }
1760 }
1581 } 1761 }
1582 1762
1583 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1763 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1584 { 1764 {
1765 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1766 return;
1767
1585 Primitive.TextureEntry tex = part.Shape.Textures; 1768 Primitive.TextureEntry tex = part.Shape.Textures;
1586 Color4 texcolor; 1769 Color4 texcolor;
1587 if (face >= 0 && face < GetNumberOfSides(part)) 1770 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1627,7 +1810,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1627 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1810 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1628 float wind, float tension, LSL_Vector Force) 1811 float wind, float tension, LSL_Vector Force)
1629 { 1812 {
1630 if (part == null) 1813 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1631 return; 1814 return;
1632 1815
1633 if (flexi) 1816 if (flexi)
@@ -1662,7 +1845,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1662 /// <param name="falloff"></param> 1845 /// <param name="falloff"></param>
1663 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 1846 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1664 { 1847 {
1665 if (part == null) 1848 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1666 return; 1849 return;
1667 1850
1668 if (light) 1851 if (light)
@@ -1739,15 +1922,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1739 m_host.AddScriptLPS(1); 1922 m_host.AddScriptLPS(1);
1740 1923
1741 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1924 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1742 1925 if (parts.Count > 0)
1743 foreach (SceneObjectPart part in parts) 1926 {
1744 SetTexture(part, texture, face); 1927 try
1745 1928 {
1929 parts[0].ParentGroup.areUpdatesSuspended = true;
1930 foreach (SceneObjectPart part in parts)
1931 SetTexture(part, texture, face);
1932 }
1933 finally
1934 {
1935 parts[0].ParentGroup.areUpdatesSuspended = false;
1936 }
1937 }
1746 ScriptSleep(200); 1938 ScriptSleep(200);
1747 } 1939 }
1748 1940
1749 protected void SetTexture(SceneObjectPart part, string texture, int face) 1941 protected void SetTexture(SceneObjectPart part, string texture, int face)
1750 { 1942 {
1943 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1944 return;
1945
1751 UUID textureID = new UUID(); 1946 UUID textureID = new UUID();
1752 1947
1753 textureID = InventoryKey(texture, (int)AssetType.Texture); 1948 textureID = InventoryKey(texture, (int)AssetType.Texture);
@@ -1792,6 +1987,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1792 1987
1793 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 1988 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1794 { 1989 {
1990 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1991 return;
1992
1795 Primitive.TextureEntry tex = part.Shape.Textures; 1993 Primitive.TextureEntry tex = part.Shape.Textures;
1796 if (face >= 0 && face < GetNumberOfSides(part)) 1994 if (face >= 0 && face < GetNumberOfSides(part))
1797 { 1995 {
@@ -1828,6 +2026,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1828 2026
1829 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 2027 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1830 { 2028 {
2029 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2030 return;
2031
1831 Primitive.TextureEntry tex = part.Shape.Textures; 2032 Primitive.TextureEntry tex = part.Shape.Textures;
1832 if (face >= 0 && face < GetNumberOfSides(part)) 2033 if (face >= 0 && face < GetNumberOfSides(part))
1833 { 2034 {
@@ -1864,6 +2065,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1864 2065
1865 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 2066 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
1866 { 2067 {
2068 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2069 return;
2070
1867 Primitive.TextureEntry tex = part.Shape.Textures; 2071 Primitive.TextureEntry tex = part.Shape.Textures;
1868 if (face >= 0 && face < GetNumberOfSides(part)) 2072 if (face >= 0 && face < GetNumberOfSides(part))
1869 { 2073 {
@@ -1932,10 +2136,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1932 return end; 2136 return end;
1933 } 2137 }
1934 2138
1935 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos) 2139 protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos)
1936 { 2140 {
2141 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2142 return fromPos;
2143
1937 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2144 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos)
1938 LSL_Vector currentPos = GetPartLocalPos(part); 2145
1939 2146
1940 float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y); 2147 float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y);
1941 bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true); 2148 bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true);
@@ -1944,14 +2151,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1944 { 2151 {
1945 if ((targetPos.z < ground) && disable_underground_movement && m_host.AttachmentPoint == 0) 2152 if ((targetPos.z < ground) && disable_underground_movement && m_host.AttachmentPoint == 0)
1946 targetPos.z = ground; 2153 targetPos.z = ground;
2154 }
2155 LSL_Vector real_vec = SetPosAdjust(fromPos, targetPos);
2156
2157 return real_vec;
2158 }
2159
2160 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos)
2161 {
2162 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2163 return;
2164
2165 LSL_Vector currentPos = GetPartLocalPos(part);
2166 LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos);
2167
2168 if (part.ParentGroup.RootPart == part)
2169 {
1947 SceneObjectGroup parent = part.ParentGroup; 2170 SceneObjectGroup parent = part.ParentGroup;
1948 LSL_Vector real_vec = SetPosAdjust(currentPos, targetPos); 2171 parent.UpdateGroupPosition(new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z));
1949 parent.UpdateGroupPosition(new Vector3((float)real_vec.x, (float)real_vec.y, (float)real_vec.z));
1950 } 2172 }
1951 else 2173 else
1952 { 2174 {
1953 LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos); 2175 part.OffsetPosition = new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z);
1954 part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z);
1955 SceneObjectGroup parent = part.ParentGroup; 2176 SceneObjectGroup parent = part.ParentGroup;
1956 parent.HasGroupChanged = true; 2177 parent.HasGroupChanged = true;
1957 parent.ScheduleGroupForTerseUpdate(); 2178 parent.ScheduleGroupForTerseUpdate();
@@ -2002,9 +2223,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2002 m_host.AddScriptLPS(1); 2223 m_host.AddScriptLPS(1);
2003 2224
2004 // try to let this work as in SL... 2225 // try to let this work as in SL...
2005 if (m_host.ParentID == 0) 2226 if (m_host.LinkNum < 2)
2006 { 2227 {
2007 // special case: If we are root, rotate complete SOG to new rotation 2228 // Special case: If we are root, rotate complete SOG to new
2229 // rotation.
2230 // We are root if the link number is 0 (single prim) or 1
2231 // (root prim). ParentID may be nonzero in attachments and
2232 // using it would cause attachments and HUDs to rotate
2233 // to the wrong positions.
2008 SetRot(m_host, Rot2Quaternion(rot)); 2234 SetRot(m_host, Rot2Quaternion(rot));
2009 } 2235 }
2010 else 2236 else
@@ -2033,6 +2259,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2033 2259
2034 protected void SetRot(SceneObjectPart part, Quaternion rot) 2260 protected void SetRot(SceneObjectPart part, Quaternion rot)
2035 { 2261 {
2262 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2263 return;
2264
2036 part.UpdateRotation(rot); 2265 part.UpdateRotation(rot);
2037 // Update rotation does not move the object in the physics scene if it's a linkset. 2266 // Update rotation does not move the object in the physics scene if it's a linkset.
2038 2267
@@ -2652,12 +2881,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2652 2881
2653 m_host.AddScriptLPS(1); 2882 m_host.AddScriptLPS(1);
2654 2883
2884 m_host.TaskInventory.LockItemsForRead(true);
2655 TaskInventoryItem item = m_host.TaskInventory[invItemID]; 2885 TaskInventoryItem item = m_host.TaskInventory[invItemID];
2656 2886 m_host.TaskInventory.LockItemsForRead(false);
2657 lock (m_host.TaskInventory)
2658 {
2659 item = m_host.TaskInventory[invItemID];
2660 }
2661 2887
2662 if (item.PermsGranter == UUID.Zero) 2888 if (item.PermsGranter == UUID.Zero)
2663 return 0; 2889 return 0;
@@ -2732,6 +2958,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2732 if (dist > m_ScriptDistanceFactor * 10.0f) 2958 if (dist > m_ScriptDistanceFactor * 10.0f)
2733 return; 2959 return;
2734 2960
2961 //Clone is thread-safe
2735 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 2962 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
2736 2963
2737 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory) 2964 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
@@ -2794,6 +3021,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2794 3021
2795 public void llLookAt(LSL_Vector target, double strength, double damping) 3022 public void llLookAt(LSL_Vector target, double strength, double damping)
2796 { 3023 {
3024 /*
2797 m_host.AddScriptLPS(1); 3025 m_host.AddScriptLPS(1);
2798 // Determine where we are looking from 3026 // Determine where we are looking from
2799 LSL_Vector from = llGetPos(); 3027 LSL_Vector from = llGetPos();
@@ -2813,10 +3041,54 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2813 // the angles of rotation in radians into rotation value 3041 // the angles of rotation in radians into rotation value
2814 3042
2815 LSL_Types.Quaternion rot = llEuler2Rot(angle); 3043 LSL_Types.Quaternion rot = llEuler2Rot(angle);
2816 Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); 3044
2817 m_host.startLookAt(rotation, (float)damping, (float)strength); 3045 // This would only work if your physics system contains an APID controller:
3046 // Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s);
3047 // m_host.startLookAt(rotation, (float)damping, (float)strength);
3048
2818 // Orient the object to the angle calculated 3049 // Orient the object to the angle calculated
2819 //llSetRot(rot); 3050 llSetRot(rot);
3051 */
3052
3053 //The above code, while nice, doesn't replicate the behaviour of SL and tends to "roll" the object.
3054 //There's probably a smarter way of doing this, my rotation math-fu is weak.
3055 // http://bugs.meta7.com/view.php?id=28
3056 // - Tom
3057
3058 /* And the following does not do the job either. It has to be performed inside the ODE glue-code. -.- .._.
3059 LSL_Rotation newrot = llGetRot() * llRotBetween(new LSL_Vector(1.0d, 0.0d, 0.0d) * llGetRot(), new LSL_Vector(0.0d, 0.0d, -1.0d));
3060 llSetRot(newrot * llRotBetween(new LSL_Vector(0.0d,0.0d,1.0d) * newrot, target - llGetPos()));
3061 */
3062 if (m_host.PhysActor != null && !m_host.PhysActor.IsPhysical)
3063 {
3064 // Part is non-phys, convert this to a llSetRot()
3065 Vector3 tgt = new Vector3((float)target.x, (float)target.y, (float)target.z);
3066 Vector3 dir = tgt - m_host.GroupPosition;
3067 dir.Normalize();
3068 float tzrot = (float)Math.Atan2(dir.Y, dir.X);
3069 float txy = (float)Math.Sqrt((dir.X * dir.X) + (dir.Y * dir.Y));
3070 float terot = (float)Math.Atan2(-dir.Z, txy);
3071 LSL_Vector az = new LSL_Vector(0.0f, 0.0f, tzrot);
3072 LSL_Vector ae = new LSL_Vector(0.0f, terot, 0.0f);
3073 LSL_Types.Quaternion spin = llEuler2Rot(az);
3074 LSL_Types.Quaternion rot = llEuler2Rot(ae) * spin;
3075 llSetRot(rot);
3076 }
3077 else
3078 {
3079 // Physical, send the target vector to RotLookAt method inside a 'rotation', the .w -99.9 value indicates it is really a LookAt.
3080 Quaternion q = new Quaternion((float)target.x, (float)target.y, (float)target.z, -99.9f);
3081 m_host.RotLookAt(q, (float)strength, (float)damping);
3082 }
3083
3084 }
3085
3086 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3087 {
3088 m_host.AddScriptLPS(1);
3089// NotImplemented("llRotLookAt");
3090 m_host.RotLookAt(Rot2Quaternion(target), (float)strength, (float)damping);
3091
2820 } 3092 }
2821 3093
2822 public void llStopLookAt() 3094 public void llStopLookAt()
@@ -2865,13 +3137,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2865 { 3137 {
2866 TaskInventoryItem item; 3138 TaskInventoryItem item;
2867 3139
2868 lock (m_host.TaskInventory) 3140 m_host.TaskInventory.LockItemsForRead(true);
3141 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2869 { 3142 {
2870 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3143 m_host.TaskInventory.LockItemsForRead(false);
2871 return; 3144 return;
2872 else
2873 item = m_host.TaskInventory[InventorySelf()];
2874 } 3145 }
3146 else
3147 {
3148 item = m_host.TaskInventory[InventorySelf()];
3149 }
3150 m_host.TaskInventory.LockItemsForRead(false);
2875 3151
2876 if (item.PermsGranter != UUID.Zero) 3152 if (item.PermsGranter != UUID.Zero)
2877 { 3153 {
@@ -2893,13 +3169,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2893 { 3169 {
2894 TaskInventoryItem item; 3170 TaskInventoryItem item;
2895 3171
3172 m_host.TaskInventory.LockItemsForRead(true);
2896 lock (m_host.TaskInventory) 3173 lock (m_host.TaskInventory)
2897 { 3174 {
3175
2898 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3176 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3177 {
3178 m_host.TaskInventory.LockItemsForRead(false);
2899 return; 3179 return;
3180 }
2900 else 3181 else
3182 {
2901 item = m_host.TaskInventory[InventorySelf()]; 3183 item = m_host.TaskInventory[InventorySelf()];
3184 }
2902 } 3185 }
3186 m_host.TaskInventory.LockItemsForRead(false);
2903 3187
2904 m_host.AddScriptLPS(1); 3188 m_host.AddScriptLPS(1);
2905 3189
@@ -2931,18 +3215,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2931 { 3215 {
2932 m_host.AddScriptLPS(1); 3216 m_host.AddScriptLPS(1);
2933 3217
2934 if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
2935 return;
2936
2937 TaskInventoryItem item; 3218 TaskInventoryItem item;
2938 3219
2939 lock (m_host.TaskInventory) 3220 m_host.TaskInventory.LockItemsForRead(true);
3221
3222 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2940 { 3223 {
2941 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3224 m_host.TaskInventory.LockItemsForRead(false);
2942 return; 3225 return;
2943 else
2944 item = m_host.TaskInventory[InventorySelf()];
2945 } 3226 }
3227 else
3228 {
3229 item = m_host.TaskInventory[InventorySelf()];
3230 }
3231
3232 m_host.TaskInventory.LockItemsForRead(false);
2946 3233
2947 if (item.PermsGranter != m_host.OwnerID) 3234 if (item.PermsGranter != m_host.OwnerID)
2948 return; 3235 return;
@@ -2953,10 +3240,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2953 3240
2954 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 3241 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
2955 3242
2956 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; 3243 grp.AttachToAgent(m_host.OwnerID, (uint)attachment, Vector3.Zero, false);
2957 if (attachmentsModule != null)
2958 attachmentsModule.AttachObject(presence.ControllingClient,
2959 grp, (uint)attachment, false);
2960 } 3244 }
2961 } 3245 }
2962 3246
@@ -2969,13 +3253,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2969 3253
2970 TaskInventoryItem item; 3254 TaskInventoryItem item;
2971 3255
2972 lock (m_host.TaskInventory) 3256 m_host.TaskInventory.LockItemsForRead(true);
3257
3258 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2973 { 3259 {
2974 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3260 m_host.TaskInventory.LockItemsForRead(false);
2975 return; 3261 return;
2976 else 3262 }
2977 item = m_host.TaskInventory[InventorySelf()]; 3263 else
3264 {
3265 item = m_host.TaskInventory[InventorySelf()];
2978 } 3266 }
3267 m_host.TaskInventory.LockItemsForRead(false);
3268
2979 3269
2980 if (item.PermsGranter != m_host.OwnerID) 3270 if (item.PermsGranter != m_host.OwnerID)
2981 return; 3271 return;
@@ -3022,6 +3312,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3022 3312
3023 public void llInstantMessage(string user, string message) 3313 public void llInstantMessage(string user, string message)
3024 { 3314 {
3315 UUID result;
3316 if (!UUID.TryParse(user, out result))
3317 {
3318 ShoutError("An invalid key was passed to llInstantMessage");
3319 ScriptSleep(2000);
3320 return;
3321 }
3322
3323
3025 m_host.AddScriptLPS(1); 3324 m_host.AddScriptLPS(1);
3026 3325
3027 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3326 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -3036,14 +3335,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3036 UUID friendTransactionID = UUID.Random(); 3335 UUID friendTransactionID = UUID.Random();
3037 3336
3038 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3337 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3039 3338
3040 GridInstantMessage msg = new GridInstantMessage(); 3339 GridInstantMessage msg = new GridInstantMessage();
3041 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3340 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3042 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3341 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3043 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3342 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3044// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3343// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3045// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3344// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3046 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 3345// DateTime dt = DateTime.UtcNow;
3346//
3347// // Ticks from UtcNow, but make it look like local. Evil, huh?
3348// dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3349//
3350// try
3351// {
3352// // Convert that to the PST timezone
3353// TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3354// dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3355// }
3356// catch
3357// {
3358// // No logging here, as it could be VERY spammy
3359// }
3360//
3361// // And make it look local again to fool the unix time util
3362// dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3363
3364 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
3365
3047 //if (client != null) 3366 //if (client != null)
3048 //{ 3367 //{
3049 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3368 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3057,12 +3376,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3057 msg.message = message.Substring(0, 1024); 3376 msg.message = message.Substring(0, 1024);
3058 else 3377 else
3059 msg.message = message; 3378 msg.message = message;
3060 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3379 msg.dialog = (byte)19; // MessageFromObject
3061 msg.fromGroup = false;// fromGroup; 3380 msg.fromGroup = false;// fromGroup;
3062 msg.offline = (byte)0; //offline; 3381 msg.offline = (byte)0; //offline;
3063 msg.ParentEstateID = 0; //ParentEstateID; 3382 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3064 msg.Position = new Vector3(m_host.AbsolutePosition); 3383 msg.Position = new Vector3(m_host.AbsolutePosition);
3065 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3384 msg.RegionID = World.RegionInfo.RegionID.Guid;
3066 msg.binaryBucket 3385 msg.binaryBucket
3067 = Util.StringToBytes256( 3386 = Util.StringToBytes256(
3068 "{0}/{1}/{2}/{3}", 3387 "{0}/{1}/{2}/{3}",
@@ -3090,7 +3409,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3090 } 3409 }
3091 3410
3092 emailModule.SendEmail(m_host.UUID, address, subject, message); 3411 emailModule.SendEmail(m_host.UUID, address, subject, message);
3093 ScriptSleep(20000); 3412 ScriptSleep(15000);
3094 } 3413 }
3095 3414
3096 public void llGetNextEmail(string address, string subject) 3415 public void llGetNextEmail(string address, string subject)
@@ -3192,13 +3511,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3192 m_host.AddScriptLPS(1); 3511 m_host.AddScriptLPS(1);
3193 } 3512 }
3194 3513
3195 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3196 {
3197 m_host.AddScriptLPS(1);
3198 Quaternion rot = new Quaternion((float)target.x, (float)target.y, (float)target.z, (float)target.s);
3199 m_host.RotLookAt(rot, (float)strength, (float)damping);
3200 }
3201
3202 public LSL_Integer llStringLength(string str) 3514 public LSL_Integer llStringLength(string str)
3203 { 3515 {
3204 m_host.AddScriptLPS(1); 3516 m_host.AddScriptLPS(1);
@@ -3222,14 +3534,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3222 3534
3223 TaskInventoryItem item; 3535 TaskInventoryItem item;
3224 3536
3225 lock (m_host.TaskInventory) 3537 m_host.TaskInventory.LockItemsForRead(true);
3538 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3226 { 3539 {
3227 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3540 m_host.TaskInventory.LockItemsForRead(false);
3228 return; 3541 return;
3229 else
3230 item = m_host.TaskInventory[InventorySelf()];
3231 } 3542 }
3232 3543 else
3544 {
3545 item = m_host.TaskInventory[InventorySelf()];
3546 }
3547 m_host.TaskInventory.LockItemsForRead(false);
3233 if (item.PermsGranter == UUID.Zero) 3548 if (item.PermsGranter == UUID.Zero)
3234 return; 3549 return;
3235 3550
@@ -3259,13 +3574,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3259 3574
3260 TaskInventoryItem item; 3575 TaskInventoryItem item;
3261 3576
3262 lock (m_host.TaskInventory) 3577 m_host.TaskInventory.LockItemsForRead(true);
3578 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3263 { 3579 {
3264 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3580 m_host.TaskInventory.LockItemsForRead(false);
3265 return; 3581 return;
3266 else 3582 }
3267 item = m_host.TaskInventory[InventorySelf()]; 3583 else
3584 {
3585 item = m_host.TaskInventory[InventorySelf()];
3268 } 3586 }
3587 m_host.TaskInventory.LockItemsForRead(false);
3588
3269 3589
3270 if (item.PermsGranter == UUID.Zero) 3590 if (item.PermsGranter == UUID.Zero)
3271 return; 3591 return;
@@ -3330,10 +3650,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3330 3650
3331 TaskInventoryItem item; 3651 TaskInventoryItem item;
3332 3652
3333 lock (m_host.TaskInventory) 3653
3654 m_host.TaskInventory.LockItemsForRead(true);
3655 if (!m_host.TaskInventory.ContainsKey(invItemID))
3656 {
3657 m_host.TaskInventory.LockItemsForRead(false);
3658 return;
3659 }
3660 else
3334 { 3661 {
3335 item = m_host.TaskInventory[invItemID]; 3662 item = m_host.TaskInventory[invItemID];
3336 } 3663 }
3664 m_host.TaskInventory.LockItemsForRead(false);
3337 3665
3338 if (agentID == UUID.Zero || perm == 0) // Releasing permissions 3666 if (agentID == UUID.Zero || perm == 0) // Releasing permissions
3339 { 3667 {
@@ -3361,15 +3689,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3361 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 3689 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
3362 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3690 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
3363 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3691 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
3692 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
3364 ScriptBaseClass.PERMISSION_ATTACH; 3693 ScriptBaseClass.PERMISSION_ATTACH;
3365 3694
3366 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3695 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3367 { 3696 {
3368 lock (m_host.TaskInventory) 3697 m_host.TaskInventory.LockItemsForWrite(true);
3369 { 3698 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3370 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3699 m_host.TaskInventory[invItemID].PermsMask = perm;
3371 m_host.TaskInventory[invItemID].PermsMask = perm; 3700 m_host.TaskInventory.LockItemsForWrite(false);
3372 }
3373 3701
3374 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3702 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3375 "run_time_permissions", new Object[] { 3703 "run_time_permissions", new Object[] {
@@ -3389,11 +3717,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3389 3717
3390 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3718 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3391 { 3719 {
3392 lock (m_host.TaskInventory) 3720 m_host.TaskInventory.LockItemsForWrite(true);
3393 { 3721 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3394 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3722 m_host.TaskInventory[invItemID].PermsMask = perm;
3395 m_host.TaskInventory[invItemID].PermsMask = perm; 3723 m_host.TaskInventory.LockItemsForWrite(false);
3396 }
3397 3724
3398 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3725 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3399 "run_time_permissions", new Object[] { 3726 "run_time_permissions", new Object[] {
@@ -3414,11 +3741,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3414 3741
3415 if (!m_waitingForScriptAnswer) 3742 if (!m_waitingForScriptAnswer)
3416 { 3743 {
3417 lock (m_host.TaskInventory) 3744 m_host.TaskInventory.LockItemsForWrite(true);
3418 { 3745 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3419 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3746 m_host.TaskInventory[invItemID].PermsMask = 0;
3420 m_host.TaskInventory[invItemID].PermsMask = 0; 3747 m_host.TaskInventory.LockItemsForWrite(false);
3421 }
3422 3748
3423 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3749 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3424 m_waitingForScriptAnswer=true; 3750 m_waitingForScriptAnswer=true;
@@ -3453,10 +3779,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3453 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3779 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3454 llReleaseControls(); 3780 llReleaseControls();
3455 3781
3456 lock (m_host.TaskInventory) 3782
3457 { 3783 m_host.TaskInventory.LockItemsForWrite(true);
3458 m_host.TaskInventory[invItemID].PermsMask = answer; 3784 m_host.TaskInventory[invItemID].PermsMask = answer;
3459 } 3785 m_host.TaskInventory.LockItemsForWrite(false);
3786
3460 3787
3461 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3788 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3462 "run_time_permissions", new Object[] { 3789 "run_time_permissions", new Object[] {
@@ -3468,16 +3795,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3468 { 3795 {
3469 m_host.AddScriptLPS(1); 3796 m_host.AddScriptLPS(1);
3470 3797
3471 lock (m_host.TaskInventory) 3798 m_host.TaskInventory.LockItemsForRead(true);
3799
3800 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3472 { 3801 {
3473 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3802 if (item.Type == 10 && item.ItemID == m_itemID)
3474 { 3803 {
3475 if (item.Type == 10 && item.ItemID == m_itemID) 3804 m_host.TaskInventory.LockItemsForRead(false);
3476 { 3805 return item.PermsGranter.ToString();
3477 return item.PermsGranter.ToString();
3478 }
3479 } 3806 }
3480 } 3807 }
3808 m_host.TaskInventory.LockItemsForRead(false);
3481 3809
3482 return UUID.Zero.ToString(); 3810 return UUID.Zero.ToString();
3483 } 3811 }
@@ -3486,19 +3814,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3486 { 3814 {
3487 m_host.AddScriptLPS(1); 3815 m_host.AddScriptLPS(1);
3488 3816
3489 lock (m_host.TaskInventory) 3817 m_host.TaskInventory.LockItemsForRead(true);
3818
3819 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3490 { 3820 {
3491 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3821 if (item.Type == 10 && item.ItemID == m_itemID)
3492 { 3822 {
3493 if (item.Type == 10 && item.ItemID == m_itemID) 3823 int perms = item.PermsMask;
3494 { 3824 if (m_automaticLinkPermission)
3495 int perms = item.PermsMask; 3825 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
3496 if (m_automaticLinkPermission) 3826 m_host.TaskInventory.LockItemsForRead(false);
3497 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 3827 return perms;
3498 return perms;
3499 }
3500 } 3828 }
3501 } 3829 }
3830 m_host.TaskInventory.LockItemsForRead(false);
3502 3831
3503 return 0; 3832 return 0;
3504 } 3833 }
@@ -3520,9 +3849,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3520 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 3849 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3521 { 3850 {
3522 List<SceneObjectPart> parts = GetLinkParts(linknumber); 3851 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3523 3852 if (parts.Count > 0)
3524 foreach (SceneObjectPart part in parts) 3853 {
3525 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); 3854 try
3855 {
3856 parts[0].ParentGroup.areUpdatesSuspended = true;
3857 foreach (SceneObjectPart part in parts)
3858 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
3859 }
3860 finally
3861 {
3862 parts[0].ParentGroup.areUpdatesSuspended = false;
3863 }
3864 }
3526 } 3865 }
3527 3866
3528 public void llCreateLink(string target, int parent) 3867 public void llCreateLink(string target, int parent)
@@ -3535,11 +3874,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3535 return; 3874 return;
3536 3875
3537 TaskInventoryItem item; 3876 TaskInventoryItem item;
3538 lock (m_host.TaskInventory) 3877 m_host.TaskInventory.LockItemsForRead(true);
3539 { 3878 item = m_host.TaskInventory[invItemID];
3540 item = m_host.TaskInventory[invItemID]; 3879 m_host.TaskInventory.LockItemsForRead(false);
3541 } 3880
3542
3543 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3881 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3544 && !m_automaticLinkPermission) 3882 && !m_automaticLinkPermission)
3545 { 3883 {
@@ -3556,11 +3894,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3556 3894
3557 if (targetPart.ParentGroup.RootPart.AttachmentPoint != 0) 3895 if (targetPart.ParentGroup.RootPart.AttachmentPoint != 0)
3558 return; // Fail silently if attached 3896 return; // Fail silently if attached
3897
3898 if (targetPart.ParentGroup.RootPart.OwnerID != m_host.ParentGroup.RootPart.OwnerID)
3899 return;
3900
3559 SceneObjectGroup parentPrim = null, childPrim = null; 3901 SceneObjectGroup parentPrim = null, childPrim = null;
3560 3902
3561 if (targetPart != null) 3903 if (targetPart != null)
3562 { 3904 {
3563 if (parent != 0) { 3905 if (parent != 0)
3906 {
3564 parentPrim = m_host.ParentGroup; 3907 parentPrim = m_host.ParentGroup;
3565 childPrim = targetPart.ParentGroup; 3908 childPrim = targetPart.ParentGroup;
3566 } 3909 }
@@ -3592,16 +3935,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3592 m_host.AddScriptLPS(1); 3935 m_host.AddScriptLPS(1);
3593 UUID invItemID = InventorySelf(); 3936 UUID invItemID = InventorySelf();
3594 3937
3595 lock (m_host.TaskInventory) 3938 m_host.TaskInventory.LockItemsForRead(true);
3596 {
3597 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3939 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3598 && !m_automaticLinkPermission) 3940 && !m_automaticLinkPermission)
3599 { 3941 {
3600 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 3942 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
3943 m_host.TaskInventory.LockItemsForRead(false);
3601 return; 3944 return;
3602 } 3945 }
3603 } 3946 m_host.TaskInventory.LockItemsForRead(false);
3604 3947
3605 if (linknum < ScriptBaseClass.LINK_THIS) 3948 if (linknum < ScriptBaseClass.LINK_THIS)
3606 return; 3949 return;
3607 3950
@@ -3640,10 +3983,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3640 // Restructuring Multiple Prims. 3983 // Restructuring Multiple Prims.
3641 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); 3984 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
3642 parts.Remove(parentPrim.RootPart); 3985 parts.Remove(parentPrim.RootPart);
3643 foreach (SceneObjectPart part in parts) 3986 if (parts.Count > 0)
3644 { 3987 {
3645 parentPrim.DelinkFromGroup(part.LocalId, true); 3988 try
3989 {
3990 parts[0].ParentGroup.areUpdatesSuspended = true;
3991 foreach (SceneObjectPart part in parts)
3992 {
3993 parentPrim.DelinkFromGroup(part.LocalId, true);
3994 }
3995 }
3996 finally
3997 {
3998 parts[0].ParentGroup.areUpdatesSuspended = false;
3999 }
3646 } 4000 }
4001
3647 parentPrim.HasGroupChanged = true; 4002 parentPrim.HasGroupChanged = true;
3648 parentPrim.ScheduleGroupForFullUpdate(); 4003 parentPrim.ScheduleGroupForFullUpdate();
3649 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 4004 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3652,11 +4007,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3652 { 4007 {
3653 SceneObjectPart newRoot = parts[0]; 4008 SceneObjectPart newRoot = parts[0];
3654 parts.Remove(newRoot); 4009 parts.Remove(newRoot);
3655 foreach (SceneObjectPart part in parts) 4010
4011 try
3656 { 4012 {
3657 part.UpdateFlag = 0; 4013 parts[0].ParentGroup.areUpdatesSuspended = true;
3658 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 4014 foreach (SceneObjectPart part in parts)
4015 {
4016 part.UpdateFlag = 0;
4017 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
4018 }
3659 } 4019 }
4020 finally
4021 {
4022 parts[0].ParentGroup.areUpdatesSuspended = false;
4023 }
4024
4025
3660 newRoot.ParentGroup.HasGroupChanged = true; 4026 newRoot.ParentGroup.HasGroupChanged = true;
3661 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 4027 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3662 } 4028 }
@@ -3676,6 +4042,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3676 public void llBreakAllLinks() 4042 public void llBreakAllLinks()
3677 { 4043 {
3678 m_host.AddScriptLPS(1); 4044 m_host.AddScriptLPS(1);
4045
4046 UUID invItemID = InventorySelf();
4047
4048 TaskInventoryItem item;
4049 m_host.TaskInventory.LockItemsForRead(true);
4050 item = m_host.TaskInventory[invItemID];
4051 m_host.TaskInventory.LockItemsForRead(false);
4052
4053 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
4054 && !m_automaticLinkPermission)
4055 {
4056 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
4057 return;
4058 }
4059
3679 SceneObjectGroup parentPrim = m_host.ParentGroup; 4060 SceneObjectGroup parentPrim = m_host.ParentGroup;
3680 if (parentPrim.RootPart.AttachmentPoint != 0) 4061 if (parentPrim.RootPart.AttachmentPoint != 0)
3681 return; // Fail silently if attached 4062 return; // Fail silently if attached
@@ -3702,6 +4083,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3702 } 4083 }
3703 else 4084 else
3704 { 4085 {
4086 if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1))
4087 {
4088 linknum -= (m_host.ParentGroup.PrimCount) + 1;
4089
4090 if (linknum < 0)
4091 return UUID.Zero.ToString();
4092
4093 List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
4094 if (avatars.Count > linknum)
4095 {
4096 return avatars[linknum].UUID.ToString();
4097 }
4098 }
3705 return UUID.Zero.ToString(); 4099 return UUID.Zero.ToString();
3706 } 4100 }
3707 } 4101 }
@@ -3778,17 +4172,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3778 m_host.AddScriptLPS(1); 4172 m_host.AddScriptLPS(1);
3779 int count = 0; 4173 int count = 0;
3780 4174
3781 lock (m_host.TaskInventory) 4175 m_host.TaskInventory.LockItemsForRead(true);
4176 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3782 { 4177 {
3783 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4178 if (inv.Value.Type == type || type == -1)
3784 { 4179 {
3785 if (inv.Value.Type == type || type == -1) 4180 count = count + 1;
3786 {
3787 count = count + 1;
3788 }
3789 } 4181 }
3790 } 4182 }
3791 4183
4184 m_host.TaskInventory.LockItemsForRead(false);
3792 return count; 4185 return count;
3793 } 4186 }
3794 4187
@@ -3797,16 +4190,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3797 m_host.AddScriptLPS(1); 4190 m_host.AddScriptLPS(1);
3798 ArrayList keys = new ArrayList(); 4191 ArrayList keys = new ArrayList();
3799 4192
3800 lock (m_host.TaskInventory) 4193 m_host.TaskInventory.LockItemsForRead(true);
4194 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3801 { 4195 {
3802 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4196 if (inv.Value.Type == type || type == -1)
3803 { 4197 {
3804 if (inv.Value.Type == type || type == -1) 4198 keys.Add(inv.Value.Name);
3805 {
3806 keys.Add(inv.Value.Name);
3807 }
3808 } 4199 }
3809 } 4200 }
4201 m_host.TaskInventory.LockItemsForRead(false);
3810 4202
3811 if (keys.Count == 0) 4203 if (keys.Count == 0)
3812 { 4204 {
@@ -3843,25 +4235,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3843 } 4235 }
3844 4236
3845 // move the first object found with this inventory name 4237 // move the first object found with this inventory name
3846 lock (m_host.TaskInventory) 4238 m_host.TaskInventory.LockItemsForRead(true);
4239 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3847 { 4240 {
3848 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4241 if (inv.Value.Name == inventory)
3849 { 4242 {
3850 if (inv.Value.Name == inventory) 4243 found = true;
3851 { 4244 objId = inv.Key;
3852 found = true; 4245 assetType = inv.Value.Type;
3853 objId = inv.Key; 4246 objName = inv.Value.Name;
3854 assetType = inv.Value.Type; 4247 break;
3855 objName = inv.Value.Name;
3856 break;
3857 }
3858 } 4248 }
3859 } 4249 }
4250 m_host.TaskInventory.LockItemsForRead(false);
3860 4251
3861 if (!found) 4252 if (!found)
3862 { 4253 {
3863 llSay(0, String.Format("Could not find object '{0}'", inventory)); 4254 llSay(0, String.Format("Could not find object '{0}'", inventory));
3864 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4255 return;
4256// throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
3865 } 4257 }
3866 4258
3867 // check if destination is an object 4259 // check if destination is an object
@@ -3887,6 +4279,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3887 return; 4279 return;
3888 } 4280 }
3889 } 4281 }
4282
3890 // destination is an avatar 4283 // destination is an avatar
3891 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4284 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
3892 4285
@@ -3909,26 +4302,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3909 bucket); 4302 bucket);
3910 if (m_TransferModule != null) 4303 if (m_TransferModule != null)
3911 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4304 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4305
4306 //This delay should only occur when giving inventory to avatars.
3912 ScriptSleep(3000); 4307 ScriptSleep(3000);
3913 } 4308 }
3914 } 4309 }
3915 4310
4311 [DebuggerNonUserCode]
3916 public void llRemoveInventory(string name) 4312 public void llRemoveInventory(string name)
3917 { 4313 {
3918 m_host.AddScriptLPS(1); 4314 m_host.AddScriptLPS(1);
3919 4315
3920 lock (m_host.TaskInventory) 4316 List<TaskInventoryItem> inv;
4317 try
3921 { 4318 {
3922 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4319 m_host.TaskInventory.LockItemsForRead(true);
4320 inv = new List<TaskInventoryItem>(m_host.TaskInventory.Values);
4321 }
4322 finally
4323 {
4324 m_host.TaskInventory.LockItemsForRead(false);
4325 }
4326 foreach (TaskInventoryItem item in inv)
4327 {
4328 if (item.Name == name)
3923 { 4329 {
3924 if (item.Name == name) 4330 if (item.ItemID == m_itemID)
3925 { 4331 throw new ScriptDeleteException();
3926 if (item.ItemID == m_itemID) 4332 else
3927 throw new ScriptDeleteException(); 4333 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3928 else 4334 return;
3929 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3930 return;
3931 }
3932 } 4335 }
3933 } 4336 }
3934 } 4337 }
@@ -3963,112 +4366,122 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3963 { 4366 {
3964 m_host.AddScriptLPS(1); 4367 m_host.AddScriptLPS(1);
3965 4368
3966 UUID uuid = (UUID)id; 4369 UUID uuid;
3967 PresenceInfo pinfo = null; 4370 if (UUID.TryParse(id, out uuid))
3968 UserAccount account;
3969
3970 UserInfoCacheEntry ce;
3971 if (!m_userInfoCache.TryGetValue(uuid, out ce))
3972 { 4371 {
3973 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); 4372 PresenceInfo pinfo = null;
3974 if (account == null) 4373 UserAccount account;
4374
4375 UserInfoCacheEntry ce;
4376 if (!m_userInfoCache.TryGetValue(uuid, out ce))
3975 { 4377 {
3976 m_userInfoCache[uuid] = null; // Cache negative 4378 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
3977 return UUID.Zero.ToString(); 4379 if (account == null)
3978 } 4380 {
4381 m_userInfoCache[uuid] = null; // Cache negative
4382 return UUID.Zero.ToString();
4383 }
3979 4384
3980 4385
3981 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); 4386 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
3982 if (pinfos != null && pinfos.Length > 0) 4387 if (pinfos != null && pinfos.Length > 0)
3983 {
3984 foreach (PresenceInfo p in pinfos)
3985 { 4388 {
3986 if (p.RegionID != UUID.Zero) 4389 foreach (PresenceInfo p in pinfos)
3987 { 4390 {
3988 pinfo = p; 4391 if (p.RegionID != UUID.Zero)
4392 {
4393 pinfo = p;
4394 }
3989 } 4395 }
3990 } 4396 }
3991 }
3992 4397
3993 ce = new UserInfoCacheEntry(); 4398 ce = new UserInfoCacheEntry();
3994 ce.time = Util.EnvironmentTickCount(); 4399 ce.time = Util.EnvironmentTickCount();
3995 ce.account = account; 4400 ce.account = account;
3996 ce.pinfo = pinfo; 4401 ce.pinfo = pinfo;
3997 } 4402 m_userInfoCache[uuid] = ce;
3998 else 4403 }
3999 { 4404 else
4000 if (ce == null) 4405 {
4001 return UUID.Zero.ToString(); 4406 if (ce == null)
4407 return UUID.Zero.ToString();
4002 4408
4003 account = ce.account; 4409 account = ce.account;
4004 pinfo = ce.pinfo; 4410 pinfo = ce.pinfo;
4005 } 4411 }
4006 4412
4007 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) 4413 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
4008 {
4009 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4010 if (pinfos != null && pinfos.Length > 0)
4011 { 4414 {
4012 foreach (PresenceInfo p in pinfos) 4415 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4416 if (pinfos != null && pinfos.Length > 0)
4013 { 4417 {
4014 if (p.RegionID != UUID.Zero) 4418 foreach (PresenceInfo p in pinfos)
4015 { 4419 {
4016 pinfo = p; 4420 if (p.RegionID != UUID.Zero)
4421 {
4422 pinfo = p;
4423 }
4017 } 4424 }
4018 } 4425 }
4019 } 4426 else
4020 else 4427 pinfo = null;
4021 pinfo = null;
4022 4428
4023 ce.time = Util.EnvironmentTickCount(); 4429 ce.time = Util.EnvironmentTickCount();
4024 ce.pinfo = pinfo; 4430 ce.pinfo = pinfo;
4025 } 4431 }
4026 4432
4027 string reply = String.Empty; 4433 string reply = String.Empty;
4028 4434
4029 switch (data) 4435 switch (data)
4030 { 4436 {
4031 case 1: // DATA_ONLINE (0|1) 4437 case 1: // DATA_ONLINE (0|1)
4032 if (pinfo != null && pinfo.RegionID != UUID.Zero) 4438 if (pinfo != null && pinfo.RegionID != UUID.Zero)
4033 reply = "1"; 4439 reply = "1";
4034 else 4440 else
4035 reply = "0"; 4441 reply = "0";
4036 break; 4442 break;
4037 case 2: // DATA_NAME (First Last) 4443 case 2: // DATA_NAME (First Last)
4038 reply = account.FirstName + " " + account.LastName; 4444 reply = account.FirstName + " " + account.LastName;
4039 break; 4445 break;
4040 case 3: // DATA_BORN (YYYY-MM-DD) 4446 case 3: // DATA_BORN (YYYY-MM-DD)
4041 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); 4447 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
4042 born = born.AddSeconds(account.Created); 4448 born = born.AddSeconds(account.Created);
4043 reply = born.ToString("yyyy-MM-dd"); 4449 reply = born.ToString("yyyy-MM-dd");
4044 break; 4450 break;
4045 case 4: // DATA_RATING (0,0,0,0,0,0) 4451 case 4: // DATA_RATING (0,0,0,0,0,0)
4046 reply = "0,0,0,0,0,0"; 4452 reply = "0,0,0,0,0,0";
4047 break; 4453 break;
4048 case 8: // DATA_PAYINFO (0|1|2|3) 4454 case 8: // DATA_PAYINFO (0|1|2|3)
4049 reply = "0"; 4455 reply = "0";
4050 break; 4456 break;
4051 default: 4457 default:
4052 return UUID.Zero.ToString(); // Raise no event 4458 return UUID.Zero.ToString(); // Raise no event
4053 } 4459 }
4054 4460
4055 UUID rq = UUID.Random(); 4461 UUID rq = UUID.Random();
4056 4462
4057 UUID tid = AsyncCommands. 4463 UUID tid = AsyncCommands.
4058 DataserverPlugin.RegisterRequest(m_localID, 4464 DataserverPlugin.RegisterRequest(m_localID,
4059 m_itemID, rq.ToString()); 4465 m_itemID, rq.ToString());
4060 4466
4061 AsyncCommands. 4467 AsyncCommands.
4062 DataserverPlugin.DataserverReply(rq.ToString(), reply); 4468 DataserverPlugin.DataserverReply(rq.ToString(), reply);
4063 4469
4064 ScriptSleep(100); 4470 ScriptSleep(100);
4065 return tid.ToString(); 4471 return tid.ToString();
4472 }
4473 else
4474 {
4475 ShoutError("Invalid UUID passed to llRequestAgentData.");
4476 }
4477 return "";
4066 } 4478 }
4067 4479
4068 public LSL_String llRequestInventoryData(string name) 4480 public LSL_String llRequestInventoryData(string name)
4069 { 4481 {
4070 m_host.AddScriptLPS(1); 4482 m_host.AddScriptLPS(1);
4071 4483
4484 //Clone is thread safe
4072 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 4485 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
4073 4486
4074 foreach (TaskInventoryItem item in itemDictionary.Values) 4487 foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -4122,6 +4535,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4122 ScenePresence presence = World.GetScenePresence(agentId); 4535 ScenePresence presence = World.GetScenePresence(agentId);
4123 if (presence != null) 4536 if (presence != null)
4124 { 4537 {
4538 // agent must not be a god
4539 if (presence.UserLevel >= 200) return;
4540
4125 // agent must be over the owners land 4541 // agent must be over the owners land
4126 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4542 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4127 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 4543 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
@@ -4144,7 +4560,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4144 UUID av = new UUID(); 4560 UUID av = new UUID();
4145 if (!UUID.TryParse(agent,out av)) 4561 if (!UUID.TryParse(agent,out av))
4146 { 4562 {
4147 LSLError("First parameter to llDialog needs to be a key"); 4563 //LSLError("First parameter to llDialog needs to be a key");
4148 return; 4564 return;
4149 } 4565 }
4150 4566
@@ -4181,17 +4597,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4181 UUID soundId = UUID.Zero; 4597 UUID soundId = UUID.Zero;
4182 if (!UUID.TryParse(impact_sound, out soundId)) 4598 if (!UUID.TryParse(impact_sound, out soundId))
4183 { 4599 {
4184 lock (m_host.TaskInventory) 4600 m_host.TaskInventory.LockItemsForRead(true);
4601 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4185 { 4602 {
4186 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4603 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
4187 { 4604 {
4188 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound) 4605 soundId = item.AssetID;
4189 { 4606 break;
4190 soundId = item.AssetID;
4191 break;
4192 }
4193 } 4607 }
4194 } 4608 }
4609 m_host.TaskInventory.LockItemsForRead(false);
4195 } 4610 }
4196 m_host.CollisionSound = soundId; 4611 m_host.CollisionSound = soundId;
4197 m_host.CollisionSoundVolume = (float)impact_volume; 4612 m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4231,6 +4646,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4231 UUID partItemID; 4646 UUID partItemID;
4232 foreach (SceneObjectPart part in parts) 4647 foreach (SceneObjectPart part in parts)
4233 { 4648 {
4649 //Clone is thread safe
4234 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 4650 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
4235 4651
4236 foreach (TaskInventoryItem item in itemsDictionary.Values) 4652 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4445,17 +4861,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4445 4861
4446 m_host.AddScriptLPS(1); 4862 m_host.AddScriptLPS(1);
4447 4863
4448 lock (m_host.TaskInventory) 4864 m_host.TaskInventory.LockItemsForRead(true);
4865 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4449 { 4866 {
4450 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4867 if (item.Type == 10 && item.ItemID == m_itemID)
4451 { 4868 {
4452 if (item.Type == 10 && item.ItemID == m_itemID) 4869 result = item.Name!=null?item.Name:String.Empty;
4453 { 4870 break;
4454 result = item.Name != null ? item.Name : String.Empty;
4455 break;
4456 }
4457 } 4871 }
4458 } 4872 }
4873 m_host.TaskInventory.LockItemsForRead(false);
4459 4874
4460 return result; 4875 return result;
4461 } 4876 }
@@ -4624,23 +5039,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4624 { 5039 {
4625 m_host.AddScriptLPS(1); 5040 m_host.AddScriptLPS(1);
4626 5041
4627 lock (m_host.TaskInventory) 5042 m_host.TaskInventory.LockItemsForRead(true);
5043 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
4628 { 5044 {
4629 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 5045 if (inv.Value.Name == name)
4630 { 5046 {
4631 if (inv.Value.Name == name) 5047 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
4632 { 5048 {
4633 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 5049 m_host.TaskInventory.LockItemsForRead(false);
4634 { 5050 return inv.Value.AssetID.ToString();
4635 return inv.Value.AssetID.ToString(); 5051 }
4636 } 5052 else
4637 else 5053 {
4638 { 5054 m_host.TaskInventory.LockItemsForRead(false);
4639 return UUID.Zero.ToString(); 5055 return UUID.Zero.ToString();
4640 }
4641 } 5056 }
4642 } 5057 }
4643 } 5058 }
5059 m_host.TaskInventory.LockItemsForRead(false);
4644 5060
4645 return UUID.Zero.ToString(); 5061 return UUID.Zero.ToString();
4646 } 5062 }
@@ -4793,14 +5209,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4793 { 5209 {
4794 m_host.AddScriptLPS(1); 5210 m_host.AddScriptLPS(1);
4795 5211
4796 if (src == null) 5212 return src.Length;
4797 {
4798 return 0;
4799 }
4800 else
4801 {
4802 return src.Length;
4803 }
4804 } 5213 }
4805 5214
4806 public LSL_Integer llList2Integer(LSL_List src, int index) 5215 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -4846,7 +5255,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4846 else if (src.Data[index] is LSL_Float) 5255 else if (src.Data[index] is LSL_Float)
4847 return Convert.ToDouble(((LSL_Float) src.Data[index]).value); 5256 return Convert.ToDouble(((LSL_Float) src.Data[index]).value);
4848 else if (src.Data[index] is LSL_String) 5257 else if (src.Data[index] is LSL_String)
4849 return Convert.ToDouble(((LSL_String) src.Data[index]).m_string); 5258 {
5259 string str = ((LSL_String) src.Data[index]).m_string;
5260 Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)");
5261 if (m != Match.Empty)
5262 {
5263 str = m.Value;
5264 double d = 0.0;
5265 if (!Double.TryParse(str, out d))
5266 return 0.0;
5267
5268 return d;
5269 }
5270 return 0.0;
5271 }
4850 return Convert.ToDouble(src.Data[index]); 5272 return Convert.ToDouble(src.Data[index]);
4851 } 5273 }
4852 catch (FormatException) 5274 catch (FormatException)
@@ -5119,7 +5541,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5119 } 5541 }
5120 } 5542 }
5121 } 5543 }
5122 else { 5544 else
5545 {
5123 object[] array = new object[src.Length]; 5546 object[] array = new object[src.Length];
5124 Array.Copy(src.Data, 0, array, 0, src.Length); 5547 Array.Copy(src.Data, 0, array, 0, src.Length);
5125 result = new LSL_List(array); 5548 result = new LSL_List(array);
@@ -5570,10 +5993,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5570 m_host.AddScriptLPS(1); 5993 m_host.AddScriptLPS(1);
5571 5994
5572 List<SceneObjectPart> parts = GetLinkParts(linknumber); 5995 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5573 5996 if (parts.Count > 0)
5574 foreach (var part in parts)
5575 { 5997 {
5576 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); 5998 try
5999 {
6000 parts[0].ParentGroup.areUpdatesSuspended = true;
6001 foreach (var part in parts)
6002 {
6003 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
6004 }
6005 }
6006 finally
6007 {
6008 parts[0].ParentGroup.areUpdatesSuspended = false;
6009 }
5577 } 6010 }
5578 } 6011 }
5579 6012
@@ -5627,6 +6060,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5627 ScriptSleep(5000); 6060 ScriptSleep(5000);
5628 } 6061 }
5629 6062
6063 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
6064 {
6065 return ParseString2List(str, separators, in_spacers, false);
6066 }
6067
5630 public LSL_Integer llOverMyLand(string id) 6068 public LSL_Integer llOverMyLand(string id)
5631 { 6069 {
5632 m_host.AddScriptLPS(1); 6070 m_host.AddScriptLPS(1);
@@ -5827,7 +6265,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5827 return m_host.ParentGroup.RootPart.AttachmentPoint; 6265 return m_host.ParentGroup.RootPart.AttachmentPoint;
5828 } 6266 }
5829 6267
5830 public LSL_Integer llGetFreeMemory() 6268 public virtual LSL_Integer llGetFreeMemory()
5831 { 6269 {
5832 m_host.AddScriptLPS(1); 6270 m_host.AddScriptLPS(1);
5833 // Make scripts designed for LSO happy 6271 // Make scripts designed for LSO happy
@@ -5944,7 +6382,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5944 SetParticleSystem(m_host, rules); 6382 SetParticleSystem(m_host, rules);
5945 } 6383 }
5946 6384
5947 private void SetParticleSystem(SceneObjectPart part, LSL_List rules) { 6385 private void SetParticleSystem(SceneObjectPart part, LSL_List rules)
6386 {
5948 6387
5949 6388
5950 if (rules.Length == 0) 6389 if (rules.Length == 0)
@@ -6138,14 +6577,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6138 6577
6139 protected UUID GetTaskInventoryItem(string name) 6578 protected UUID GetTaskInventoryItem(string name)
6140 { 6579 {
6141 lock (m_host.TaskInventory) 6580 m_host.TaskInventory.LockItemsForRead(true);
6581 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6142 { 6582 {
6143 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6583 if (inv.Value.Name == name)
6144 { 6584 {
6145 if (inv.Value.Name == name) 6585 m_host.TaskInventory.LockItemsForRead(false);
6146 return inv.Key; 6586 return inv.Key;
6147 } 6587 }
6148 } 6588 }
6589 m_host.TaskInventory.LockItemsForRead(false);
6149 6590
6150 return UUID.Zero; 6591 return UUID.Zero;
6151 } 6592 }
@@ -6395,13 +6836,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6395 UUID av = new UUID(); 6836 UUID av = new UUID();
6396 if (!UUID.TryParse(avatar,out av)) 6837 if (!UUID.TryParse(avatar,out av))
6397 { 6838 {
6398 LSLError("First parameter to llDialog needs to be a key"); 6839 //LSLError("First parameter to llDialog needs to be a key");
6399 return; 6840 return;
6400 } 6841 }
6401 if (buttons.Length < 1) 6842 if (buttons.Length < 1)
6402 { 6843 {
6403 LSLError("No less than 1 button can be shown"); 6844 buttons.Add("OK");
6404 return;
6405 } 6845 }
6406 if (buttons.Length > 12) 6846 if (buttons.Length > 12)
6407 { 6847 {
@@ -6418,7 +6858,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6418 } 6858 }
6419 if (buttons.Data[i].ToString().Length > 24) 6859 if (buttons.Data[i].ToString().Length > 24)
6420 { 6860 {
6421 LSLError("button label cannot be longer than 24 characters"); 6861 llWhisper(ScriptBaseClass.DEBUG_CHANNEL, "button label cannot be longer than 24 characters");
6422 return; 6862 return;
6423 } 6863 }
6424 buts[i] = buttons.Data[i].ToString(); 6864 buts[i] = buttons.Data[i].ToString();
@@ -6482,22 +6922,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6482 } 6922 }
6483 6923
6484 // copy the first script found with this inventory name 6924 // copy the first script found with this inventory name
6485 lock (m_host.TaskInventory) 6925 TaskInventoryItem scriptItem = null;
6926 m_host.TaskInventory.LockItemsForRead(true);
6927 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6486 { 6928 {
6487 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6929 if (inv.Value.Name == name)
6488 { 6930 {
6489 if (inv.Value.Name == name) 6931 // make sure the object is a script
6932 if (10 == inv.Value.Type)
6490 { 6933 {
6491 // make sure the object is a script 6934 found = true;
6492 if (10 == inv.Value.Type) 6935 srcId = inv.Key;
6493 { 6936 scriptItem = inv.Value;
6494 found = true; 6937 break;
6495 srcId = inv.Key;
6496 break;
6497 }
6498 } 6938 }
6499 } 6939 }
6500 } 6940 }
6941 m_host.TaskInventory.LockItemsForRead(false);
6501 6942
6502 if (!found) 6943 if (!found)
6503 { 6944 {
@@ -6505,8 +6946,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6505 return; 6946 return;
6506 } 6947 }
6507 6948
6508 // the rest of the permission checks are done in RezScript, so check the pin there as well 6949 SceneObjectPart dest = World.GetSceneObjectPart(destId);
6509 World.RezScript(srcId, m_host, destId, pin, running, start_param); 6950 if (dest != null)
6951 {
6952 if ((scriptItem.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID)
6953 {
6954 // the rest of the permission checks are done in RezScript, so check the pin there as well
6955 World.RezScript(srcId, m_host, destId, pin, running, start_param);
6956
6957 if ((scriptItem.BasePermissions & (uint)PermissionMask.Copy) == 0)
6958 m_host.Inventory.RemoveInventoryItem(srcId);
6959 }
6960 }
6510 // this will cause the delay even if the script pin or permissions were wrong - seems ok 6961 // this will cause the delay even if the script pin or permissions were wrong - seems ok
6511 ScriptSleep(3000); 6962 ScriptSleep(3000);
6512 } 6963 }
@@ -6569,18 +7020,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6569 public LSL_String llMD5String(string src, int nonce) 7020 public LSL_String llMD5String(string src, int nonce)
6570 { 7021 {
6571 m_host.AddScriptLPS(1); 7022 m_host.AddScriptLPS(1);
6572 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString())); 7023 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()), Encoding.UTF8);
6573 } 7024 }
6574 7025
6575 public LSL_String llSHA1String(string src) 7026 public LSL_String llSHA1String(string src)
6576 { 7027 {
6577 m_host.AddScriptLPS(1); 7028 m_host.AddScriptLPS(1);
6578 return Util.SHA1Hash(src).ToLower(); 7029 return Util.SHA1Hash(src, Encoding.UTF8).ToLower();
6579 } 7030 }
6580 7031
6581 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist) 7032 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist)
6582 { 7033 {
6583 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7034 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7035 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7036 return shapeBlock;
6584 7037
6585 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 7038 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6586 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 7039 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6656,6 +7109,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6656 7109
6657 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge) 7110 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge)
6658 { 7111 {
7112 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7113 return;
7114
6659 ObjectShapePacket.ObjectDataBlock shapeBlock; 7115 ObjectShapePacket.ObjectDataBlock shapeBlock;
6660 7116
6661 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7117 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6705,6 +7161,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6705 7161
6706 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge) 7162 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge)
6707 { 7163 {
7164 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7165 return;
7166
6708 ObjectShapePacket.ObjectDataBlock shapeBlock; 7167 ObjectShapePacket.ObjectDataBlock shapeBlock;
6709 7168
6710 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7169 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6747,6 +7206,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6747 7206
6748 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 fudge) 7207 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 fudge)
6749 { 7208 {
7209 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7210 return;
7211
6750 ObjectShapePacket.ObjectDataBlock shapeBlock; 7212 ObjectShapePacket.ObjectDataBlock shapeBlock;
6751 7213
6752 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7214 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6873,6 +7335,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6873 7335
6874 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type) 7336 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type)
6875 { 7337 {
7338 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7339 return;
7340
6876 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7341 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6877 UUID sculptId; 7342 UUID sculptId;
6878 7343
@@ -6888,13 +7353,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6888 shapeBlock.PathScaleX = 100; 7353 shapeBlock.PathScaleX = 100;
6889 shapeBlock.PathScaleY = 150; 7354 shapeBlock.PathScaleY = 150;
6890 7355
6891 if (type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER && 7356 if ((type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER) == 0 &&
6892 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE && 7357 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE) == 0 &&
6893 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE && 7358 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE) == 0 &&
6894 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) 7359 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) == 0)
6895 { 7360 {
6896 // default 7361 // default
6897 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7362 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
6898 } 7363 }
6899 7364
6900 // retain pathcurve 7365 // retain pathcurve
@@ -6913,32 +7378,87 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6913 ScriptSleep(200); 7378 ScriptSleep(200);
6914 } 7379 }
6915 7380
6916 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) 7381 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
6917 { 7382 {
6918 m_host.AddScriptLPS(1); 7383 m_host.AddScriptLPS(1);
6919 7384
6920 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7385 List<SceneObjectPart> parts = GetLinkParts(linknumber);
7386 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7387 if (parts.Count>0)
7388 {
7389 try
7390 {
7391 parts[0].ParentGroup.areUpdatesSuspended = true;
7392 foreach (SceneObjectPart part in parts)
7393 SetPrimParams(part, rules);
7394 }
7395 finally
7396 {
7397 parts[0].ParentGroup.areUpdatesSuspended = false;
7398 }
7399 }
7400 if (avatars.Count > 0)
7401 {
7402 foreach (ScenePresence avatar in avatars)
7403 SetPrimParams(avatar, rules);
7404 }
7405 }
6921 7406
6922 foreach (SceneObjectPart part in parts) 7407 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
6923 SetPrimParams(part, rules); 7408 {
6924 7409 llSetLinkPrimitiveParamsFast(linknumber, rules);
6925 ScriptSleep(200); 7410 ScriptSleep(200);
6926 } 7411 }
6927 7412
6928 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7413 protected void SetPrimParams(ScenePresence av, LSL_List rules)
6929 { 7414 {
6930 m_host.AddScriptLPS(1); 7415 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
7416 //We only support PRIM_POSITION and PRIM_ROTATION
6931 7417
6932 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7418 int idx = 0;
6933 7419
6934 foreach (SceneObjectPart part in parts) 7420 while (idx < rules.Length)
6935 SetPrimParams(part, rules); 7421 {
7422 int code = rules.GetLSLIntegerItem(idx++);
7423
7424 int remain = rules.Length - idx;
7425
7426
7427
7428 switch (code)
7429 {
7430 case (int)ScriptBaseClass.PRIM_POSITION:
7431 if (remain < 1)
7432 return;
7433 LSL_Vector v;
7434 v = rules.GetVector3Item(idx++);
7435 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
7436 av.SendAvatarDataToAllAgents();
7437
7438 break;
7439
7440 case (int)ScriptBaseClass.PRIM_ROTATION:
7441 if (remain < 1)
7442 return;
7443 LSL_Rotation r;
7444 r = rules.GetQuaternionItem(idx++);
7445 av.OffsetRotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
7446 av.SendAvatarDataToAllAgents();
7447 break;
7448 }
7449 }
6936 } 7450 }
6937 7451
6938 protected void SetPrimParams(SceneObjectPart part, LSL_List rules) 7452 protected void SetPrimParams(SceneObjectPart part, LSL_List rules)
6939 { 7453 {
7454 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7455 return;
7456
6940 int idx = 0; 7457 int idx = 0;
6941 7458
7459 bool positionChanged = false;
7460 LSL_Vector currentPosition = GetPartLocalPos(part);
7461
6942 while (idx < rules.Length) 7462 while (idx < rules.Length)
6943 { 7463 {
6944 int code = rules.GetLSLIntegerItem(idx++); 7464 int code = rules.GetLSLIntegerItem(idx++);
@@ -6947,7 +7467,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6947 7467
6948 int face; 7468 int face;
6949 LSL_Vector v; 7469 LSL_Vector v;
6950 7470
6951 switch (code) 7471 switch (code)
6952 { 7472 {
6953 case (int)ScriptBaseClass.PRIM_POSITION: 7473 case (int)ScriptBaseClass.PRIM_POSITION:
@@ -6955,7 +7475,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6955 return; 7475 return;
6956 7476
6957 v=rules.GetVector3Item(idx++); 7477 v=rules.GetVector3Item(idx++);
6958 SetPos(part, v); 7478 positionChanged = true;
7479 currentPosition = GetSetPosTarget(part, v, currentPosition);
6959 7480
6960 break; 7481 break;
6961 case (int)ScriptBaseClass.PRIM_SIZE: 7482 case (int)ScriptBaseClass.PRIM_SIZE:
@@ -7323,6 +7844,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7323 break; 7844 break;
7324 } 7845 }
7325 } 7846 }
7847
7848 if (positionChanged)
7849 {
7850 if (part.ParentGroup.RootPart == part)
7851 {
7852 SceneObjectGroup parent = part.ParentGroup;
7853 parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z));
7854 }
7855 else
7856 {
7857 part.OffsetPosition = new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z);
7858 SceneObjectGroup parent = part.ParentGroup;
7859 parent.HasGroupChanged = true;
7860 parent.ScheduleGroupForTerseUpdate();
7861 }
7862 }
7326 } 7863 }
7327 7864
7328 public LSL_String llStringToBase64(string str) 7865 public LSL_String llStringToBase64(string str)
@@ -7471,13 +8008,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7471 public LSL_Integer llGetNumberOfPrims() 8008 public LSL_Integer llGetNumberOfPrims()
7472 { 8009 {
7473 m_host.AddScriptLPS(1); 8010 m_host.AddScriptLPS(1);
7474 int avatarCount = 0; 8011 int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
7475 World.ForEachScenePresence(delegate(ScenePresence presence) 8012
7476 {
7477 if (!presence.IsChildAgent && presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
7478 avatarCount++;
7479 });
7480
7481 return m_host.ParentGroup.PrimCount + avatarCount; 8013 return m_host.ParentGroup.PrimCount + avatarCount;
7482 } 8014 }
7483 8015
@@ -7493,55 +8025,98 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7493 m_host.AddScriptLPS(1); 8025 m_host.AddScriptLPS(1);
7494 UUID objID = UUID.Zero; 8026 UUID objID = UUID.Zero;
7495 LSL_List result = new LSL_List(); 8027 LSL_List result = new LSL_List();
8028
8029 // If the ID is not valid, return null result
7496 if (!UUID.TryParse(obj, out objID)) 8030 if (!UUID.TryParse(obj, out objID))
7497 { 8031 {
7498 result.Add(new LSL_Vector()); 8032 result.Add(new LSL_Vector());
7499 result.Add(new LSL_Vector()); 8033 result.Add(new LSL_Vector());
7500 return result; 8034 return result;
7501 } 8035 }
8036
8037 // Check if this is an attached prim. If so, replace
8038 // the UUID with the avatar UUID and report it's bounding box
8039 SceneObjectPart part = World.GetSceneObjectPart(objID);
8040 if (part != null && part.ParentGroup.IsAttachment)
8041 objID = part.ParentGroup.RootPart.AttachedAvatar;
8042
8043 // Find out if this is an avatar ID. If so, return it's box
7502 ScenePresence presence = World.GetScenePresence(objID); 8044 ScenePresence presence = World.GetScenePresence(objID);
7503 if (presence != null) 8045 if (presence != null)
7504 { 8046 {
7505 if (presence.ParentID == 0) // not sat on an object 8047 // As per LSL Wiki, there is no difference between sitting
8048 // and standing avatar since server 1.36
8049 LSL_Vector lower;
8050 LSL_Vector upper;
8051 if (presence.Animator.Animations.DefaultAnimation.AnimID
8052 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
7506 { 8053 {
7507 LSL_Vector lower; 8054 // This is for ground sitting avatars
7508 LSL_Vector upper; 8055 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7509 if (presence.Animator.Animations.DefaultAnimation.AnimID 8056 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7510 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 8057 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7511 {
7512 // This is for ground sitting avatars
7513 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7514 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7515 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7516 }
7517 else
7518 {
7519 // This is for standing/flying avatars
7520 float height = presence.Appearance.AvatarHeight / 2.0f;
7521 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7522 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7523 }
7524 result.Add(lower);
7525 result.Add(upper);
7526 return result;
7527 } 8058 }
7528 else 8059 else
7529 { 8060 {
7530 // sitting on an object so we need the bounding box of that 8061 // This is for standing/flying avatars
7531 // which should include the avatar so set the UUID to the 8062 float height = presence.Appearance.AvatarHeight / 2.0f;
7532 // UUID of the object the avatar is sat on and allow it to fall through 8063 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7533 // to processing an object 8064 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7534 SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
7535 objID = p.UUID;
7536 } 8065 }
8066
8067 // Adjust to the documented error offsets (see LSL Wiki)
8068 lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
8069 upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
8070
8071 if (lower.x > upper.x)
8072 lower.x = upper.x;
8073 if (lower.y > upper.y)
8074 lower.y = upper.y;
8075 if (lower.z > upper.z)
8076 lower.z = upper.z;
8077
8078 result.Add(lower);
8079 result.Add(upper);
8080 return result;
7537 } 8081 }
7538 SceneObjectPart part = World.GetSceneObjectPart(objID); 8082
8083 part = World.GetSceneObjectPart(objID);
7539 // Currently only works for single prims without a sitting avatar 8084 // Currently only works for single prims without a sitting avatar
7540 if (part != null) 8085 if (part != null)
7541 { 8086 {
7542 Vector3 halfSize = part.Scale / 2.0f; 8087 float minX;
7543 LSL_Vector lower = new LSL_Vector(halfSize.X * -1.0f, halfSize.Y * -1.0f, halfSize.Z * -1.0f); 8088 float maxX;
7544 LSL_Vector upper = new LSL_Vector(halfSize.X, halfSize.Y, halfSize.Z); 8089 float minY;
8090 float maxY;
8091 float minZ;
8092 float maxZ;
8093
8094 // This BBox is in sim coordinates, with the offset being
8095 // a contained point.
8096 Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
8097 out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
8098
8099 minX -= offsets[0].X;
8100 maxX -= offsets[0].X;
8101 minY -= offsets[0].Y;
8102 maxY -= offsets[0].Y;
8103 minZ -= offsets[0].Z;
8104 maxZ -= offsets[0].Z;
8105
8106 LSL_Vector lower;
8107 LSL_Vector upper;
8108
8109 // Adjust to the documented error offsets (see LSL Wiki)
8110 lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
8111 upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
8112
8113 if (lower.x > upper.x)
8114 lower.x = upper.x;
8115 if (lower.y > upper.y)
8116 lower.y = upper.y;
8117 if (lower.z > upper.z)
8118 lower.z = upper.z;
8119
7545 result.Add(lower); 8120 result.Add(lower);
7546 result.Add(upper); 8121 result.Add(upper);
7547 return result; 8122 return result;
@@ -7621,13 +8196,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7621 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X, 8196 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
7622 part.AbsolutePosition.Y, 8197 part.AbsolutePosition.Y,
7623 part.AbsolutePosition.Z); 8198 part.AbsolutePosition.Z);
7624 // For some reason, the part.AbsolutePosition.* values do not change if the
7625 // linkset is rotated; they always reflect the child prim's world position
7626 // as though the linkset is unrotated. This is incompatible behavior with SL's
7627 // implementation, so will break scripts imported from there (not to mention it
7628 // makes it more difficult to determine a child prim's actual inworld position).
7629 if (part.ParentID != 0)
7630 v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition();
7631 res.Add(v); 8199 res.Add(v);
7632 break; 8200 break;
7633 8201
@@ -7788,56 +8356,92 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7788 case (int)ScriptBaseClass.PRIM_BUMP_SHINY: 8356 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
7789 if (remain < 1) 8357 if (remain < 1)
7790 return res; 8358 return res;
7791 8359 face = (int)rules.GetLSLIntegerItem(idx++);
7792 face=(int)rules.GetLSLIntegerItem(idx++);
7793 8360
7794 tex = part.Shape.Textures; 8361 tex = part.Shape.Textures;
8362 int shiny;
7795 if (face == ScriptBaseClass.ALL_SIDES) 8363 if (face == ScriptBaseClass.ALL_SIDES)
7796 { 8364 {
7797 for (face = 0; face < GetNumberOfSides(part); face++) 8365 for (face = 0; face < GetNumberOfSides(part); face++)
7798 { 8366 {
7799 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8367 Shininess shinyness = tex.GetFace((uint)face).Shiny;
7800 // Convert Shininess to PRIM_SHINY_* 8368 if (shinyness == Shininess.High)
7801 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 8369 {
7802 // PRIM_BUMP_* 8370 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
7803 res.Add(new LSL_Integer((int)texface.Bump)); 8371 }
8372 else if (shinyness == Shininess.Medium)
8373 {
8374 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8375 }
8376 else if (shinyness == Shininess.Low)
8377 {
8378 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8379 }
8380 else
8381 {
8382 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8383 }
8384 res.Add(new LSL_Integer(shiny));
8385 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
7804 } 8386 }
7805 } 8387 }
7806 else 8388 else
7807 { 8389 {
7808 if (face >= 0 && face < GetNumberOfSides(part)) 8390 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8391 if (shinyness == Shininess.High)
7809 { 8392 {
7810 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8393 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
7811 // Convert Shininess to PRIM_SHINY_* 8394 }
7812 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 8395 else if (shinyness == Shininess.Medium)
7813 // PRIM_BUMP_* 8396 {
7814 res.Add(new LSL_Integer((int)texface.Bump)); 8397 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8398 }
8399 else if (shinyness == Shininess.Low)
8400 {
8401 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
7815 } 8402 }
8403 else
8404 {
8405 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8406 }
8407 res.Add(new LSL_Integer(shiny));
8408 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
7816 } 8409 }
7817 break; 8410 break;
7818 8411
7819 case (int)ScriptBaseClass.PRIM_FULLBRIGHT: 8412 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
7820 if (remain < 1) 8413 if (remain < 1)
7821 return res; 8414 return res;
7822 8415 face = (int)rules.GetLSLIntegerItem(idx++);
7823 face=(int)rules.GetLSLIntegerItem(idx++);
7824 8416
7825 tex = part.Shape.Textures; 8417 tex = part.Shape.Textures;
8418 int fullbright;
7826 if (face == ScriptBaseClass.ALL_SIDES) 8419 if (face == ScriptBaseClass.ALL_SIDES)
7827 { 8420 {
7828 for (face = 0; face < GetNumberOfSides(part); face++) 8421 for (face = 0; face < GetNumberOfSides(part); face++)
7829 { 8422 {
7830 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8423 if (tex.GetFace((uint)face).Fullbright == true)
7831 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 8424 {
8425 fullbright = ScriptBaseClass.TRUE;
8426 }
8427 else
8428 {
8429 fullbright = ScriptBaseClass.FALSE;
8430 }
8431 res.Add(new LSL_Integer(fullbright));
7832 } 8432 }
7833 } 8433 }
7834 else 8434 else
7835 { 8435 {
7836 if (face >= 0 && face < GetNumberOfSides(part)) 8436 if (tex.GetFace((uint)face).Fullbright == true)
7837 { 8437 {
7838 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8438 fullbright = ScriptBaseClass.TRUE;
7839 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0));
7840 } 8439 }
8440 else
8441 {
8442 fullbright = ScriptBaseClass.FALSE;
8443 }
8444 res.Add(new LSL_Integer(fullbright));
7841 } 8445 }
7842 break; 8446 break;
7843 8447
@@ -7859,27 +8463,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7859 break; 8463 break;
7860 8464
7861 case (int)ScriptBaseClass.PRIM_TEXGEN: 8465 case (int)ScriptBaseClass.PRIM_TEXGEN:
8466 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
7862 if (remain < 1) 8467 if (remain < 1)
7863 return res; 8468 return res;
7864 8469 face = (int)rules.GetLSLIntegerItem(idx++);
7865 face=(int)rules.GetLSLIntegerItem(idx++);
7866 8470
7867 tex = part.Shape.Textures; 8471 tex = part.Shape.Textures;
7868 if (face == ScriptBaseClass.ALL_SIDES) 8472 if (face == ScriptBaseClass.ALL_SIDES)
7869 { 8473 {
7870 for (face = 0; face < GetNumberOfSides(part); face++) 8474 for (face = 0; face < GetNumberOfSides(part); face++)
7871 { 8475 {
7872 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8476 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
7873 // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc. 8477 {
7874 res.Add(new LSL_Integer((uint)texgen >> 1)); 8478 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8479 }
8480 else
8481 {
8482 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8483 }
7875 } 8484 }
7876 } 8485 }
7877 else 8486 else
7878 { 8487 {
7879 if (face >= 0 && face < GetNumberOfSides(part)) 8488 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8489 {
8490 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8491 }
8492 else
7880 { 8493 {
7881 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8494 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
7882 res.Add(new LSL_Integer((uint)texgen >> 1));
7883 } 8495 }
7884 } 8496 }
7885 break; 8497 break;
@@ -7902,28 +8514,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7902 case (int)ScriptBaseClass.PRIM_GLOW: 8514 case (int)ScriptBaseClass.PRIM_GLOW:
7903 if (remain < 1) 8515 if (remain < 1)
7904 return res; 8516 return res;
7905 8517 face = (int)rules.GetLSLIntegerItem(idx++);
7906 face=(int)rules.GetLSLIntegerItem(idx++);
7907 8518
7908 tex = part.Shape.Textures; 8519 tex = part.Shape.Textures;
8520 float primglow;
7909 if (face == ScriptBaseClass.ALL_SIDES) 8521 if (face == ScriptBaseClass.ALL_SIDES)
7910 { 8522 {
7911 for (face = 0; face < GetNumberOfSides(part); face++) 8523 for (face = 0; face < GetNumberOfSides(part); face++)
7912 { 8524 {
7913 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8525 primglow = tex.GetFace((uint)face).Glow;
7914 res.Add(new LSL_Float(texface.Glow)); 8526 res.Add(new LSL_Float(primglow));
7915 } 8527 }
7916 } 8528 }
7917 else 8529 else
7918 { 8530 {
7919 if (face >= 0 && face < GetNumberOfSides(part)) 8531 primglow = tex.GetFace((uint)face).Glow;
7920 { 8532 res.Add(new LSL_Float(primglow));
7921 Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
7922 res.Add(new LSL_Float(texface.Glow));
7923 }
7924 } 8533 }
7925 break; 8534 break;
7926
7927 case (int)ScriptBaseClass.PRIM_TEXT: 8535 case (int)ScriptBaseClass.PRIM_TEXT:
7928 Color4 textColor = part.GetTextColor(); 8536 Color4 textColor = part.GetTextColor();
7929 res.Add(part.Text); 8537 res.Add(part.Text);
@@ -8472,8 +9080,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8472 // The function returns an ordered list 9080 // The function returns an ordered list
8473 // representing the tokens found in the supplied 9081 // representing the tokens found in the supplied
8474 // sources string. If two successive tokenizers 9082 // sources string. If two successive tokenizers
8475 // are encountered, then a NULL entry is added 9083 // are encountered, then a null-string entry is
8476 // to the list. 9084 // added to the list.
8477 // 9085 //
8478 // It is a precondition that the source and 9086 // It is a precondition that the source and
8479 // toekizer lisst are non-null. If they are null, 9087 // toekizer lisst are non-null. If they are null,
@@ -8481,7 +9089,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8481 // while their lengths are being determined. 9089 // while their lengths are being determined.
8482 // 9090 //
8483 // A small amount of working memoryis required 9091 // A small amount of working memoryis required
8484 // of approximately 8*#tokenizers. 9092 // of approximately 8*#tokenizers + 8*srcstrlen.
8485 // 9093 //
8486 // There are many ways in which this function 9094 // There are many ways in which this function
8487 // can be implemented, this implementation is 9095 // can be implemented, this implementation is
@@ -8497,155 +9105,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8497 // and eliminates redundant tokenizers as soon 9105 // and eliminates redundant tokenizers as soon
8498 // as is possible. 9106 // as is possible.
8499 // 9107 //
8500 // The implementation tries to avoid any copying 9108 // The implementation tries to minimize temporary
8501 // of arrays or other objects. 9109 // garbage generation.
8502 // </remarks> 9110 // </remarks>
8503 9111
8504 private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) 9112 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8505 { 9113 {
8506 int beginning = 0; 9114 return ParseString2List(src, separators, spacers, true);
8507 int srclen = src.Length; 9115 }
8508 int seplen = separators.Length;
8509 object[] separray = separators.Data;
8510 int spclen = spacers.Length;
8511 object[] spcarray = spacers.Data;
8512 int mlen = seplen+spclen;
8513
8514 int[] offset = new int[mlen+1];
8515 bool[] active = new bool[mlen];
8516
8517 int best;
8518 int j;
8519
8520 // Initial capacity reduces resize cost
8521 9116
8522 LSL_List tokens = new LSL_List(); 9117 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
9118 {
9119 int srclen = src.Length;
9120 int seplen = separators.Length;
9121 object[] separray = separators.Data;
9122 int spclen = spacers.Length;
9123 object[] spcarray = spacers.Data;
9124 int dellen = 0;
9125 string[] delarray = new string[seplen+spclen];
8523 9126
8524 // All entries are initially valid 9127 int outlen = 0;
9128 string[] outarray = new string[srclen*2+1];
8525 9129
8526 for (int i = 0; i < mlen; i++) 9130 int i, j;
8527 active[i] = true; 9131 string d;
8528 9132
8529 offset[mlen] = srclen; 9133 m_host.AddScriptLPS(1);
8530 9134
8531 while (beginning < srclen) 9135 /*
9136 * Convert separator and spacer lists to C# strings.
9137 * Also filter out null strings so we don't hang.
9138 */
9139 for (i = 0; i < seplen; i ++)
8532 { 9140 {
9141 d = separray[i].ToString();
9142 if (d.Length > 0)
9143 {
9144 delarray[dellen++] = d;
9145 }
9146 }
9147 seplen = dellen;
8533 9148
8534 best = mlen; // as bad as it gets 9149 for (i = 0; i < spclen; i ++)
9150 {
9151 d = spcarray[i].ToString();
9152 if (d.Length > 0)
9153 {
9154 delarray[dellen++] = d;
9155 }
9156 }
8535 9157
8536 // Scan for separators 9158 /*
9159 * Scan through source string from beginning to end.
9160 */
9161 for (i = 0;;)
9162 {
8537 9163
8538 for (j = 0; j < seplen; j++) 9164 /*
9165 * Find earliest delimeter in src starting at i (if any).
9166 */
9167 int earliestDel = -1;
9168 int earliestSrc = srclen;
9169 string earliestStr = null;
9170 for (j = 0; j < dellen; j ++)
8539 { 9171 {
8540 if (separray[j].ToString() == String.Empty) 9172 d = delarray[j];
8541 active[j] = false; 9173 if (d != null)
8542
8543 if (active[j])
8544 { 9174 {
8545 // scan all of the markers 9175 int index = src.IndexOf(d, i);
8546 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) 9176 if (index < 0)
8547 { 9177 {
8548 // not present at all 9178 delarray[j] = null; // delim nowhere in src, don't check it anymore
8549 active[j] = false;
8550 } 9179 }
8551 else 9180 else if (index < earliestSrc)
8552 { 9181 {
8553 // present and correct 9182 earliestSrc = index; // where delimeter starts in source string
8554 if (offset[j] < offset[best]) 9183 earliestDel = j; // where delimeter is in delarray[]
8555 { 9184 earliestStr = d; // the delimeter string from delarray[]
8556 // closest so far 9185 if (index == i) break; // can't do any better than found at beg of string
8557 best = j;
8558 if (offset[best] == beginning)
8559 break;
8560 }
8561 } 9186 }
8562 } 9187 }
8563 } 9188 }
8564 9189
8565 // Scan for spacers 9190 /*
8566 9191 * Output source string starting at i through start of earliest delimeter.
8567 if (offset[best] != beginning) 9192 */
9193 if (keepNulls || (earliestSrc > i))
8568 { 9194 {
8569 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 9195 outarray[outlen++] = src.Substring(i, earliestSrc - i);
8570 {
8571 if (spcarray[j-seplen].ToString() == String.Empty)
8572 active[j] = false;
8573
8574 if (active[j])
8575 {
8576 // scan all of the markers
8577 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
8578 {
8579 // not present at all
8580 active[j] = false;
8581 }
8582 else
8583 {
8584 // present and correct
8585 if (offset[j] < offset[best])
8586 {
8587 // closest so far
8588 best = j;
8589 }
8590 }
8591 }
8592 }
8593 } 9196 }
8594 9197
8595 // This is the normal exit from the scanning loop 9198 /*
9199 * If no delimeter found at or after i, we're done scanning.
9200 */
9201 if (earliestDel < 0) break;
8596 9202
8597 if (best == mlen) 9203 /*
9204 * If delimeter was a spacer, output the spacer.
9205 */
9206 if (earliestDel >= seplen)
8598 { 9207 {
8599 // no markers were found on this pass 9208 outarray[outlen++] = earliestStr;
8600 // so we're pretty much done
8601 if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
8602 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
8603 break;
8604 } 9209 }
8605 9210
8606 // Otherwise we just add the newly delimited token 9211 /*
8607 // and recalculate where the search should continue. 9212 * Look at rest of src string following delimeter.
8608 if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) 9213 */
8609 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 9214 i = earliestSrc + earliestStr.Length;
8610
8611 if (best < seplen)
8612 {
8613 beginning = offset[best] + (separray[best].ToString()).Length;
8614 }
8615 else
8616 {
8617 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
8618 string str = spcarray[best - seplen].ToString();
8619 if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
8620 tokens.Add(new LSL_String(str));
8621 }
8622 } 9215 }
8623 9216
8624 // This an awkward an not very intuitive boundary case. If the 9217 /*
8625 // last substring is a tokenizer, then there is an implied trailing 9218 * Make up an exact-sized output array suitable for an LSL_List object.
8626 // null list entry. Hopefully the single comparison will not be too 9219 */
8627 // arduous. Alternatively the 'break' could be replced with a return 9220 object[] outlist = new object[outlen];
8628 // but that's shabby programming. 9221 for (i = 0; i < outlen; i ++)
8629
8630 if ((beginning == srclen) && (keepNulls))
8631 { 9222 {
8632 if (srclen != 0) 9223 outlist[i] = new LSL_String(outarray[i]);
8633 tokens.Add(new LSL_String(""));
8634 } 9224 }
8635 9225 return new LSL_List(outlist);
8636 return tokens;
8637 }
8638
8639 public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
8640 {
8641 m_host.AddScriptLPS(1);
8642 return this.ParseString(src, separators, spacers, false);
8643 }
8644
8645 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8646 {
8647 m_host.AddScriptLPS(1);
8648 return this.ParseString(src, separators, spacers, true);
8649 } 9226 }
8650 9227
8651 public LSL_Integer llGetObjectPermMask(int mask) 9228 public LSL_Integer llGetObjectPermMask(int mask)
@@ -8722,28 +9299,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8722 { 9299 {
8723 m_host.AddScriptLPS(1); 9300 m_host.AddScriptLPS(1);
8724 9301
8725 lock (m_host.TaskInventory) 9302 m_host.TaskInventory.LockItemsForRead(true);
9303 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8726 { 9304 {
8727 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9305 if (inv.Value.Name == item)
8728 { 9306 {
8729 if (inv.Value.Name == item) 9307 m_host.TaskInventory.LockItemsForRead(false);
9308 switch (mask)
8730 { 9309 {
8731 switch (mask) 9310 case 0:
8732 { 9311 return (int)inv.Value.BasePermissions;
8733 case 0: 9312 case 1:
8734 return (int)inv.Value.BasePermissions; 9313 return (int)inv.Value.CurrentPermissions;
8735 case 1: 9314 case 2:
8736 return (int)inv.Value.CurrentPermissions; 9315 return (int)inv.Value.GroupPermissions;
8737 case 2: 9316 case 3:
8738 return (int)inv.Value.GroupPermissions; 9317 return (int)inv.Value.EveryonePermissions;
8739 case 3: 9318 case 4:
8740 return (int)inv.Value.EveryonePermissions; 9319 return (int)inv.Value.NextPermissions;
8741 case 4:
8742 return (int)inv.Value.NextPermissions;
8743 }
8744 } 9320 }
8745 } 9321 }
8746 } 9322 }
9323 m_host.TaskInventory.LockItemsForRead(false);
8747 9324
8748 return -1; 9325 return -1;
8749 } 9326 }
@@ -8790,16 +9367,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8790 { 9367 {
8791 m_host.AddScriptLPS(1); 9368 m_host.AddScriptLPS(1);
8792 9369
8793 lock (m_host.TaskInventory) 9370 m_host.TaskInventory.LockItemsForRead(true);
9371 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8794 { 9372 {
8795 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9373 if (inv.Value.Name == item)
8796 { 9374 {
8797 if (inv.Value.Name == item) 9375 m_host.TaskInventory.LockItemsForRead(false);
8798 { 9376 return inv.Value.CreatorID.ToString();
8799 return inv.Value.CreatorID.ToString();
8800 }
8801 } 9377 }
8802 } 9378 }
9379 m_host.TaskInventory.LockItemsForRead(false);
8803 9380
8804 llSay(0, "No item name '" + item + "'"); 9381 llSay(0, "No item name '" + item + "'");
8805 9382
@@ -8947,7 +9524,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8947 } 9524 }
8948 9525
8949 /// <summary> 9526 /// <summary>
8950 /// illListReplaceList removes the sub-list defined by the inclusive indices 9527 /// llListReplaceList removes the sub-list defined by the inclusive indices
8951 /// start and end and inserts the src list in its place. The inclusive 9528 /// start and end and inserts the src list in its place. The inclusive
8952 /// nature of the indices means that at least one element must be deleted 9529 /// nature of the indices means that at least one element must be deleted
8953 /// if the indices are within the bounds of the existing list. I.e. 2,2 9530 /// if the indices are within the bounds of the existing list. I.e. 2,2
@@ -9004,16 +9581,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9004 // based upon end. Note that if end exceeds the upper 9581 // based upon end. Note that if end exceeds the upper
9005 // bound in this case, the entire destination list 9582 // bound in this case, the entire destination list
9006 // is removed. 9583 // is removed.
9007 else 9584 else if (start == 0)
9008 { 9585 {
9009 if (end + 1 < dest.Length) 9586 if (end + 1 < dest.Length)
9010 {
9011 return src + dest.GetSublist(end + 1, -1); 9587 return src + dest.GetSublist(end + 1, -1);
9012 }
9013 else 9588 else
9014 {
9015 return src; 9589 return src;
9016 } 9590 }
9591 else // Start < 0
9592 {
9593 if (end + 1 < dest.Length)
9594 return dest.GetSublist(end + 1, -1);
9595 else
9596 return new LSL_List();
9017 } 9597 }
9018 } 9598 }
9019 // Finally, if start > end, we strip away a prefix and 9599 // Finally, if start > end, we strip away a prefix and
@@ -9064,17 +9644,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9064 int width = 0; 9644 int width = 0;
9065 int height = 0; 9645 int height = 0;
9066 9646
9067 ParcelMediaCommandEnum? commandToSend = null; 9647 uint commandToSend = 0;
9068 float time = 0.0f; // default is from start 9648 float time = 0.0f; // default is from start
9069 9649
9070 ScenePresence presence = null; 9650 ScenePresence presence = null;
9071 9651
9072 for (int i = 0; i < commandList.Data.Length; i++) 9652 for (int i = 0; i < commandList.Data.Length; i++)
9073 { 9653 {
9074 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 9654 uint command = (uint)(commandList.GetLSLIntegerItem(i));
9075 switch (command) 9655 switch (command)
9076 { 9656 {
9077 case ParcelMediaCommandEnum.Agent: 9657 case (uint)ParcelMediaCommandEnum.Agent:
9078 // we send only to one agent 9658 // we send only to one agent
9079 if ((i + 1) < commandList.Length) 9659 if ((i + 1) < commandList.Length)
9080 { 9660 {
@@ -9091,25 +9671,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9091 } 9671 }
9092 break; 9672 break;
9093 9673
9094 case ParcelMediaCommandEnum.Loop: 9674 case (uint)ParcelMediaCommandEnum.Loop:
9095 loop = 1; 9675 loop = 1;
9096 commandToSend = command; 9676 commandToSend = command;
9097 update = true; //need to send the media update packet to set looping 9677 update = true; //need to send the media update packet to set looping
9098 break; 9678 break;
9099 9679
9100 case ParcelMediaCommandEnum.Play: 9680 case (uint)ParcelMediaCommandEnum.Play:
9101 loop = 0; 9681 loop = 0;
9102 commandToSend = command; 9682 commandToSend = command;
9103 update = true; //need to send the media update packet to make sure it doesn't loop 9683 update = true; //need to send the media update packet to make sure it doesn't loop
9104 break; 9684 break;
9105 9685
9106 case ParcelMediaCommandEnum.Pause: 9686 case (uint)ParcelMediaCommandEnum.Pause:
9107 case ParcelMediaCommandEnum.Stop: 9687 case (uint)ParcelMediaCommandEnum.Stop:
9108 case ParcelMediaCommandEnum.Unload: 9688 case (uint)ParcelMediaCommandEnum.Unload:
9109 commandToSend = command; 9689 commandToSend = command;
9110 break; 9690 break;
9111 9691
9112 case ParcelMediaCommandEnum.Url: 9692 case (uint)ParcelMediaCommandEnum.Url:
9113 if ((i + 1) < commandList.Length) 9693 if ((i + 1) < commandList.Length)
9114 { 9694 {
9115 if (commandList.Data[i + 1] is LSL_String) 9695 if (commandList.Data[i + 1] is LSL_String)
@@ -9122,7 +9702,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9122 } 9702 }
9123 break; 9703 break;
9124 9704
9125 case ParcelMediaCommandEnum.Texture: 9705 case (uint)ParcelMediaCommandEnum.Texture:
9126 if ((i + 1) < commandList.Length) 9706 if ((i + 1) < commandList.Length)
9127 { 9707 {
9128 if (commandList.Data[i + 1] is LSL_String) 9708 if (commandList.Data[i + 1] is LSL_String)
@@ -9135,7 +9715,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9135 } 9715 }
9136 break; 9716 break;
9137 9717
9138 case ParcelMediaCommandEnum.Time: 9718 case (uint)ParcelMediaCommandEnum.Time:
9139 if ((i + 1) < commandList.Length) 9719 if ((i + 1) < commandList.Length)
9140 { 9720 {
9141 if (commandList.Data[i + 1] is LSL_Float) 9721 if (commandList.Data[i + 1] is LSL_Float)
@@ -9147,7 +9727,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9147 } 9727 }
9148 break; 9728 break;
9149 9729
9150 case ParcelMediaCommandEnum.AutoAlign: 9730 case (uint)ParcelMediaCommandEnum.AutoAlign:
9151 if ((i + 1) < commandList.Length) 9731 if ((i + 1) < commandList.Length)
9152 { 9732 {
9153 if (commandList.Data[i + 1] is LSL_Integer) 9733 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9161,7 +9741,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9161 } 9741 }
9162 break; 9742 break;
9163 9743
9164 case ParcelMediaCommandEnum.Type: 9744 case (uint)ParcelMediaCommandEnum.Type:
9165 if ((i + 1) < commandList.Length) 9745 if ((i + 1) < commandList.Length)
9166 { 9746 {
9167 if (commandList.Data[i + 1] is LSL_String) 9747 if (commandList.Data[i + 1] is LSL_String)
@@ -9174,7 +9754,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9174 } 9754 }
9175 break; 9755 break;
9176 9756
9177 case ParcelMediaCommandEnum.Desc: 9757 case (uint)ParcelMediaCommandEnum.Desc:
9178 if ((i + 1) < commandList.Length) 9758 if ((i + 1) < commandList.Length)
9179 { 9759 {
9180 if (commandList.Data[i + 1] is LSL_String) 9760 if (commandList.Data[i + 1] is LSL_String)
@@ -9187,7 +9767,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9187 } 9767 }
9188 break; 9768 break;
9189 9769
9190 case ParcelMediaCommandEnum.Size: 9770 case (uint)ParcelMediaCommandEnum.Size:
9191 if ((i + 2) < commandList.Length) 9771 if ((i + 2) < commandList.Length)
9192 { 9772 {
9193 if (commandList.Data[i + 1] is LSL_Integer) 9773 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9257,7 +9837,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9257 } 9837 }
9258 } 9838 }
9259 9839
9260 if (commandToSend != null) 9840 if (commandToSend != 0)
9261 { 9841 {
9262 // the commandList contained a start/stop/... command, too 9842 // the commandList contained a start/stop/... command, too
9263 if (presence == null) 9843 if (presence == null)
@@ -9294,7 +9874,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9294 9874
9295 if (aList.Data[i] != null) 9875 if (aList.Data[i] != null)
9296 { 9876 {
9297 switch ((ParcelMediaCommandEnum) aList.Data[i]) 9877 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
9298 { 9878 {
9299 case ParcelMediaCommandEnum.Url: 9879 case ParcelMediaCommandEnum.Url:
9300 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); 9880 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL));
@@ -9337,16 +9917,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9337 { 9917 {
9338 m_host.AddScriptLPS(1); 9918 m_host.AddScriptLPS(1);
9339 9919
9340 lock (m_host.TaskInventory) 9920 m_host.TaskInventory.LockItemsForRead(true);
9921 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9341 { 9922 {
9342 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9923 if (inv.Value.Name == name)
9343 { 9924 {
9344 if (inv.Value.Name == name) 9925 m_host.TaskInventory.LockItemsForRead(false);
9345 { 9926 return inv.Value.Type;
9346 return inv.Value.Type;
9347 }
9348 } 9927 }
9349 } 9928 }
9929 m_host.TaskInventory.LockItemsForRead(false);
9350 9930
9351 return -1; 9931 return -1;
9352 } 9932 }
@@ -9357,15 +9937,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9357 9937
9358 if (quick_pay_buttons.Data.Length < 4) 9938 if (quick_pay_buttons.Data.Length < 4)
9359 { 9939 {
9360 LSLError("List must have at least 4 elements"); 9940 int x;
9361 return; 9941 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
9942 {
9943 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
9944 }
9362 } 9945 }
9363 m_host.ParentGroup.RootPart.PayPrice[0]=price; 9946 int[] nPrice = new int[5];
9364 9947 nPrice[0] = price;
9365 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 9948 nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
9366 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 9949 nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
9367 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 9950 nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
9368 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 9951 nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
9952 m_host.ParentGroup.RootPart.PayPrice = nPrice;
9369 m_host.ParentGroup.HasGroupChanged = true; 9953 m_host.ParentGroup.HasGroupChanged = true;
9370 } 9954 }
9371 9955
@@ -9377,17 +9961,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9377 if (invItemID == UUID.Zero) 9961 if (invItemID == UUID.Zero)
9378 return new LSL_Vector(); 9962 return new LSL_Vector();
9379 9963
9380 lock (m_host.TaskInventory) 9964 m_host.TaskInventory.LockItemsForRead(true);
9965 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9381 { 9966 {
9382 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9967 m_host.TaskInventory.LockItemsForRead(false);
9383 return new LSL_Vector(); 9968 return new LSL_Vector();
9969 }
9384 9970
9385 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 9971 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9386 { 9972 {
9387 ShoutError("No permissions to track the camera"); 9973 ShoutError("No permissions to track the camera");
9388 return new LSL_Vector(); 9974 m_host.TaskInventory.LockItemsForRead(false);
9389 } 9975 return new LSL_Vector();
9390 } 9976 }
9977 m_host.TaskInventory.LockItemsForRead(false);
9391 9978
9392 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 9979 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9393 if (presence != null) 9980 if (presence != null)
@@ -9405,17 +9992,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9405 if (invItemID == UUID.Zero) 9992 if (invItemID == UUID.Zero)
9406 return new LSL_Rotation(); 9993 return new LSL_Rotation();
9407 9994
9408 lock (m_host.TaskInventory) 9995 m_host.TaskInventory.LockItemsForRead(true);
9996 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9409 { 9997 {
9410 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9998 m_host.TaskInventory.LockItemsForRead(false);
9411 return new LSL_Rotation(); 9999 return new LSL_Rotation();
9412
9413 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9414 {
9415 ShoutError("No permissions to track the camera");
9416 return new LSL_Rotation();
9417 }
9418 } 10000 }
10001 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
10002 {
10003 ShoutError("No permissions to track the camera");
10004 m_host.TaskInventory.LockItemsForRead(false);
10005 return new LSL_Rotation();
10006 }
10007 m_host.TaskInventory.LockItemsForRead(false);
9419 10008
9420 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10009 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9421 if (presence != null) 10010 if (presence != null)
@@ -9477,8 +10066,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9477 { 10066 {
9478 m_host.AddScriptLPS(1); 10067 m_host.AddScriptLPS(1);
9479 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0); 10068 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0);
9480 if (detectedParams == null) return; // only works on the first detected avatar 10069 if (detectedParams == null)
9481 10070 {
10071 if (m_host.IsAttachment == true)
10072 {
10073 detectedParams = new DetectParams();
10074 detectedParams.Key = m_host.OwnerID;
10075 }
10076 else
10077 {
10078 return;
10079 }
10080 }
10081
9482 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 10082 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
9483 if (avatar != null) 10083 if (avatar != null)
9484 { 10084 {
@@ -9486,6 +10086,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9486 new Vector3((float)pos.x, (float)pos.y, (float)pos.z), 10086 new Vector3((float)pos.x, (float)pos.y, (float)pos.z),
9487 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z)); 10087 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z));
9488 } 10088 }
10089
9489 ScriptSleep(1000); 10090 ScriptSleep(1000);
9490 } 10091 }
9491 10092
@@ -9578,14 +10179,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9578 if (objectID == UUID.Zero) return; 10179 if (objectID == UUID.Zero) return;
9579 10180
9580 UUID agentID; 10181 UUID agentID;
9581 lock (m_host.TaskInventory) 10182 m_host.TaskInventory.LockItemsForRead(true);
9582 { 10183 // we need the permission first, to know which avatar we want to set the camera for
9583 // we need the permission first, to know which avatar we want to set the camera for 10184 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9584 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9585 10185
9586 if (agentID == UUID.Zero) return; 10186 if (agentID == UUID.Zero)
9587 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 10187 {
10188 m_host.TaskInventory.LockItemsForRead(false);
10189 return;
9588 } 10190 }
10191 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10192 {
10193 m_host.TaskInventory.LockItemsForRead(false);
10194 return;
10195 }
10196 m_host.TaskInventory.LockItemsForRead(false);
9589 10197
9590 ScenePresence presence = World.GetScenePresence(agentID); 10198 ScenePresence presence = World.GetScenePresence(agentID);
9591 10199
@@ -9594,12 +10202,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9594 10202
9595 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 10203 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
9596 object[] data = rules.Data; 10204 object[] data = rules.Data;
9597 for (int i = 0; i < data.Length; ++i) { 10205 for (int i = 0; i < data.Length; ++i)
10206 {
9598 int type = Convert.ToInt32(data[i++].ToString()); 10207 int type = Convert.ToInt32(data[i++].ToString());
9599 if (i >= data.Length) break; // odd number of entries => ignore the last 10208 if (i >= data.Length) break; // odd number of entries => ignore the last
9600 10209
9601 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 10210 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
9602 switch (type) { 10211 switch (type)
10212 {
9603 case ScriptBaseClass.CAMERA_FOCUS: 10213 case ScriptBaseClass.CAMERA_FOCUS:
9604 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 10214 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
9605 case ScriptBaseClass.CAMERA_POSITION: 10215 case ScriptBaseClass.CAMERA_POSITION:
@@ -9635,12 +10245,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9635 10245
9636 // we need the permission first, to know which avatar we want to clear the camera for 10246 // we need the permission first, to know which avatar we want to clear the camera for
9637 UUID agentID; 10247 UUID agentID;
9638 lock (m_host.TaskInventory) 10248 m_host.TaskInventory.LockItemsForRead(true);
10249 agentID = m_host.TaskInventory[invItemID].PermsGranter;
10250 if (agentID == UUID.Zero)
10251 {
10252 m_host.TaskInventory.LockItemsForRead(false);
10253 return;
10254 }
10255 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
9639 { 10256 {
9640 agentID = m_host.TaskInventory[invItemID].PermsGranter; 10257 m_host.TaskInventory.LockItemsForRead(false);
9641 if (agentID == UUID.Zero) return; 10258 return;
9642 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
9643 } 10259 }
10260 m_host.TaskInventory.LockItemsForRead(false);
9644 10261
9645 ScenePresence presence = World.GetScenePresence(agentID); 10262 ScenePresence presence = World.GetScenePresence(agentID);
9646 10263
@@ -9707,19 +10324,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9707 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 10324 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
9708 { 10325 {
9709 m_host.AddScriptLPS(1); 10326 m_host.AddScriptLPS(1);
9710 string ret = String.Empty; 10327
9711 string src1 = llBase64ToString(str1); 10328 if (str1 == String.Empty)
9712 string src2 = llBase64ToString(str2); 10329 return String.Empty;
9713 int c = 0; 10330 if (str2 == String.Empty)
9714 for (int i = 0; i < src1.Length; i++) 10331 return str1;
10332
10333 int len = str2.Length;
10334 if ((len % 4) != 0) // LL is EVIL!!!!
10335 {
10336 while (str2.EndsWith("="))
10337 str2 = str2.Substring(0, str2.Length - 1);
10338
10339 len = str2.Length;
10340 int mod = len % 4;
10341
10342 if (mod == 1)
10343 str2 = str2.Substring(0, str2.Length - 1);
10344 else if (mod == 2)
10345 str2 += "==";
10346 else if (mod == 3)
10347 str2 += "=";
10348 }
10349
10350 byte[] data1;
10351 byte[] data2;
10352 try
10353 {
10354 data1 = Convert.FromBase64String(str1);
10355 data2 = Convert.FromBase64String(str2);
10356 }
10357 catch (Exception)
10358 {
10359 return new LSL_String(String.Empty);
10360 }
10361
10362 byte[] d2 = new Byte[data1.Length];
10363 int pos = 0;
10364
10365 if (data1.Length <= data2.Length)
10366 {
10367 Array.Copy(data2, 0, d2, 0, data1.Length);
10368 }
10369 else
9715 { 10370 {
9716 ret += (char) (src1[i] ^ src2[c]); 10371 while (pos < data1.Length)
10372 {
10373 len = data1.Length - pos;
10374 if (len > data2.Length)
10375 len = data2.Length;
9717 10376
9718 c++; 10377 Array.Copy(data2, 0, d2, pos, len);
9719 if (c >= src2.Length) 10378 pos += len;
9720 c = 0; 10379 }
9721 } 10380 }
9722 return llStringToBase64(ret); 10381
10382 for (pos = 0 ; pos < data1.Length ; pos++ )
10383 data1[pos] ^= d2[pos];
10384
10385 return Convert.ToBase64String(data1);
9723 } 10386 }
9724 10387
9725 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 10388 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -9778,12 +10441,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9778 Regex r = new Regex(authregex); 10441 Regex r = new Regex(authregex);
9779 int[] gnums = r.GetGroupNumbers(); 10442 int[] gnums = r.GetGroupNumbers();
9780 Match m = r.Match(url); 10443 Match m = r.Match(url);
9781 if (m.Success) { 10444 if (m.Success)
9782 for (int i = 1; i < gnums.Length; i++) { 10445 {
10446 for (int i = 1; i < gnums.Length; i++)
10447 {
9783 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 10448 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
9784 //CaptureCollection cc = g.Captures; 10449 //CaptureCollection cc = g.Captures;
9785 } 10450 }
9786 if (m.Groups.Count == 5) { 10451 if (m.Groups.Count == 5)
10452 {
9787 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 10453 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
9788 url = m.Groups[1].ToString() + m.Groups[4].ToString(); 10454 url = m.Groups[1].ToString() + m.Groups[4].ToString();
9789 } 10455 }
@@ -9895,7 +10561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9895 { 10561 {
9896 foreach (KeyValuePair<UUID, int> detectedParams in land.GetLandObjectOwners()) 10562 foreach (KeyValuePair<UUID, int> detectedParams in land.GetLandObjectOwners())
9897 { 10563 {
9898 ret.Add(detectedParams.Key.ToString()); 10564 ret.Add(new LSL_String(detectedParams.Key.ToString()));
9899 ret.Add(detectedParams.Value); 10565 ret.Add(detectedParams.Value);
9900 } 10566 }
9901 } 10567 }
@@ -10064,15 +10730,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10064 10730
10065 internal UUID ScriptByName(string name) 10731 internal UUID ScriptByName(string name)
10066 { 10732 {
10067 lock (m_host.TaskInventory) 10733 m_host.TaskInventory.LockItemsForRead(true);
10734
10735 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
10068 { 10736 {
10069 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 10737 if (item.Type == 10 && item.Name == name)
10070 { 10738 {
10071 if (item.Type == 10 && item.Name == name) 10739 m_host.TaskInventory.LockItemsForRead(false);
10072 return item.ItemID; 10740 return item.ItemID;
10073 } 10741 }
10074 } 10742 }
10075 10743
10744 m_host.TaskInventory.LockItemsForRead(false);
10745
10076 return UUID.Zero; 10746 return UUID.Zero;
10077 } 10747 }
10078 10748
@@ -10113,6 +10783,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10113 { 10783 {
10114 m_host.AddScriptLPS(1); 10784 m_host.AddScriptLPS(1);
10115 10785
10786 //Clone is thread safe
10116 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10787 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10117 10788
10118 UUID assetID = UUID.Zero; 10789 UUID assetID = UUID.Zero;
@@ -10175,6 +10846,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10175 { 10846 {
10176 m_host.AddScriptLPS(1); 10847 m_host.AddScriptLPS(1);
10177 10848
10849 //Clone is thread safe
10178 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10850 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10179 10851
10180 UUID assetID = UUID.Zero; 10852 UUID assetID = UUID.Zero;
@@ -10255,15 +10927,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10255 return GetLinkPrimitiveParams(obj, rules); 10927 return GetLinkPrimitiveParams(obj, rules);
10256 } 10928 }
10257 10929
10258 public void print(string str) 10930 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
10259 { 10931 {
10260 // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print 10932 List<SceneObjectPart> parts = GetLinkParts(link);
10261 IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_itemID, "OSSL"); 10933 if (parts.Count < 1)
10262 if (ossl != null) 10934 return 0;
10263 { 10935
10264 ossl.CheckThreatLevel(ThreatLevel.High, "print"); 10936 return GetNumberOfSides(parts[0]);
10265 m_log.Info("LSL print():" + str);
10266 }
10267 } 10937 }
10268 10938
10269 private string Name2Username(string name) 10939 private string Name2Username(string name)
@@ -10309,6 +10979,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10309 return rq.ToString(); 10979 return rq.ToString();
10310 } 10980 }
10311 10981
10982 private void SayShoutTimerElapsed(Object sender, ElapsedEventArgs args)
10983 {
10984 m_SayShoutCount = 0;
10985 }
10986
10312 #region Not Implemented 10987 #region Not Implemented
10313 // 10988 //
10314 // Listing the unimplemented lsl functions here, please move 10989 // Listing the unimplemented lsl functions here, please move
@@ -10335,11 +11010,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10335 11010
10336 } 11011 }
10337 11012
10338 public void llGetUsedMemory() 11013 public virtual LSL_Integer llGetUsedMemory()
10339 { 11014 {
10340 m_host.AddScriptLPS(1); 11015 m_host.AddScriptLPS(1);
10341 NotImplemented("llGetUsedMemory"); 11016 NotImplemented("llGetUsedMemory");
10342 11017 return 0;
10343 } 11018 }
10344 11019
10345 public void llRegionSayTo( LSL_Key target, LSL_Integer channel, LSL_String msg ) 11020 public void llRegionSayTo( LSL_Key target, LSL_Integer channel, LSL_String msg )
@@ -10352,14 +11027,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10352 public void llScriptProfiler( LSL_Integer flags ) 11027 public void llScriptProfiler( LSL_Integer flags )
10353 { 11028 {
10354 m_host.AddScriptLPS(1); 11029 m_host.AddScriptLPS(1);
10355 NotImplemented("llScriptProfiler"); 11030 //NotImplemented("llScriptProfiler");
10356 11031
10357 } 11032 }
10358 11033
10359 public void llSetSoundQueueing(int queue) 11034 public void llSetSoundQueueing(int queue)
10360 { 11035 {
10361 m_host.AddScriptLPS(1); 11036 m_host.AddScriptLPS(1);
10362 NotImplemented("llSetSoundQueueing");
10363 } 11037 }
10364 11038
10365 public void llCollisionSprite(string impact_sprite) 11039 public void llCollisionSprite(string impact_sprite)
@@ -10371,7 +11045,56 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10371 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 11045 public void llGodLikeRezObject(string inventory, LSL_Vector pos)
10372 { 11046 {
10373 m_host.AddScriptLPS(1); 11047 m_host.AddScriptLPS(1);
10374 NotImplemented("llGodLikeRezObject"); 11048
11049 if (!World.Permissions.IsGod(m_host.OwnerID))
11050 NotImplemented("llGodLikeRezObject");
11051
11052 AssetBase rezAsset = World.AssetService.Get(inventory);
11053 if (rezAsset == null)
11054 {
11055 llSay(0, "Asset not found");
11056 return;
11057 }
11058
11059 SceneObjectGroup group = null;
11060
11061 try
11062 {
11063 string xmlData = Utils.BytesToString(rezAsset.Data);
11064 group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
11065 }
11066 catch
11067 {
11068 llSay(0, "Asset not found");
11069 return;
11070 }
11071
11072 if (group == null)
11073 {
11074 llSay(0, "Asset not found");
11075 return;
11076 }
11077
11078 group.RootPart.AttachPoint = group.RootPart.Shape.State;
11079 group.RootPart.AttachOffset = group.AbsolutePosition;
11080
11081 group.ResetIDs();
11082
11083 Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
11084 World.AddNewSceneObject(group, true, llpos, Quaternion.Identity, Vector3.Zero);
11085 group.CreateScriptInstances(0, true, World.DefaultScriptEngine, 3);
11086 group.ScheduleGroupForFullUpdate();
11087
11088 // objects rezzed with this method are die_at_edge by default.
11089 group.RootPart.SetDieAtEdge(true);
11090
11091 group.ResumeScripts();
11092
11093 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
11094 "object_rez", new Object[] {
11095 new LSL_String(
11096 group.RootPart.UUID.ToString()) },
11097 new DetectParams[0]));
10375 } 11098 }
10376 11099
10377 #endregion 11100 #endregion
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 64931d0..39e1a27 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -129,6 +129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
129 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; 129 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
130 internal float m_ScriptDelayFactor = 1.0f; 130 internal float m_ScriptDelayFactor = 1.0f;
131 internal float m_ScriptDistanceFactor = 1.0f; 131 internal float m_ScriptDistanceFactor = 1.0f;
132 internal bool m_debuggerSafe = false;
132 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); 133 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
133 134
134 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) 135 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
@@ -137,6 +138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
137 m_host = host; 138 m_host = host;
138 m_localID = localID; 139 m_localID = localID;
139 m_itemID = itemID; 140 m_itemID = itemID;
141 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
140 142
141 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) 143 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
142 m_OSFunctionsEnabled = true; 144 m_OSFunctionsEnabled = true;
@@ -195,7 +197,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
195 197
196 internal void OSSLError(string msg) 198 internal void OSSLError(string msg)
197 { 199 {
198 throw new Exception("OSSL Runtime Error: " + msg); 200 if (m_debuggerSafe)
201 {
202 OSSLShoutError(msg);
203 }
204 else
205 {
206 throw new Exception("OSSL Runtime Error: " + msg);
207 }
199 } 208 }
200 209
201 private void InitLSL() 210 private void InitLSL()
@@ -831,18 +840,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
831 if (target != null) 840 if (target != null)
832 { 841 {
833 UUID animID=UUID.Zero; 842 UUID animID=UUID.Zero;
834 lock (m_host.TaskInventory) 843 m_host.TaskInventory.LockItemsForRead(true);
844 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
835 { 845 {
836 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 846 if (inv.Value.Name == animation)
837 { 847 {
838 if (inv.Value.Name == animation) 848 if (inv.Value.Type == (int)AssetType.Animation)
839 { 849 animID = inv.Value.AssetID;
840 if (inv.Value.Type == (int)AssetType.Animation) 850 continue;
841 animID = inv.Value.AssetID;
842 continue;
843 }
844 } 851 }
845 } 852 }
853 m_host.TaskInventory.LockItemsForRead(false);
846 if (animID == UUID.Zero) 854 if (animID == UUID.Zero)
847 target.Animator.AddAnimation(animation, m_host.UUID); 855 target.Animator.AddAnimation(animation, m_host.UUID);
848 else 856 else
@@ -864,18 +872,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
864 if (target != null) 872 if (target != null)
865 { 873 {
866 UUID animID=UUID.Zero; 874 UUID animID=UUID.Zero;
867 lock (m_host.TaskInventory) 875 m_host.TaskInventory.LockItemsForRead(true);
876 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
868 { 877 {
869 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 878 if (inv.Value.Name == animation)
870 { 879 {
871 if (inv.Value.Name == animation) 880 if (inv.Value.Type == (int)AssetType.Animation)
872 { 881 animID = inv.Value.AssetID;
873 if (inv.Value.Type == (int)AssetType.Animation) 882 continue;
874 animID = inv.Value.AssetID;
875 continue;
876 }
877 } 883 }
878 } 884 }
885 m_host.TaskInventory.LockItemsForRead(false);
879 886
880 if (animID == UUID.Zero) 887 if (animID == UUID.Zero)
881 target.Animator.RemoveAnimation(animation); 888 target.Animator.RemoveAnimation(animation);
@@ -1768,6 +1775,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1768 1775
1769 if (!UUID.TryParse(name, out assetID)) 1776 if (!UUID.TryParse(name, out assetID))
1770 { 1777 {
1778 m_host.TaskInventory.LockItemsForRead(true);
1771 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1779 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1772 { 1780 {
1773 if (item.Type == 7 && item.Name == name) 1781 if (item.Type == 7 && item.Name == name)
@@ -1775,6 +1783,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1775 assetID = item.AssetID; 1783 assetID = item.AssetID;
1776 } 1784 }
1777 } 1785 }
1786 m_host.TaskInventory.LockItemsForRead(false);
1778 } 1787 }
1779 1788
1780 if (assetID == UUID.Zero) 1789 if (assetID == UUID.Zero)
@@ -1821,6 +1830,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1821 1830
1822 if (!UUID.TryParse(name, out assetID)) 1831 if (!UUID.TryParse(name, out assetID))
1823 { 1832 {
1833 m_host.TaskInventory.LockItemsForRead(true);
1824 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1834 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1825 { 1835 {
1826 if (item.Type == 7 && item.Name == name) 1836 if (item.Type == 7 && item.Name == name)
@@ -1828,6 +1838,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1828 assetID = item.AssetID; 1838 assetID = item.AssetID;
1829 } 1839 }
1830 } 1840 }
1841 m_host.TaskInventory.LockItemsForRead(false);
1831 } 1842 }
1832 1843
1833 if (assetID == UUID.Zero) 1844 if (assetID == UUID.Zero)
@@ -1878,6 +1889,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1878 1889
1879 if (!UUID.TryParse(name, out assetID)) 1890 if (!UUID.TryParse(name, out assetID))
1880 { 1891 {
1892 m_host.TaskInventory.LockItemsForRead(true);
1881 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1893 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1882 { 1894 {
1883 if (item.Type == 7 && item.Name == name) 1895 if (item.Type == 7 && item.Name == name)
@@ -1885,6 +1897,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1885 assetID = item.AssetID; 1897 assetID = item.AssetID;
1886 } 1898 }
1887 } 1899 }
1900 m_host.TaskInventory.LockItemsForRead(false);
1888 } 1901 }
1889 1902
1890 if (assetID == UUID.Zero) 1903 if (assetID == UUID.Zero)
@@ -2364,9 +2377,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2364 { 2377 {
2365 if (avatar.IsChildAgent == false) 2378 if (avatar.IsChildAgent == false)
2366 { 2379 {
2367 result.Add(avatar.UUID); 2380 result.Add(new LSL_Key(avatar.UUID.ToString()));
2368 result.Add(avatar.AbsolutePosition); 2381 result.Add(new LSL_Vector(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z));
2369 result.Add(avatar.Name); 2382 result.Add(new LSL_String(avatar.Name));
2370 } 2383 }
2371 } 2384 }
2372 }); 2385 });
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 47c7915..3afedc7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
205 // Is the sensor type is AGENT and not SCRIPTED then include agents 205 // Is the sensor type is AGENT and not SCRIPTED then include agents
206 if ((ts.type & (AGENT | AGENT_BY_USERNAME)) != 0 && (ts.type & SCRIPTED) == 0) 206 if ((ts.type & (AGENT | AGENT_BY_USERNAME)) != 0 && (ts.type & SCRIPTED) == 0)
207 { 207 {
208 sensedEntities.AddRange(doAgentSensor(ts)); 208 sensedEntities.AddRange(doAgentSensor(ts));
209 } 209 }
210 210
211 // If SCRIPTED or PASSIVE or ACTIVE check objects 211 // If SCRIPTED or PASSIVE or ACTIVE check objects
@@ -302,7 +302,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
302 float dy; 302 float dy;
303 float dz; 303 float dz;
304 304
305 Quaternion q = SensePoint.RotationOffset; 305// Quaternion q = SensePoint.RotationOffset;
306 Quaternion q = SensePoint.GetWorldRotation(); // non-attached prim Sensor *always* uses World rotation!
306 if (SensePoint.ParentGroup.RootPart.IsAttachment) 307 if (SensePoint.ParentGroup.RootPart.IsAttachment)
307 { 308 {
308 // In attachments, the sensor cone always orients with the 309 // In attachments, the sensor cone always orients with the
@@ -310,6 +311,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
310 // in mouselook. 311 // in mouselook.
311 312
312 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar); 313 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
314 fromRegionPos = avatar.AbsolutePosition;
313 q = avatar.Rotation; 315 q = avatar.Rotation;
314 } 316 }
315 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 317 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
@@ -423,6 +425,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
423 SceneObjectPart SensePoint = ts.host; 425 SceneObjectPart SensePoint = ts.host;
424 Vector3 fromRegionPos = SensePoint.AbsolutePosition; 426 Vector3 fromRegionPos = SensePoint.AbsolutePosition;
425 Quaternion q = SensePoint.RotationOffset; 427 Quaternion q = SensePoint.RotationOffset;
428 if (SensePoint.ParentGroup.RootPart.IsAttachment)
429 {
430 // In attachments, the sensor cone always orients with the
431 // avatar rotation. This may include a nonzero elevation if
432 // in mouselook.
433
434 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
435 fromRegionPos = avatar.AbsolutePosition;
436 q = avatar.Rotation;
437 }
426 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 438 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
427 LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r); 439 LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
428 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir); 440 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index eeb59d9..2fd33fe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -109,25 +109,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
109 if (Timers.Count == 0) 109 if (Timers.Count == 0)
110 return; 110 return;
111 111
112 Dictionary<string, TimerClass>.ValueCollection tvals;
112 lock (TimerListLock) 113 lock (TimerListLock)
113 { 114 {
114 // Go through all timers 115 // Go through all timers
115 Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values; 116 tvals = Timers.Values;
116 foreach (TimerClass ts in tvals) 117 }
118
119 foreach (TimerClass ts in tvals)
120 {
121 // Time has passed?
122 if (ts.next < DateTime.Now.Ticks)
117 { 123 {
118 // Time has passed? 124 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
119 if (ts.next < DateTime.Now.Ticks) 125 // Add it to queue
120 { 126 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
121 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 127 new EventParams("timer", new Object[0],
122 // Add it to queue 128 new DetectParams[0]));
123 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 129 // set next interval
124 new EventParams("timer", new Object[0], 130
125 new DetectParams[0])); 131 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
126 // set next interval 132 ts.next = DateTime.Now.Ticks + ts.interval;
127
128 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
129 ts.next = DateTime.Now.Ticks + ts.interval;
130 }
131 } 133 }
132 } 134 }
133 } 135 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
new file mode 100644
index 0000000..ab215f3
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
@@ -0,0 +1,46 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Collections;
29using OpenSim.Region.ScriptEngine.Interfaces;
30
31using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
32using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
33using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
34using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
35using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
36using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
37using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
38
39namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
40{
41 public interface ICM_Api
42 {
43 string cmDetectedCountry(int num);
44 string cmGetAgentCountry(key key);
45 }
46}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 654ea81..ce13d6b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -121,6 +121,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
121 LSL_Float llGetEnergy(); 121 LSL_Float llGetEnergy();
122 LSL_Vector llGetForce(); 122 LSL_Vector llGetForce();
123 LSL_Integer llGetFreeMemory(); 123 LSL_Integer llGetFreeMemory();
124 LSL_Integer llGetUsedMemory();
124 LSL_Integer llGetFreeURLs(); 125 LSL_Integer llGetFreeURLs();
125 LSL_Vector llGetGeometricCenter(); 126 LSL_Vector llGetGeometricCenter();
126 LSL_Float llGetGMTclock(); 127 LSL_Float llGetGMTclock();
@@ -402,7 +403,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
402 LSL_Vector llWind(LSL_Vector offset); 403 LSL_Vector llWind(LSL_Vector offset);
403 LSL_String llXorBase64Strings(string str1, string str2); 404 LSL_String llXorBase64Strings(string str1, string str2);
404 LSL_String llXorBase64StringsCorrect(string str1, string str2); 405 LSL_String llXorBase64StringsCorrect(string str1, string str2);
405 void print(string str); 406 LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
406 407
407 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 408 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
408 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 409 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 63007c6..c08ad3b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
83 // Avatar Info Commands 83 // Avatar Info Commands
84 string osGetAgentIP(string agent); 84 string osGetAgentIP(string agent);
85 LSL_List osGetAgents(); 85 LSL_List osGetAgents();
86 86
87 // Teleport commands 87 // Teleport commands
88 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 88 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
89 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 89 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 9377cda..5f94ff5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -281,6 +281,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
281 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART 281 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
282 public const int CHANGED_MEDIA = 2048; 282 public const int CHANGED_MEDIA = 2048;
283 public const int CHANGED_ANIMATION = 16384; 283 public const int CHANGED_ANIMATION = 16384;
284 public const int CHANGED_POSITION = 32768;
284 public const int TYPE_INVALID = 0; 285 public const int TYPE_INVALID = 0;
285 public const int TYPE_INTEGER = 1; 286 public const int TYPE_INTEGER = 1;
286 public const int TYPE_FLOAT = 2; 287 public const int TYPE_FLOAT = 2;
@@ -374,6 +375,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
374 public const int PRIM_SCULPT_TYPE_TORUS = 2; 375 public const int PRIM_SCULPT_TYPE_TORUS = 2;
375 public const int PRIM_SCULPT_TYPE_PLANE = 3; 376 public const int PRIM_SCULPT_TYPE_PLANE = 3;
376 public const int PRIM_SCULPT_TYPE_CYLINDER = 4; 377 public const int PRIM_SCULPT_TYPE_CYLINDER = 4;
378 public const int PRIM_SCULPT_FLAG_INVERT = 64;
379 public const int PRIM_SCULPT_FLAG_MIRROR = 128;
377 380
378 public const int MASK_BASE = 0; 381 public const int MASK_BASE = 0;
379 public const int MASK_OWNER = 1; 382 public const int MASK_OWNER = 1;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 303d75e..7d7e54e 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;
@@ -309,6 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
309 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); 310 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
310 } 311 }
311 312
313 [DebuggerNonUserCode]
312 public void llDie() 314 public void llDie()
313 { 315 {
314 m_LSL_Functions.llDie(); 316 m_LSL_Functions.llDie();
@@ -459,6 +461,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
459 return m_LSL_Functions.llGetFreeMemory(); 461 return m_LSL_Functions.llGetFreeMemory();
460 } 462 }
461 463
464 public LSL_Integer llGetUsedMemory()
465 {
466 return m_LSL_Functions.llGetUsedMemory();
467 }
468
462 public LSL_Integer llGetFreeURLs() 469 public LSL_Integer llGetFreeURLs()
463 { 470 {
464 return m_LSL_Functions.llGetFreeURLs(); 471 return m_LSL_Functions.llGetFreeURLs();
@@ -1868,9 +1875,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1868 return m_LSL_Functions.llClearPrimMedia(face); 1875 return m_LSL_Functions.llClearPrimMedia(face);
1869 } 1876 }
1870 1877
1871 public void print(string str) 1878 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
1872 { 1879 {
1873 m_LSL_Functions.print(str); 1880 return m_LSL_Functions.llGetLinkNumberOfSides(link);
1874 } 1881 }
1875 } 1882 }
1876} 1883}
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 3575889..e9edf6c 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 783791f..9548253 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;
@@ -55,7 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
55{ 56{
56 public class ScriptInstance : MarshalByRefObject, IScriptInstance 57 public class ScriptInstance : MarshalByRefObject, IScriptInstance
57 { 58 {
58 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
59 60
60 private IScriptEngine m_Engine; 61 private IScriptEngine m_Engine;
61 private IScriptWorkItem m_CurrentResult = null; 62 private IScriptWorkItem m_CurrentResult = null;
@@ -238,13 +239,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
238 239
239 if (part != null) 240 if (part != null)
240 { 241 {
241 lock (part.TaskInventory) 242 part.TaskInventory.LockItemsForRead(true);
243 if (part.TaskInventory.ContainsKey(m_ItemID))
242 { 244 {
243 if (part.TaskInventory.ContainsKey(m_ItemID)) 245 m_thisScriptTask = part.TaskInventory[m_ItemID];
244 {
245 m_thisScriptTask = part.TaskInventory[m_ItemID];
246 }
247 } 246 }
247 part.TaskInventory.LockItemsForRead(false);
248 } 248 }
249 249
250 ApiManager am = new ApiManager(); 250 ApiManager am = new ApiManager();
@@ -271,9 +271,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
271 //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); 271 //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
272// lease.Register(this); 272// lease.Register(this);
273 } 273 }
274 catch (Exception) 274 catch (Exception e)
275 { 275 {
276 // m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); 276 m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly);
277 throw;
277 } 278 }
278 279
279 try 280 try
@@ -434,14 +435,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
434 { 435 {
435 int permsMask; 436 int permsMask;
436 UUID permsGranter; 437 UUID permsGranter;
437 lock (part.TaskInventory) 438 part.TaskInventory.LockItemsForRead(true);
439 if (!part.TaskInventory.ContainsKey(m_ItemID))
438 { 440 {
439 if (!part.TaskInventory.ContainsKey(m_ItemID)) 441 part.TaskInventory.LockItemsForRead(false);
440 return; 442 return;
441
442 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
443 permsMask = part.TaskInventory[m_ItemID].PermsMask;
444 } 443 }
444 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
445 permsMask = part.TaskInventory[m_ItemID].PermsMask;
446 part.TaskInventory.LockItemsForRead(false);
445 447
446 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) 448 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
447 { 449 {
@@ -550,6 +552,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
550 return true; 552 return true;
551 } 553 }
552 554
555 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
553 public void SetState(string state) 556 public void SetState(string state)
554 { 557 {
555 if (state == State) 558 if (state == State)
@@ -561,7 +564,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
561 new DetectParams[0])); 564 new DetectParams[0]));
562 PostEvent(new EventParams("state_entry", new Object[0], 565 PostEvent(new EventParams("state_entry", new Object[0],
563 new DetectParams[0])); 566 new DetectParams[0]));
564 567
565 throw new EventAbortException(); 568 throw new EventAbortException();
566 } 569 }
567 570
@@ -644,14 +647,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
644 /// <returns></returns> 647 /// <returns></returns>
645 public object EventProcessor() 648 public object EventProcessor()
646 { 649 {
647 if (m_Suspended) 650 EventParams data = null;
648 return 0;
649 651
650 lock (m_Script) 652 lock (m_EventQueue)
651 { 653 {
652 EventParams data = null; 654 if (m_Suspended)
655 return 0;
653 656
654 lock (m_EventQueue) 657 lock (m_Script)
655 { 658 {
656 data = (EventParams) m_EventQueue.Dequeue(); 659 data = (EventParams) m_EventQueue.Dequeue();
657 if (data == null) // Shouldn't happen 660 if (data == null) // Shouldn't happen
@@ -677,6 +680,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
677 if (data.EventName == "collision") 680 if (data.EventName == "collision")
678 m_CollisionInQueue = false; 681 m_CollisionInQueue = false;
679 } 682 }
683 }
684 lock(m_Script)
685 {
680 686
681 //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this); 687 //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this);
682 688
@@ -833,6 +839,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
833 new Object[0], new DetectParams[0])); 839 new Object[0], new DetectParams[0]));
834 } 840 }
835 841
842 [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
836 public void ApiResetScript() 843 public void ApiResetScript()
837 { 844 {
838 // bool running = Running; 845 // bool running = Running;
@@ -864,10 +871,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
864 871
865 public Dictionary<string, object> GetVars() 872 public Dictionary<string, object> GetVars()
866 { 873 {
867 if (m_Script != null) 874 return m_Script.GetVars();
868 return m_Script.GetVars();
869 else
870 return new Dictionary<string, object>();
871 } 875 }
872 876
873 public void SetVars(Dictionary<string, object> vars) 877 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 461b473..6bfee91 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -83,19 +83,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
83 83
84 public override string ToString() 84 public override string ToString()
85 { 85 {
86 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", x, y, z); 86 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", x, y, z);
87 return s; 87 return s;
88 } 88 }
89 89
90 public static explicit operator LSLString(Vector3 vec) 90 public static explicit operator LSLString(Vector3 vec)
91 { 91 {
92 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 92 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
93 return new LSLString(s); 93 return new LSLString(s);
94 } 94 }
95 95
96 public static explicit operator string(Vector3 vec) 96 public static explicit operator string(Vector3 vec)
97 { 97 {
98 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 98 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
99 return s; 99 return s;
100 } 100 }
101 101
@@ -342,19 +342,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
342 342
343 public override string ToString() 343 public override string ToString()
344 { 344 {
345 string st=String.Format(Culture.FormatProvider, "<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", x, y, z, s); 345 string st=String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", x, y, z, s);
346 return st; 346 return st;
347 } 347 }
348 348
349 public static explicit operator string(Quaternion r) 349 public static explicit operator string(Quaternion r)
350 { 350 {
351 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 351 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
352 return s; 352 return s;
353 } 353 }
354 354
355 public static explicit operator LSLString(Quaternion r) 355 public static explicit operator LSLString(Quaternion r)
356 { 356 {
357 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 357 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
358 return new LSLString(s); 358 return new LSLString(s);
359 } 359 }
360 360
@@ -459,6 +459,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
459 size += 64; 459 size += 64;
460 else if (o is int) 460 else if (o is int)
461 size += 4; 461 size += 4;
462 else if (o is uint)
463 size += 4;
462 else if (o is string) 464 else if (o is string)
463 size += ((string)o).Length; 465 size += ((string)o).Length;
464 else if (o is float) 466 else if (o is float)
@@ -613,24 +615,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
613 615
614 public static bool operator ==(list a, list b) 616 public static bool operator ==(list a, list b)
615 { 617 {
616 int la = -1; 618 int la = a.Length;
617 int lb = -1; 619 int lb = b.Length;
618 try { la = a.Length; }
619 catch (NullReferenceException) { }
620 try { lb = b.Length; }
621 catch (NullReferenceException) { }
622 620
623 return la == lb; 621 return la == lb;
624 } 622 }
625 623
626 public static bool operator !=(list a, list b) 624 public static bool operator !=(list a, list b)
627 { 625 {
628 int la = -1; 626 int la = a.Length;
629 int lb = -1; 627 int lb = b.Length;
630 try { la = a.Length; }
631 catch (NullReferenceException) { }
632 try {lb = b.Length;}
633 catch (NullReferenceException) { }
634 628
635 return la != lb; 629 return la != lb;
636 } 630 }
@@ -1064,7 +1058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1064 { 1058 {
1065 list ret = new list(); 1059 list ret = new list();
1066 double entry; 1060 double entry;
1067 for (int i = 0; i < src.Data.Length - 1; i++) 1061 for (int i = 0; i < src.Data.Length; i++)
1068 { 1062 {
1069 if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry)) 1063 if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry))
1070 { 1064 {
generated by cgit v1.1 at 2024-12-21 08:38:51 +0000