aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
Diffstat (limited to '')
-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.cs2366
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs46
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs7
-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.cs4
-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.cs16
-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.cs92
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs32
18 files changed, 1995 insertions, 893 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 6d067b0..fcb1278 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)
@@ -275,40 +344,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
275 protected UUID InventorySelf() 344 protected UUID InventorySelf()
276 { 345 {
277 UUID invItemID = new UUID(); 346 UUID invItemID = new UUID();
278 347 bool unlock = false;
279 lock (m_host.TaskInventory) 348 if (!m_host.TaskInventory.IsReadLockedByMe())
349 {
350 m_host.TaskInventory.LockItemsForRead(true);
351 unlock = true;
352 }
353 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
280 { 354 {
281 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 355 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
282 { 356 {
283 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) 357 invItemID = inv.Key;
284 { 358 break;
285 invItemID = inv.Key;
286 break;
287 }
288 } 359 }
289 } 360 }
290 361 if (unlock)
362 {
363 m_host.TaskInventory.LockItemsForRead(false);
364 }
291 return invItemID; 365 return invItemID;
292 } 366 }
293 367
294 protected UUID InventoryKey(string name, int type) 368 protected UUID InventoryKey(string name, int type)
295 { 369 {
296 m_host.AddScriptLPS(1); 370 m_host.AddScriptLPS(1);
297 371 m_host.TaskInventory.LockItemsForRead(true);
298 lock (m_host.TaskInventory) 372
373 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
299 { 374 {
300 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 375 if (inv.Value.Name == name)
301 { 376 {
302 if (inv.Value.Name == name) 377 m_host.TaskInventory.LockItemsForRead(false);
378
379 if (inv.Value.Type != type)
303 { 380 {
304 if (inv.Value.Type != type) 381 return UUID.Zero;
305 return UUID.Zero;
306
307 return inv.Value.AssetID;
308 } 382 }
383
384 return inv.Value.AssetID;
309 } 385 }
310 } 386 }
311 387
388 m_host.TaskInventory.LockItemsForRead(false);
312 return UUID.Zero; 389 return UUID.Zero;
313 } 390 }
314 391
@@ -316,17 +393,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
316 { 393 {
317 m_host.AddScriptLPS(1); 394 m_host.AddScriptLPS(1);
318 395
319 lock (m_host.TaskInventory) 396
397 m_host.TaskInventory.LockItemsForRead(true);
398
399 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
320 { 400 {
321 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 401 if (inv.Value.Name == name)
322 { 402 {
323 if (inv.Value.Name == name) 403 m_host.TaskInventory.LockItemsForRead(false);
324 { 404 return inv.Value.AssetID;
325 return inv.Value.AssetID;
326 }
327 } 405 }
328 } 406 }
329 407
408 m_host.TaskInventory.LockItemsForRead(false);
409
410
330 return UUID.Zero; 411 return UUID.Zero;
331 } 412 }
332 413
@@ -468,26 +549,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
468 549
469 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke 550 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
470 551
471 // Old implementation of llRot2Euler. Normalization not required as Atan2 function will 552 // Utility function for llRot2Euler
472 // only return values >= -PI (-180 degrees) and <= PI (180 degrees). 553
554 // normalize an angle between -PI and PI (-180 to +180 degrees)
555 protected double NormalizeAngle(double angle)
556 {
557 if (angle > -Math.PI && angle < Math.PI)
558 return angle;
559
560 int numPis = (int)(Math.PI / angle);
561 double remainder = angle - Math.PI * numPis;
562 if (numPis % 2 == 1)
563 return Math.PI - angle;
564 return remainder;
565 }
473 566
474 public LSL_Vector llRot2Euler(LSL_Rotation r) 567 public LSL_Vector llRot2Euler(LSL_Rotation q1)
475 { 568 {
476 m_host.AddScriptLPS(1); 569 m_host.AddScriptLPS(1);
477 //This implementation is from http://lslwiki.net/lslwiki/wakka.php?wakka=LibraryRotationFunctions. ckrinke 570 LSL_Vector eul = new LSL_Vector();
478 LSL_Rotation t = new LSL_Rotation(r.x * r.x, r.y * r.y, r.z * r.z, r.s * r.s); 571
479 double m = (t.x + t.y + t.z + t.s); 572 double sqw = q1.s*q1.s;
480 if (m == 0) return new LSL_Vector(); 573 double sqx = q1.x*q1.x;
481 double n = 2 * (r.y * r.s + r.x * r.z); 574 double sqy = q1.z*q1.z;
482 double p = m * m - n * n; 575 double sqz = q1.y*q1.y;
483 if (p > 0) 576 double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
484 return new LSL_Vector(Math.Atan2(2.0 * (r.x * r.s - r.y * r.z), (-t.x - t.y + t.z + t.s)), 577 double test = q1.x*q1.z + q1.y*q1.s;
485 Math.Atan2(n, Math.Sqrt(p)), 578 if (test > 0.4999*unit) { // singularity at north pole
486 Math.Atan2(2.0 * (r.z * r.s - r.x * r.y), (t.x - t.y - t.z + t.s))); 579 eul.z = 2 * Math.Atan2(q1.x,q1.s);
487 else if (n > 0) 580 eul.y = Math.PI/2;
488 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)); 581 eul.x = 0;
489 else 582 return eul;
490 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)); 583 }
584 if (test < -0.4999*unit) { // singularity at south pole
585 eul.z = -2 * Math.Atan2(q1.x,q1.s);
586 eul.y = -Math.PI/2;
587 eul.x = 0;
588 return eul;
589 }
590 eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw);
591 eul.y = Math.Asin(2*test/unit);
592 eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw);
593 return eul;
491 } 594 }
492 595
493 /* From wiki: 596 /* From wiki:
@@ -689,77 +792,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
689 { 792 {
690 //A and B should both be normalized 793 //A and B should both be normalized
691 m_host.AddScriptLPS(1); 794 m_host.AddScriptLPS(1);
692 LSL_Rotation rotBetween; 795 /* This method is more accurate than the SL one, and thus causes problems
693 // Check for zero vectors. If either is zero, return zero rotation. Otherwise, 796 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
694 // continue calculation. 797
695 if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f)) 798 double dotProduct = LSL_Vector.Dot(a, b);
799 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
800 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
801 double angle = Math.Acos(dotProduct / magProduct);
802 LSL_Vector axis = LSL_Vector.Norm(crossProduct);
803 double s = Math.Sin(angle / 2);
804
805 double x = axis.x * s;
806 double y = axis.y * s;
807 double z = axis.z * s;
808 double w = Math.Cos(angle / 2);
809
810 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
811 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
812
813 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
814 */
815
816 // This method mimics the 180 errors found in SL
817 // See www.euclideanspace.com... angleBetween
818 LSL_Vector vec_a = a;
819 LSL_Vector vec_b = b;
820
821 // Eliminate zero length
822 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
823 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
824 if (vec_a_mag < 0.00001 ||
825 vec_b_mag < 0.00001)
696 { 826 {
697 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 827 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
698 } 828 }
699 else 829
830 // Normalize
831 vec_a = llVecNorm(vec_a);
832 vec_b = llVecNorm(vec_b);
833
834 // Calculate axis and rotation angle
835 LSL_Vector axis = vec_a % vec_b;
836 LSL_Float cos_theta = vec_a * vec_b;
837
838 // Check if parallel
839 if (cos_theta > 0.99999)
700 { 840 {
701 a = LSL_Vector.Norm(a); 841 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
702 b = LSL_Vector.Norm(b); 842 }
703 double dotProduct = LSL_Vector.Dot(a, b); 843
704 // There are two degenerate cases possible. These are for vectors 180 or 844 // Check if anti-parallel
705 // 0 degrees apart. These have to be detected and handled individually. 845 else if (cos_theta < -0.99999)
706 // 846 {
707 // Check for vectors 180 degrees apart. 847 LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
708 // A dot product of -1 would mean the angle between vectors is 180 degrees. 848 if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
709 if (dotProduct < -0.9999999f) 849 return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
710 { 850 }
711 // First assume X axis is orthogonal to the vectors. 851 else // other rotation
712 LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f); 852 {
713 orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a)); 853 LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
714 // Check for near zero vector. A very small non-zero number here will create 854 axis = llVecNorm(axis);
715 // a rotation in an undesired direction. 855 double x, y, z, s, t;
716 if (LSL_Vector.Mag(orthoVector) > 0.0001) 856 s = Math.Cos(theta);
717 { 857 t = Math.Sin(theta);
718 rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f); 858 x = axis.x * t;
719 } 859 y = axis.y * t;
720 // If the magnitude of the vector was near zero, then assume the X axis is not 860 z = axis.z * t;
721 // orthogonal and use the Z axis instead. 861 return new LSL_Rotation(x,y,z,s);
722 else
723 {
724 // Set 180 z rotation.
725 rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f);
726 }
727 }
728 // Check for parallel vectors.
729 // A dot product of 1 would mean the angle between vectors is 0 degrees.
730 else if (dotProduct > 0.9999999f)
731 {
732 // Set zero rotation.
733 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
734 }
735 else
736 {
737 // All special checks have been performed so get the axis of rotation.
738 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
739 // Quarternion s value is the length of the unit vector + dot product.
740 double qs = 1.0 + dotProduct;
741 rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs);
742 // Normalize the rotation.
743 double mag = LSL_Rotation.Mag(rotBetween);
744 // We shouldn't have to worry about a divide by zero here. The qs value will be
745 // non-zero because we already know if we're here, then the dotProduct is not -1 so
746 // qs will not be zero. Also, we've already handled the input vectors being zero so the
747 // crossProduct vector should also not be zero.
748 rotBetween.x = rotBetween.x / mag;
749 rotBetween.y = rotBetween.y / mag;
750 rotBetween.z = rotBetween.z / mag;
751 rotBetween.s = rotBetween.s / mag;
752 // Check for undefined values and set zero rotation if any found. This code might not actually be required
753 // any longer since zero vectors are checked for at the top.
754 if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s))
755 {
756 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
757 }
758 }
759 } 862 }
760 return rotBetween;
761 } 863 }
762 864
763 public void llWhisper(int channelID, string text) 865 public void llWhisper(int channelID, string text)
764 { 866 {
765 m_host.AddScriptLPS(1); 867 m_host.AddScriptLPS(1);
@@ -779,6 +881,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
779 { 881 {
780 m_host.AddScriptLPS(1); 882 m_host.AddScriptLPS(1);
781 883
884 if (channelID == 0)
885 m_SayShoutCount++;
886
887 if (m_SayShoutCount >= 11)
888 ScriptSleep(2000);
889
782 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel)) 890 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel))
783 { 891 {
784 Console.WriteLine(text); 892 Console.WriteLine(text);
@@ -801,6 +909,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
801 { 909 {
802 m_host.AddScriptLPS(1); 910 m_host.AddScriptLPS(1);
803 911
912 if (channelID == 0)
913 m_SayShoutCount++;
914
915 if (m_SayShoutCount >= 11)
916 ScriptSleep(2000);
917
804 if (text.Length > 1023) 918 if (text.Length > 1023)
805 text = text.Substring(0, 1023); 919 text = text.Substring(0, 1023);
806 920
@@ -1101,10 +1215,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1101 return detectedParams.TouchUV; 1215 return detectedParams.TouchUV;
1102 } 1216 }
1103 1217
1218 [DebuggerNonUserCode]
1104 public virtual void llDie() 1219 public virtual void llDie()
1105 { 1220 {
1106 m_host.AddScriptLPS(1); 1221 m_host.AddScriptLPS(1);
1107 throw new SelfDeleteException(); 1222 if (!m_host.ParentGroup.IsAttachment) throw new SelfDeleteException();
1108 } 1223 }
1109 1224
1110 public LSL_Float llGround(LSL_Vector offset) 1225 public LSL_Float llGround(LSL_Vector offset)
@@ -1177,6 +1292,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1177 1292
1178 public void llSetStatus(int status, int value) 1293 public void llSetStatus(int status, int value)
1179 { 1294 {
1295 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
1296 return;
1180 m_host.AddScriptLPS(1); 1297 m_host.AddScriptLPS(1);
1181 1298
1182 int statusrotationaxis = 0; 1299 int statusrotationaxis = 0;
@@ -1406,6 +1523,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1406 { 1523 {
1407 m_host.AddScriptLPS(1); 1524 m_host.AddScriptLPS(1);
1408 1525
1526 SetColor(m_host, color, face);
1527 }
1528
1529 protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
1530 {
1531 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1532 return;
1533
1534 Primitive.TextureEntry tex = part.Shape.Textures;
1535 Color4 texcolor;
1536 if (face >= 0 && face < GetNumberOfSides(part))
1537 {
1538 texcolor = tex.CreateFace((uint)face).RGBA;
1539 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1540 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1541 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1542 tex.FaceTextures[face].RGBA = texcolor;
1543 part.UpdateTextureEntry(tex.GetBytes());
1544 return;
1545 }
1546 else if (face == ScriptBaseClass.ALL_SIDES)
1547 {
1548 for (uint i = 0; i < GetNumberOfSides(part); i++)
1549 {
1550 if (tex.FaceTextures[i] != null)
1551 {
1552 texcolor = tex.FaceTextures[i].RGBA;
1553 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1554 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1555 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1556 tex.FaceTextures[i].RGBA = texcolor;
1557 }
1558 texcolor = tex.DefaultTexture.RGBA;
1559 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1560 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1561 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1562 tex.DefaultTexture.RGBA = texcolor;
1563 }
1564 part.UpdateTextureEntry(tex.GetBytes());
1565 return;
1566 }
1567
1409 if (face == ScriptBaseClass.ALL_SIDES) 1568 if (face == ScriptBaseClass.ALL_SIDES)
1410 face = SceneObjectPart.ALL_SIDES; 1569 face = SceneObjectPart.ALL_SIDES;
1411 1570
@@ -1414,6 +1573,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1414 1573
1415 public void SetTexGen(SceneObjectPart part, int face,int style) 1574 public void SetTexGen(SceneObjectPart part, int face,int style)
1416 { 1575 {
1576 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1577 return;
1578
1417 Primitive.TextureEntry tex = part.Shape.Textures; 1579 Primitive.TextureEntry tex = part.Shape.Textures;
1418 MappingType textype; 1580 MappingType textype;
1419 textype = MappingType.Default; 1581 textype = MappingType.Default;
@@ -1444,6 +1606,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1444 1606
1445 public void SetGlow(SceneObjectPart part, int face, float glow) 1607 public void SetGlow(SceneObjectPart part, int face, float glow)
1446 { 1608 {
1609 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1610 return;
1611
1447 Primitive.TextureEntry tex = part.Shape.Textures; 1612 Primitive.TextureEntry tex = part.Shape.Textures;
1448 if (face >= 0 && face < GetNumberOfSides(part)) 1613 if (face >= 0 && face < GetNumberOfSides(part))
1449 { 1614 {
@@ -1469,6 +1634,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1469 1634
1470 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1635 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1471 { 1636 {
1637 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1638 return;
1472 1639
1473 Shininess sval = new Shininess(); 1640 Shininess sval = new Shininess();
1474 1641
@@ -1519,6 +1686,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1519 1686
1520 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1687 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1521 { 1688 {
1689 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1690 return;
1691
1522 Primitive.TextureEntry tex = part.Shape.Textures; 1692 Primitive.TextureEntry tex = part.Shape.Textures;
1523 if (face >= 0 && face < GetNumberOfSides(part)) 1693 if (face >= 0 && face < GetNumberOfSides(part))
1524 { 1694 {
@@ -1579,13 +1749,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1579 m_host.AddScriptLPS(1); 1749 m_host.AddScriptLPS(1);
1580 1750
1581 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1751 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1582 1752 if (parts.Count > 0)
1583 foreach (SceneObjectPart part in parts) 1753 {
1584 SetAlpha(part, alpha, face); 1754 try
1755 {
1756 parts[0].ParentGroup.areUpdatesSuspended = true;
1757 foreach (SceneObjectPart part in parts)
1758 SetAlpha(part, alpha, face);
1759 }
1760 finally
1761 {
1762 parts[0].ParentGroup.areUpdatesSuspended = false;
1763 }
1764 }
1585 } 1765 }
1586 1766
1587 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1767 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1588 { 1768 {
1769 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1770 return;
1771
1589 Primitive.TextureEntry tex = part.Shape.Textures; 1772 Primitive.TextureEntry tex = part.Shape.Textures;
1590 Color4 texcolor; 1773 Color4 texcolor;
1591 if (face >= 0 && face < GetNumberOfSides(part)) 1774 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1638,7 +1821,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1638 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1821 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1639 float wind, float tension, LSL_Vector Force) 1822 float wind, float tension, LSL_Vector Force)
1640 { 1823 {
1641 if (part == null) 1824 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1642 return; 1825 return;
1643 1826
1644 if (flexi) 1827 if (flexi)
@@ -1672,7 +1855,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1672 /// <param name="falloff"></param> 1855 /// <param name="falloff"></param>
1673 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 1856 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1674 { 1857 {
1675 if (part == null) 1858 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1676 return; 1859 return;
1677 1860
1678 if (light) 1861 if (light)
@@ -1749,15 +1932,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1749 m_host.AddScriptLPS(1); 1932 m_host.AddScriptLPS(1);
1750 1933
1751 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1934 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1752 1935 if (parts.Count > 0)
1753 foreach (SceneObjectPart part in parts) 1936 {
1754 SetTexture(part, texture, face); 1937 try
1755 1938 {
1939 parts[0].ParentGroup.areUpdatesSuspended = true;
1940 foreach (SceneObjectPart part in parts)
1941 SetTexture(part, texture, face);
1942 }
1943 finally
1944 {
1945 parts[0].ParentGroup.areUpdatesSuspended = false;
1946 }
1947 }
1756 ScriptSleep(200); 1948 ScriptSleep(200);
1757 } 1949 }
1758 1950
1759 protected void SetTexture(SceneObjectPart part, string texture, int face) 1951 protected void SetTexture(SceneObjectPart part, string texture, int face)
1760 { 1952 {
1953 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1954 return;
1955
1761 UUID textureID = new UUID(); 1956 UUID textureID = new UUID();
1762 1957
1763 textureID = InventoryKey(texture, (int)AssetType.Texture); 1958 textureID = InventoryKey(texture, (int)AssetType.Texture);
@@ -1802,6 +1997,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1802 1997
1803 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 1998 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1804 { 1999 {
2000 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2001 return;
2002
1805 Primitive.TextureEntry tex = part.Shape.Textures; 2003 Primitive.TextureEntry tex = part.Shape.Textures;
1806 if (face >= 0 && face < GetNumberOfSides(part)) 2004 if (face >= 0 && face < GetNumberOfSides(part))
1807 { 2005 {
@@ -1838,6 +2036,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1838 2036
1839 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 2037 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1840 { 2038 {
2039 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2040 return;
2041
1841 Primitive.TextureEntry tex = part.Shape.Textures; 2042 Primitive.TextureEntry tex = part.Shape.Textures;
1842 if (face >= 0 && face < GetNumberOfSides(part)) 2043 if (face >= 0 && face < GetNumberOfSides(part))
1843 { 2044 {
@@ -1874,6 +2075,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1874 2075
1875 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 2076 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
1876 { 2077 {
2078 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2079 return;
2080
1877 Primitive.TextureEntry tex = part.Shape.Textures; 2081 Primitive.TextureEntry tex = part.Shape.Textures;
1878 if (face >= 0 && face < GetNumberOfSides(part)) 2082 if (face >= 0 && face < GetNumberOfSides(part))
1879 { 2083 {
@@ -1980,24 +2184,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1980 2184
1981 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos) 2185 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos)
1982 { 2186 {
1983 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2187 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1984 LSL_Vector currentPos = GetPartLocalPos(part); 2188 return;
1985 2189
1986 float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y); 2190 LSL_Vector currentPos = GetPartLocalPos(part);
1987 bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true); 2191 LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos);
1988 2192
1989 if (part.ParentGroup.RootPart == part) 2193 if (part.ParentGroup.RootPart == part)
1990 { 2194 {
1991 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
1992 targetPos.z = ground;
1993 SceneObjectGroup parent = part.ParentGroup; 2195 SceneObjectGroup parent = part.ParentGroup;
1994 LSL_Vector real_vec = SetPosAdjust(currentPos, targetPos); 2196 parent.UpdateGroupPosition(new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z));
1995 parent.UpdateGroupPosition(new Vector3((float)real_vec.x, (float)real_vec.y, (float)real_vec.z));
1996 } 2197 }
1997 else 2198 else
1998 { 2199 {
1999 LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos); 2200 part.OffsetPosition = new Vector3((float)toPos.x, (float)toPos.y, (float)toPos.z);
2000 part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z);
2001 SceneObjectGroup parent = part.ParentGroup; 2201 SceneObjectGroup parent = part.ParentGroup;
2002 parent.HasGroupChanged = true; 2202 parent.HasGroupChanged = true;
2003 parent.ScheduleGroupForTerseUpdate(); 2203 parent.ScheduleGroupForTerseUpdate();
@@ -2048,9 +2248,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2048 m_host.AddScriptLPS(1); 2248 m_host.AddScriptLPS(1);
2049 2249
2050 // try to let this work as in SL... 2250 // try to let this work as in SL...
2051 if (m_host.ParentID == 0) 2251 if (m_host.LinkNum < 2)
2052 { 2252 {
2053 // special case: If we are root, rotate complete SOG to new rotation 2253 // Special case: If we are root, rotate complete SOG to new
2254 // rotation.
2255 // We are root if the link number is 0 (single prim) or 1
2256 // (root prim). ParentID may be nonzero in attachments and
2257 // using it would cause attachments and HUDs to rotate
2258 // to the wrong positions.
2054 SetRot(m_host, Rot2Quaternion(rot)); 2259 SetRot(m_host, Rot2Quaternion(rot));
2055 } 2260 }
2056 else 2261 else
@@ -2075,6 +2280,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2075 2280
2076 protected void SetRot(SceneObjectPart part, Quaternion rot) 2281 protected void SetRot(SceneObjectPart part, Quaternion rot)
2077 { 2282 {
2283 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2284 return;
2285
2078 part.UpdateRotation(rot); 2286 part.UpdateRotation(rot);
2079 // Update rotation does not move the object in the physics scene if it's a linkset. 2287 // Update rotation does not move the object in the physics scene if it's a linkset.
2080 2288
@@ -2698,12 +2906,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2698 2906
2699 m_host.AddScriptLPS(1); 2907 m_host.AddScriptLPS(1);
2700 2908
2909 m_host.TaskInventory.LockItemsForRead(true);
2701 TaskInventoryItem item = m_host.TaskInventory[invItemID]; 2910 TaskInventoryItem item = m_host.TaskInventory[invItemID];
2702 2911 m_host.TaskInventory.LockItemsForRead(false);
2703 lock (m_host.TaskInventory)
2704 {
2705 item = m_host.TaskInventory[invItemID];
2706 }
2707 2912
2708 if (item.PermsGranter == UUID.Zero) 2913 if (item.PermsGranter == UUID.Zero)
2709 return 0; 2914 return 0;
@@ -2778,6 +2983,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2778 if (dist > m_ScriptDistanceFactor * 10.0f) 2983 if (dist > m_ScriptDistanceFactor * 10.0f)
2779 return; 2984 return;
2780 2985
2986 //Clone is thread-safe
2781 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 2987 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
2782 2988
2783 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory) 2989 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
@@ -2838,6 +3044,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2838 3044
2839 public void llLookAt(LSL_Vector target, double strength, double damping) 3045 public void llLookAt(LSL_Vector target, double strength, double damping)
2840 { 3046 {
3047 /*
2841 m_host.AddScriptLPS(1); 3048 m_host.AddScriptLPS(1);
2842 // Determine where we are looking from 3049 // Determine where we are looking from
2843 LSL_Vector from = llGetPos(); 3050 LSL_Vector from = llGetPos();
@@ -2857,10 +3064,54 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2857 // the angles of rotation in radians into rotation value 3064 // the angles of rotation in radians into rotation value
2858 3065
2859 LSL_Types.Quaternion rot = llEuler2Rot(angle); 3066 LSL_Types.Quaternion rot = llEuler2Rot(angle);
2860 Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); 3067
2861 m_host.startLookAt(rotation, (float)damping, (float)strength); 3068 // This would only work if your physics system contains an APID controller:
3069 // Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s);
3070 // m_host.startLookAt(rotation, (float)damping, (float)strength);
3071
2862 // Orient the object to the angle calculated 3072 // Orient the object to the angle calculated
2863 //llSetRot(rot); 3073 llSetRot(rot);
3074 */
3075
3076 //The above code, while nice, doesn't replicate the behaviour of SL and tends to "roll" the object.
3077 //There's probably a smarter way of doing this, my rotation math-fu is weak.
3078 // http://bugs.meta7.com/view.php?id=28
3079 // - Tom
3080
3081 /* And the following does not do the job either. It has to be performed inside the ODE glue-code. -.- .._.
3082 LSL_Rotation newrot = llGetRot() * llRotBetween(new LSL_Vector(1.0d, 0.0d, 0.0d) * llGetRot(), new LSL_Vector(0.0d, 0.0d, -1.0d));
3083 llSetRot(newrot * llRotBetween(new LSL_Vector(0.0d,0.0d,1.0d) * newrot, target - llGetPos()));
3084 */
3085 if (m_host.PhysActor != null && !m_host.PhysActor.IsPhysical)
3086 {
3087 // Part is non-phys, convert this to a llSetRot()
3088 Vector3 tgt = new Vector3((float)target.x, (float)target.y, (float)target.z);
3089 Vector3 dir = tgt - m_host.GroupPosition;
3090 dir.Normalize();
3091 float tzrot = (float)Math.Atan2(dir.Y, dir.X);
3092 float txy = (float)Math.Sqrt((dir.X * dir.X) + (dir.Y * dir.Y));
3093 float terot = (float)Math.Atan2(-dir.Z, txy);
3094 LSL_Vector az = new LSL_Vector(0.0f, 0.0f, tzrot);
3095 LSL_Vector ae = new LSL_Vector(0.0f, terot, 0.0f);
3096 LSL_Types.Quaternion spin = llEuler2Rot(az);
3097 LSL_Types.Quaternion rot = llEuler2Rot(ae) * spin;
3098 llSetRot(rot);
3099 }
3100 else
3101 {
3102 // Physical, send the target vector to RotLookAt method inside a 'rotation', the .w -99.9 value indicates it is really a LookAt.
3103 Quaternion q = new Quaternion((float)target.x, (float)target.y, (float)target.z, -99.9f);
3104 m_host.RotLookAt(q, (float)strength, (float)damping);
3105 }
3106
3107 }
3108
3109 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3110 {
3111 m_host.AddScriptLPS(1);
3112// NotImplemented("llRotLookAt");
3113 m_host.RotLookAt(Rot2Quaternion(target), (float)strength, (float)damping);
3114
2864 } 3115 }
2865 3116
2866 public void llStopLookAt() 3117 public void llStopLookAt()
@@ -2909,13 +3160,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2909 { 3160 {
2910 TaskInventoryItem item; 3161 TaskInventoryItem item;
2911 3162
2912 lock (m_host.TaskInventory) 3163 m_host.TaskInventory.LockItemsForRead(true);
3164 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2913 { 3165 {
2914 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3166 m_host.TaskInventory.LockItemsForRead(false);
2915 return; 3167 return;
2916 else 3168 }
2917 item = m_host.TaskInventory[InventorySelf()]; 3169 else
3170 {
3171 item = m_host.TaskInventory[InventorySelf()];
2918 } 3172 }
3173 m_host.TaskInventory.LockItemsForRead(false);
2919 3174
2920 if (item.PermsGranter != UUID.Zero) 3175 if (item.PermsGranter != UUID.Zero)
2921 { 3176 {
@@ -2937,13 +3192,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2937 { 3192 {
2938 TaskInventoryItem item; 3193 TaskInventoryItem item;
2939 3194
3195 m_host.TaskInventory.LockItemsForRead(true);
2940 lock (m_host.TaskInventory) 3196 lock (m_host.TaskInventory)
2941 { 3197 {
3198
2942 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3199 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3200 {
3201 m_host.TaskInventory.LockItemsForRead(false);
2943 return; 3202 return;
3203 }
2944 else 3204 else
3205 {
2945 item = m_host.TaskInventory[InventorySelf()]; 3206 item = m_host.TaskInventory[InventorySelf()];
3207 }
2946 } 3208 }
3209 m_host.TaskInventory.LockItemsForRead(false);
2947 3210
2948 m_host.AddScriptLPS(1); 3211 m_host.AddScriptLPS(1);
2949 3212
@@ -2975,19 +3238,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2975 { 3238 {
2976 m_host.AddScriptLPS(1); 3239 m_host.AddScriptLPS(1);
2977 3240
2978// if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
2979// return;
2980
2981 TaskInventoryItem item; 3241 TaskInventoryItem item;
2982 3242
2983 lock (m_host.TaskInventory) 3243 m_host.TaskInventory.LockItemsForRead(true);
3244
3245 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2984 { 3246 {
2985 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3247 m_host.TaskInventory.LockItemsForRead(false);
2986 return; 3248 return;
2987 else 3249 }
2988 item = m_host.TaskInventory[InventorySelf()]; 3250 else
3251 {
3252 item = m_host.TaskInventory[InventorySelf()];
2989 } 3253 }
2990 3254
3255 m_host.TaskInventory.LockItemsForRead(false);
3256
2991 if (item.PermsGranter != m_host.OwnerID) 3257 if (item.PermsGranter != m_host.OwnerID)
2992 return; 3258 return;
2993 3259
@@ -3012,13 +3278,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3012 3278
3013 TaskInventoryItem item; 3279 TaskInventoryItem item;
3014 3280
3015 lock (m_host.TaskInventory) 3281 m_host.TaskInventory.LockItemsForRead(true);
3282
3283 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3016 { 3284 {
3017 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3285 m_host.TaskInventory.LockItemsForRead(false);
3018 return; 3286 return;
3019 else
3020 item = m_host.TaskInventory[InventorySelf()];
3021 } 3287 }
3288 else
3289 {
3290 item = m_host.TaskInventory[InventorySelf()];
3291 }
3292 m_host.TaskInventory.LockItemsForRead(false);
3293
3022 3294
3023 if (item.PermsGranter != m_host.OwnerID) 3295 if (item.PermsGranter != m_host.OwnerID)
3024 return; 3296 return;
@@ -3065,6 +3337,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3065 3337
3066 public void llInstantMessage(string user, string message) 3338 public void llInstantMessage(string user, string message)
3067 { 3339 {
3340 UUID result;
3341 if (!UUID.TryParse(user, out result))
3342 {
3343 ShoutError("An invalid key was passed to llInstantMessage");
3344 ScriptSleep(2000);
3345 return;
3346 }
3347
3348
3068 m_host.AddScriptLPS(1); 3349 m_host.AddScriptLPS(1);
3069 3350
3070 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3351 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -3079,14 +3360,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3079 UUID friendTransactionID = UUID.Random(); 3360 UUID friendTransactionID = UUID.Random();
3080 3361
3081 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3362 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3082 3363
3083 GridInstantMessage msg = new GridInstantMessage(); 3364 GridInstantMessage msg = new GridInstantMessage();
3084 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3365 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3085 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3366 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3086 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3367 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3087// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3368// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3088// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3369// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3089 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 3370// DateTime dt = DateTime.UtcNow;
3371//
3372// // Ticks from UtcNow, but make it look like local. Evil, huh?
3373// dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3374//
3375// try
3376// {
3377// // Convert that to the PST timezone
3378// TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3379// dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3380// }
3381// catch
3382// {
3383// // No logging here, as it could be VERY spammy
3384// }
3385//
3386// // And make it look local again to fool the unix time util
3387// dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3388
3389 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
3390
3090 //if (client != null) 3391 //if (client != null)
3091 //{ 3392 //{
3092 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3393 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3100,12 +3401,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3100 msg.message = message.Substring(0, 1024); 3401 msg.message = message.Substring(0, 1024);
3101 else 3402 else
3102 msg.message = message; 3403 msg.message = message;
3103 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3404 msg.dialog = (byte)19; // MessageFromObject
3104 msg.fromGroup = false;// fromGroup; 3405 msg.fromGroup = false;// fromGroup;
3105 msg.offline = (byte)0; //offline; 3406 msg.offline = (byte)0; //offline;
3106 msg.ParentEstateID = 0; //ParentEstateID; 3407 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3107 msg.Position = new Vector3(m_host.AbsolutePosition); 3408 msg.Position = new Vector3(m_host.AbsolutePosition);
3108 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3409 msg.RegionID = World.RegionInfo.RegionID.Guid;
3109 msg.binaryBucket 3410 msg.binaryBucket
3110 = Util.StringToBytes256( 3411 = Util.StringToBytes256(
3111 "{0}/{1}/{2}/{3}", 3412 "{0}/{1}/{2}/{3}",
@@ -3133,7 +3434,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3133 } 3434 }
3134 3435
3135 emailModule.SendEmail(m_host.UUID, address, subject, message); 3436 emailModule.SendEmail(m_host.UUID, address, subject, message);
3136 ScriptSleep(20000); 3437 ScriptSleep(15000);
3137 } 3438 }
3138 3439
3139 public void llGetNextEmail(string address, string subject) 3440 public void llGetNextEmail(string address, string subject)
@@ -3233,13 +3534,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3233 m_host.AddScriptLPS(1); 3534 m_host.AddScriptLPS(1);
3234 } 3535 }
3235 3536
3236 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3237 {
3238 m_host.AddScriptLPS(1);
3239 Quaternion rot = new Quaternion((float)target.x, (float)target.y, (float)target.z, (float)target.s);
3240 m_host.RotLookAt(rot, (float)strength, (float)damping);
3241 }
3242
3243 public LSL_Integer llStringLength(string str) 3537 public LSL_Integer llStringLength(string str)
3244 { 3538 {
3245 m_host.AddScriptLPS(1); 3539 m_host.AddScriptLPS(1);
@@ -3263,14 +3557,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3263 3557
3264 TaskInventoryItem item; 3558 TaskInventoryItem item;
3265 3559
3266 lock (m_host.TaskInventory) 3560 m_host.TaskInventory.LockItemsForRead(true);
3561 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3267 { 3562 {
3268 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3563 m_host.TaskInventory.LockItemsForRead(false);
3269 return; 3564 return;
3270 else
3271 item = m_host.TaskInventory[InventorySelf()];
3272 } 3565 }
3273 3566 else
3567 {
3568 item = m_host.TaskInventory[InventorySelf()];
3569 }
3570 m_host.TaskInventory.LockItemsForRead(false);
3274 if (item.PermsGranter == UUID.Zero) 3571 if (item.PermsGranter == UUID.Zero)
3275 return; 3572 return;
3276 3573
@@ -3300,13 +3597,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3300 3597
3301 TaskInventoryItem item; 3598 TaskInventoryItem item;
3302 3599
3303 lock (m_host.TaskInventory) 3600 m_host.TaskInventory.LockItemsForRead(true);
3601 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3304 { 3602 {
3305 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3603 m_host.TaskInventory.LockItemsForRead(false);
3306 return; 3604 return;
3307 else 3605 }
3308 item = m_host.TaskInventory[InventorySelf()]; 3606 else
3607 {
3608 item = m_host.TaskInventory[InventorySelf()];
3309 } 3609 }
3610 m_host.TaskInventory.LockItemsForRead(false);
3611
3310 3612
3311 if (item.PermsGranter == UUID.Zero) 3613 if (item.PermsGranter == UUID.Zero)
3312 return; 3614 return;
@@ -3373,10 +3675,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3373 3675
3374 TaskInventoryItem item; 3676 TaskInventoryItem item;
3375 3677
3376 lock (m_host.TaskInventory) 3678
3679 m_host.TaskInventory.LockItemsForRead(true);
3680 if (!m_host.TaskInventory.ContainsKey(invItemID))
3681 {
3682 m_host.TaskInventory.LockItemsForRead(false);
3683 return;
3684 }
3685 else
3377 { 3686 {
3378 item = m_host.TaskInventory[invItemID]; 3687 item = m_host.TaskInventory[invItemID];
3379 } 3688 }
3689 m_host.TaskInventory.LockItemsForRead(false);
3380 3690
3381 if (agentID == UUID.Zero || perm == 0) // Releasing permissions 3691 if (agentID == UUID.Zero || perm == 0) // Releasing permissions
3382 { 3692 {
@@ -3404,15 +3714,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3404 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 3714 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
3405 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3715 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
3406 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3716 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
3717 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
3407 ScriptBaseClass.PERMISSION_ATTACH; 3718 ScriptBaseClass.PERMISSION_ATTACH;
3408 3719
3409 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3720 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3410 { 3721 {
3411 lock (m_host.TaskInventory) 3722 m_host.TaskInventory.LockItemsForWrite(true);
3412 { 3723 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3413 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3724 m_host.TaskInventory[invItemID].PermsMask = perm;
3414 m_host.TaskInventory[invItemID].PermsMask = perm; 3725 m_host.TaskInventory.LockItemsForWrite(false);
3415 }
3416 3726
3417 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3727 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3418 "run_time_permissions", new Object[] { 3728 "run_time_permissions", new Object[] {
@@ -3422,28 +3732,44 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3422 return; 3732 return;
3423 } 3733 }
3424 } 3734 }
3425 else if (m_host.SitTargetAvatar == agentID) // Sitting avatar 3735 else
3426 { 3736 {
3427 // When agent is sitting, certain permissions are implicit if requested from sitting agent 3737 bool sitting = false;
3428 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3738 if (m_host.SitTargetAvatar == agentID)
3429 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3739 {
3430 ScriptBaseClass.PERMISSION_TRACK_CAMERA | 3740 sitting = true;
3431 ScriptBaseClass.PERMISSION_TAKE_CONTROLS; 3741 }
3742 else
3743 {
3744 foreach (SceneObjectPart p in m_host.ParentGroup.Parts)
3745 {
3746 if (p.SitTargetAvatar == agentID)
3747 sitting = true;
3748 }
3749 }
3432 3750
3433 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3751 if (sitting)
3434 { 3752 {
3435 lock (m_host.TaskInventory) 3753 // When agent is sitting, certain permissions are implicit if requested from sitting agent
3754 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
3755 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
3756 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
3757 ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
3758
3759 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3436 { 3760 {
3761 m_host.TaskInventory.LockItemsForWrite(true);
3437 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3762 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3438 m_host.TaskInventory[invItemID].PermsMask = perm; 3763 m_host.TaskInventory[invItemID].PermsMask = perm;
3439 } 3764 m_host.TaskInventory.LockItemsForWrite(false);
3440 3765
3441 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3766 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3442 "run_time_permissions", new Object[] { 3767 "run_time_permissions", new Object[] {
3443 new LSL_Integer(perm) }, 3768 new LSL_Integer(perm) },
3444 new DetectParams[0])); 3769 new DetectParams[0]));
3445 3770
3446 return; 3771 return;
3772 }
3447 } 3773 }
3448 } 3774 }
3449 3775
@@ -3457,11 +3783,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3457 3783
3458 if (!m_waitingForScriptAnswer) 3784 if (!m_waitingForScriptAnswer)
3459 { 3785 {
3460 lock (m_host.TaskInventory) 3786 m_host.TaskInventory.LockItemsForWrite(true);
3461 { 3787 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3462 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3788 m_host.TaskInventory[invItemID].PermsMask = 0;
3463 m_host.TaskInventory[invItemID].PermsMask = 0; 3789 m_host.TaskInventory.LockItemsForWrite(false);
3464 }
3465 3790
3466 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3791 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3467 m_waitingForScriptAnswer=true; 3792 m_waitingForScriptAnswer=true;
@@ -3496,10 +3821,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3496 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3821 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3497 llReleaseControls(); 3822 llReleaseControls();
3498 3823
3499 lock (m_host.TaskInventory) 3824
3500 { 3825 m_host.TaskInventory.LockItemsForWrite(true);
3501 m_host.TaskInventory[invItemID].PermsMask = answer; 3826 m_host.TaskInventory[invItemID].PermsMask = answer;
3502 } 3827 m_host.TaskInventory.LockItemsForWrite(false);
3828
3503 3829
3504 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3830 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3505 "run_time_permissions", new Object[] { 3831 "run_time_permissions", new Object[] {
@@ -3511,16 +3837,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3511 { 3837 {
3512 m_host.AddScriptLPS(1); 3838 m_host.AddScriptLPS(1);
3513 3839
3514 lock (m_host.TaskInventory) 3840 m_host.TaskInventory.LockItemsForRead(true);
3841
3842 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3515 { 3843 {
3516 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3844 if (item.Type == 10 && item.ItemID == m_itemID)
3517 { 3845 {
3518 if (item.Type == 10 && item.ItemID == m_itemID) 3846 m_host.TaskInventory.LockItemsForRead(false);
3519 { 3847 return item.PermsGranter.ToString();
3520 return item.PermsGranter.ToString();
3521 }
3522 } 3848 }
3523 } 3849 }
3850 m_host.TaskInventory.LockItemsForRead(false);
3524 3851
3525 return UUID.Zero.ToString(); 3852 return UUID.Zero.ToString();
3526 } 3853 }
@@ -3529,19 +3856,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3529 { 3856 {
3530 m_host.AddScriptLPS(1); 3857 m_host.AddScriptLPS(1);
3531 3858
3532 lock (m_host.TaskInventory) 3859 m_host.TaskInventory.LockItemsForRead(true);
3860
3861 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3533 { 3862 {
3534 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3863 if (item.Type == 10 && item.ItemID == m_itemID)
3535 { 3864 {
3536 if (item.Type == 10 && item.ItemID == m_itemID) 3865 int perms = item.PermsMask;
3537 { 3866 if (m_automaticLinkPermission)
3538 int perms = item.PermsMask; 3867 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
3539 if (m_automaticLinkPermission) 3868 m_host.TaskInventory.LockItemsForRead(false);
3540 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 3869 return perms;
3541 return perms;
3542 }
3543 } 3870 }
3544 } 3871 }
3872 m_host.TaskInventory.LockItemsForRead(false);
3545 3873
3546 return 0; 3874 return 0;
3547 } 3875 }
@@ -3563,9 +3891,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3563 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 3891 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3564 { 3892 {
3565 List<SceneObjectPart> parts = GetLinkParts(linknumber); 3893 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3566 3894 if (parts.Count > 0)
3567 foreach (SceneObjectPart part in parts) 3895 {
3568 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); 3896 try
3897 {
3898 parts[0].ParentGroup.areUpdatesSuspended = true;
3899 foreach (SceneObjectPart part in parts)
3900 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
3901 }
3902 finally
3903 {
3904 parts[0].ParentGroup.areUpdatesSuspended = false;
3905 }
3906 }
3569 } 3907 }
3570 3908
3571 public void llCreateLink(string target, int parent) 3909 public void llCreateLink(string target, int parent)
@@ -3578,11 +3916,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3578 return; 3916 return;
3579 3917
3580 TaskInventoryItem item; 3918 TaskInventoryItem item;
3581 lock (m_host.TaskInventory) 3919 m_host.TaskInventory.LockItemsForRead(true);
3582 { 3920 item = m_host.TaskInventory[invItemID];
3583 item = m_host.TaskInventory[invItemID]; 3921 m_host.TaskInventory.LockItemsForRead(false);
3584 } 3922
3585
3586 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3923 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3587 && !m_automaticLinkPermission) 3924 && !m_automaticLinkPermission)
3588 { 3925 {
@@ -3599,11 +3936,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3599 3936
3600 if (targetPart.ParentGroup.AttachmentPoint != 0) 3937 if (targetPart.ParentGroup.AttachmentPoint != 0)
3601 return; // Fail silently if attached 3938 return; // Fail silently if attached
3939
3940 if (targetPart.ParentGroup.RootPart.OwnerID != m_host.ParentGroup.RootPart.OwnerID)
3941 return;
3942
3602 SceneObjectGroup parentPrim = null, childPrim = null; 3943 SceneObjectGroup parentPrim = null, childPrim = null;
3603 3944
3604 if (targetPart != null) 3945 if (targetPart != null)
3605 { 3946 {
3606 if (parent != 0) { 3947 if (parent != 0)
3948 {
3607 parentPrim = m_host.ParentGroup; 3949 parentPrim = m_host.ParentGroup;
3608 childPrim = targetPart.ParentGroup; 3950 childPrim = targetPart.ParentGroup;
3609 } 3951 }
@@ -3634,16 +3976,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3634 m_host.AddScriptLPS(1); 3976 m_host.AddScriptLPS(1);
3635 UUID invItemID = InventorySelf(); 3977 UUID invItemID = InventorySelf();
3636 3978
3637 lock (m_host.TaskInventory) 3979 m_host.TaskInventory.LockItemsForRead(true);
3638 {
3639 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3980 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3640 && !m_automaticLinkPermission) 3981 && !m_automaticLinkPermission)
3641 { 3982 {
3642 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 3983 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
3984 m_host.TaskInventory.LockItemsForRead(false);
3643 return; 3985 return;
3644 } 3986 }
3645 } 3987 m_host.TaskInventory.LockItemsForRead(false);
3646 3988
3647 if (linknum < ScriptBaseClass.LINK_THIS) 3989 if (linknum < ScriptBaseClass.LINK_THIS)
3648 return; 3990 return;
3649 3991
@@ -3682,10 +4024,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3682 // Restructuring Multiple Prims. 4024 // Restructuring Multiple Prims.
3683 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); 4025 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
3684 parts.Remove(parentPrim.RootPart); 4026 parts.Remove(parentPrim.RootPart);
3685 foreach (SceneObjectPart part in parts) 4027 if (parts.Count > 0)
3686 { 4028 {
3687 parentPrim.DelinkFromGroup(part.LocalId, true); 4029 try
4030 {
4031 parts[0].ParentGroup.areUpdatesSuspended = true;
4032 foreach (SceneObjectPart part in parts)
4033 {
4034 parentPrim.DelinkFromGroup(part.LocalId, true);
4035 }
4036 }
4037 finally
4038 {
4039 parts[0].ParentGroup.areUpdatesSuspended = false;
4040 }
3688 } 4041 }
4042
3689 parentPrim.HasGroupChanged = true; 4043 parentPrim.HasGroupChanged = true;
3690 parentPrim.ScheduleGroupForFullUpdate(); 4044 parentPrim.ScheduleGroupForFullUpdate();
3691 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 4045 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3694,12 +4048,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3694 { 4048 {
3695 SceneObjectPart newRoot = parts[0]; 4049 SceneObjectPart newRoot = parts[0];
3696 parts.Remove(newRoot); 4050 parts.Remove(newRoot);
3697 foreach (SceneObjectPart part in parts) 4051
4052 try
3698 { 4053 {
3699 // Required for linking 4054 parts[0].ParentGroup.areUpdatesSuspended = true;
3700 part.ClearUpdateSchedule(); 4055 foreach (SceneObjectPart part in parts)
3701 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 4056 {
4057 part.ClearUpdateSchedule();
4058 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
4059 }
3702 } 4060 }
4061 finally
4062 {
4063 parts[0].ParentGroup.areUpdatesSuspended = false;
4064 }
4065
4066
3703 newRoot.ParentGroup.HasGroupChanged = true; 4067 newRoot.ParentGroup.HasGroupChanged = true;
3704 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 4068 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3705 } 4069 }
@@ -3719,6 +4083,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3719 public void llBreakAllLinks() 4083 public void llBreakAllLinks()
3720 { 4084 {
3721 m_host.AddScriptLPS(1); 4085 m_host.AddScriptLPS(1);
4086
4087 UUID invItemID = InventorySelf();
4088
4089 TaskInventoryItem item;
4090 m_host.TaskInventory.LockItemsForRead(true);
4091 item = m_host.TaskInventory[invItemID];
4092 m_host.TaskInventory.LockItemsForRead(false);
4093
4094 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
4095 && !m_automaticLinkPermission)
4096 {
4097 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
4098 return;
4099 }
4100
3722 SceneObjectGroup parentPrim = m_host.ParentGroup; 4101 SceneObjectGroup parentPrim = m_host.ParentGroup;
3723 if (parentPrim.AttachmentPoint != 0) 4102 if (parentPrim.AttachmentPoint != 0)
3724 return; // Fail silently if attached 4103 return; // Fail silently if attached
@@ -3738,25 +4117,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3738 public LSL_String llGetLinkKey(int linknum) 4117 public LSL_String llGetLinkKey(int linknum)
3739 { 4118 {
3740 m_host.AddScriptLPS(1); 4119 m_host.AddScriptLPS(1);
3741 List<UUID> keytable = new List<UUID>();
3742 // parse for sitting avatare-uuids
3743 World.ForEachRootScenePresence(delegate(ScenePresence presence)
3744 {
3745 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
3746 keytable.Add(presence.UUID);
3747 });
3748
3749 int totalprims = m_host.ParentGroup.PrimCount + keytable.Count;
3750 if (linknum > m_host.ParentGroup.PrimCount && linknum <= totalprims)
3751 {
3752 return keytable[totalprims - linknum].ToString();
3753 }
3754
3755 if (linknum == 1 && m_host.ParentGroup.PrimCount == 1 && keytable.Count == 1)
3756 {
3757 return m_host.UUID.ToString();
3758 }
3759
3760 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); 4120 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
3761 if (part != null) 4121 if (part != null)
3762 { 4122 {
@@ -3764,6 +4124,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3764 } 4124 }
3765 else 4125 else
3766 { 4126 {
4127 if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1))
4128 {
4129 linknum -= (m_host.ParentGroup.PrimCount) + 1;
4130
4131 if (linknum < 0)
4132 return UUID.Zero.ToString();
4133
4134 List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
4135 if (avatars.Count > linknum)
4136 {
4137 return avatars[linknum].UUID.ToString();
4138 }
4139 }
3767 return UUID.Zero.ToString(); 4140 return UUID.Zero.ToString();
3768 } 4141 }
3769 } 4142 }
@@ -3862,17 +4235,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3862 m_host.AddScriptLPS(1); 4235 m_host.AddScriptLPS(1);
3863 int count = 0; 4236 int count = 0;
3864 4237
3865 lock (m_host.TaskInventory) 4238 m_host.TaskInventory.LockItemsForRead(true);
4239 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3866 { 4240 {
3867 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4241 if (inv.Value.Type == type || type == -1)
3868 { 4242 {
3869 if (inv.Value.Type == type || type == -1) 4243 count = count + 1;
3870 {
3871 count = count + 1;
3872 }
3873 } 4244 }
3874 } 4245 }
3875 4246
4247 m_host.TaskInventory.LockItemsForRead(false);
3876 return count; 4248 return count;
3877 } 4249 }
3878 4250
@@ -3881,16 +4253,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3881 m_host.AddScriptLPS(1); 4253 m_host.AddScriptLPS(1);
3882 ArrayList keys = new ArrayList(); 4254 ArrayList keys = new ArrayList();
3883 4255
3884 lock (m_host.TaskInventory) 4256 m_host.TaskInventory.LockItemsForRead(true);
4257 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3885 { 4258 {
3886 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4259 if (inv.Value.Type == type || type == -1)
3887 { 4260 {
3888 if (inv.Value.Type == type || type == -1) 4261 keys.Add(inv.Value.Name);
3889 {
3890 keys.Add(inv.Value.Name);
3891 }
3892 } 4262 }
3893 } 4263 }
4264 m_host.TaskInventory.LockItemsForRead(false);
3894 4265
3895 if (keys.Count == 0) 4266 if (keys.Count == 0)
3896 { 4267 {
@@ -3927,25 +4298,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3927 } 4298 }
3928 4299
3929 // move the first object found with this inventory name 4300 // move the first object found with this inventory name
3930 lock (m_host.TaskInventory) 4301 m_host.TaskInventory.LockItemsForRead(true);
4302 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3931 { 4303 {
3932 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4304 if (inv.Value.Name == inventory)
3933 { 4305 {
3934 if (inv.Value.Name == inventory) 4306 found = true;
3935 { 4307 objId = inv.Key;
3936 found = true; 4308 assetType = inv.Value.Type;
3937 objId = inv.Key; 4309 objName = inv.Value.Name;
3938 assetType = inv.Value.Type; 4310 break;
3939 objName = inv.Value.Name;
3940 break;
3941 }
3942 } 4311 }
3943 } 4312 }
4313 m_host.TaskInventory.LockItemsForRead(false);
3944 4314
3945 if (!found) 4315 if (!found)
3946 { 4316 {
3947 llSay(0, String.Format("Could not find object '{0}'", inventory)); 4317 llSay(0, String.Format("Could not find object '{0}'", inventory));
3948 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4318 return;
4319// throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
3949 } 4320 }
3950 4321
3951 // check if destination is an object 4322 // check if destination is an object
@@ -3971,48 +4342,68 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3971 return; 4342 return;
3972 } 4343 }
3973 } 4344 }
4345
3974 // destination is an avatar 4346 // destination is an avatar
3975 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4347 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
3976 4348
3977 if (agentItem == null) 4349 if (agentItem == null)
3978 return; 4350 return;
3979 4351
3980 byte[] bucket = new byte[17]; 4352 byte[] bucket = new byte[1];
3981 bucket[0] = (byte)assetType; 4353 bucket[0] = (byte)assetType;
3982 byte[] objBytes = agentItem.ID.GetBytes(); 4354 //byte[] objBytes = agentItem.ID.GetBytes();
3983 Array.Copy(objBytes, 0, bucket, 1, 16); 4355 //Array.Copy(objBytes, 0, bucket, 1, 16);
3984 4356
3985 GridInstantMessage msg = new GridInstantMessage(World, 4357 GridInstantMessage msg = new GridInstantMessage(World,
3986 m_host.UUID, m_host.Name+", an object owned by "+ 4358 m_host.OwnerID, m_host.Name, destId,
3987 resolveName(m_host.OwnerID)+",", destId,
3988 (byte)InstantMessageDialog.TaskInventoryOffered, 4359 (byte)InstantMessageDialog.TaskInventoryOffered,
3989 false, objName+"\n"+m_host.Name+" is located at "+ 4360 false, objName+". "+m_host.Name+" is located at "+
3990 World.RegionInfo.RegionName+" "+ 4361 World.RegionInfo.RegionName+" "+
3991 m_host.AbsolutePosition.ToString(), 4362 m_host.AbsolutePosition.ToString(),
3992 agentItem.ID, true, m_host.AbsolutePosition, 4363 agentItem.ID, true, m_host.AbsolutePosition,
3993 bucket); 4364 bucket);
3994 if (m_TransferModule != null) 4365
3995 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4366 ScenePresence sp;
4367
4368 if (World.TryGetScenePresence(destId, out sp))
4369 {
4370 sp.ControllingClient.SendInstantMessage(msg);
4371 }
4372 else
4373 {
4374 if (m_TransferModule != null)
4375 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4376 }
4377
4378 //This delay should only occur when giving inventory to avatars.
3996 ScriptSleep(3000); 4379 ScriptSleep(3000);
3997 } 4380 }
3998 } 4381 }
3999 4382
4383 [DebuggerNonUserCode]
4000 public void llRemoveInventory(string name) 4384 public void llRemoveInventory(string name)
4001 { 4385 {
4002 m_host.AddScriptLPS(1); 4386 m_host.AddScriptLPS(1);
4003 4387
4004 lock (m_host.TaskInventory) 4388 List<TaskInventoryItem> inv;
4389 try
4005 { 4390 {
4006 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4391 m_host.TaskInventory.LockItemsForRead(true);
4392 inv = new List<TaskInventoryItem>(m_host.TaskInventory.Values);
4393 }
4394 finally
4395 {
4396 m_host.TaskInventory.LockItemsForRead(false);
4397 }
4398 foreach (TaskInventoryItem item in inv)
4399 {
4400 if (item.Name == name)
4007 { 4401 {
4008 if (item.Name == name) 4402 if (item.ItemID == m_itemID)
4009 { 4403 throw new ScriptDeleteException();
4010 if (item.ItemID == m_itemID) 4404 else
4011 throw new ScriptDeleteException(); 4405 m_host.Inventory.RemoveInventoryItem(item.ItemID);
4012 else 4406 return;
4013 m_host.Inventory.RemoveInventoryItem(item.ItemID);
4014 return;
4015 }
4016 } 4407 }
4017 } 4408 }
4018 } 4409 }
@@ -4047,112 +4438,122 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4047 { 4438 {
4048 m_host.AddScriptLPS(1); 4439 m_host.AddScriptLPS(1);
4049 4440
4050 UUID uuid = (UUID)id; 4441 UUID uuid;
4051 PresenceInfo pinfo = null; 4442 if (UUID.TryParse(id, out uuid))
4052 UserAccount account;
4053
4054 UserInfoCacheEntry ce;
4055 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4056 { 4443 {
4057 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); 4444 PresenceInfo pinfo = null;
4058 if (account == null) 4445 UserAccount account;
4446
4447 UserInfoCacheEntry ce;
4448 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4059 { 4449 {
4060 m_userInfoCache[uuid] = null; // Cache negative 4450 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
4061 return UUID.Zero.ToString(); 4451 if (account == null)
4062 } 4452 {
4453 m_userInfoCache[uuid] = null; // Cache negative
4454 return UUID.Zero.ToString();
4455 }
4063 4456
4064 4457
4065 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); 4458 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4066 if (pinfos != null && pinfos.Length > 0) 4459 if (pinfos != null && pinfos.Length > 0)
4067 {
4068 foreach (PresenceInfo p in pinfos)
4069 { 4460 {
4070 if (p.RegionID != UUID.Zero) 4461 foreach (PresenceInfo p in pinfos)
4071 { 4462 {
4072 pinfo = p; 4463 if (p.RegionID != UUID.Zero)
4464 {
4465 pinfo = p;
4466 }
4073 } 4467 }
4074 } 4468 }
4075 }
4076 4469
4077 ce = new UserInfoCacheEntry(); 4470 ce = new UserInfoCacheEntry();
4078 ce.time = Util.EnvironmentTickCount(); 4471 ce.time = Util.EnvironmentTickCount();
4079 ce.account = account; 4472 ce.account = account;
4080 ce.pinfo = pinfo; 4473 ce.pinfo = pinfo;
4081 } 4474 m_userInfoCache[uuid] = ce;
4082 else 4475 }
4083 { 4476 else
4084 if (ce == null) 4477 {
4085 return UUID.Zero.ToString(); 4478 if (ce == null)
4479 return UUID.Zero.ToString();
4086 4480
4087 account = ce.account; 4481 account = ce.account;
4088 pinfo = ce.pinfo; 4482 pinfo = ce.pinfo;
4089 } 4483 }
4090 4484
4091 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) 4485 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
4092 {
4093 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4094 if (pinfos != null && pinfos.Length > 0)
4095 { 4486 {
4096 foreach (PresenceInfo p in pinfos) 4487 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4488 if (pinfos != null && pinfos.Length > 0)
4097 { 4489 {
4098 if (p.RegionID != UUID.Zero) 4490 foreach (PresenceInfo p in pinfos)
4099 { 4491 {
4100 pinfo = p; 4492 if (p.RegionID != UUID.Zero)
4493 {
4494 pinfo = p;
4495 }
4101 } 4496 }
4102 } 4497 }
4103 } 4498 else
4104 else 4499 pinfo = null;
4105 pinfo = null;
4106 4500
4107 ce.time = Util.EnvironmentTickCount(); 4501 ce.time = Util.EnvironmentTickCount();
4108 ce.pinfo = pinfo; 4502 ce.pinfo = pinfo;
4109 } 4503 }
4110 4504
4111 string reply = String.Empty; 4505 string reply = String.Empty;
4112 4506
4113 switch (data) 4507 switch (data)
4114 { 4508 {
4115 case 1: // DATA_ONLINE (0|1) 4509 case 1: // DATA_ONLINE (0|1)
4116 if (pinfo != null && pinfo.RegionID != UUID.Zero) 4510 if (pinfo != null && pinfo.RegionID != UUID.Zero)
4117 reply = "1"; 4511 reply = "1";
4118 else 4512 else
4119 reply = "0"; 4513 reply = "0";
4120 break; 4514 break;
4121 case 2: // DATA_NAME (First Last) 4515 case 2: // DATA_NAME (First Last)
4122 reply = account.FirstName + " " + account.LastName; 4516 reply = account.FirstName + " " + account.LastName;
4123 break; 4517 break;
4124 case 3: // DATA_BORN (YYYY-MM-DD) 4518 case 3: // DATA_BORN (YYYY-MM-DD)
4125 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); 4519 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
4126 born = born.AddSeconds(account.Created); 4520 born = born.AddSeconds(account.Created);
4127 reply = born.ToString("yyyy-MM-dd"); 4521 reply = born.ToString("yyyy-MM-dd");
4128 break; 4522 break;
4129 case 4: // DATA_RATING (0,0,0,0,0,0) 4523 case 4: // DATA_RATING (0,0,0,0,0,0)
4130 reply = "0,0,0,0,0,0"; 4524 reply = "0,0,0,0,0,0";
4131 break; 4525 break;
4132 case 8: // DATA_PAYINFO (0|1|2|3) 4526 case 8: // DATA_PAYINFO (0|1|2|3)
4133 reply = "0"; 4527 reply = "0";
4134 break; 4528 break;
4135 default: 4529 default:
4136 return UUID.Zero.ToString(); // Raise no event 4530 return UUID.Zero.ToString(); // Raise no event
4137 } 4531 }
4138 4532
4139 UUID rq = UUID.Random(); 4533 UUID rq = UUID.Random();
4140 4534
4141 UUID tid = AsyncCommands. 4535 UUID tid = AsyncCommands.
4142 DataserverPlugin.RegisterRequest(m_localID, 4536 DataserverPlugin.RegisterRequest(m_localID,
4143 m_itemID, rq.ToString()); 4537 m_itemID, rq.ToString());
4144 4538
4145 AsyncCommands. 4539 AsyncCommands.
4146 DataserverPlugin.DataserverReply(rq.ToString(), reply); 4540 DataserverPlugin.DataserverReply(rq.ToString(), reply);
4147 4541
4148 ScriptSleep(100); 4542 ScriptSleep(100);
4149 return tid.ToString(); 4543 return tid.ToString();
4544 }
4545 else
4546 {
4547 ShoutError("Invalid UUID passed to llRequestAgentData.");
4548 }
4549 return "";
4150 } 4550 }
4151 4551
4152 public LSL_String llRequestInventoryData(string name) 4552 public LSL_String llRequestInventoryData(string name)
4153 { 4553 {
4154 m_host.AddScriptLPS(1); 4554 m_host.AddScriptLPS(1);
4155 4555
4556 //Clone is thread safe
4156 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 4557 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
4157 4558
4158 foreach (TaskInventoryItem item in itemDictionary.Values) 4559 foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -4206,6 +4607,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4206 ScenePresence presence = World.GetScenePresence(agentId); 4607 ScenePresence presence = World.GetScenePresence(agentId);
4207 if (presence != null) 4608 if (presence != null)
4208 { 4609 {
4610 // agent must not be a god
4611 if (presence.UserLevel >= 200) return;
4612
4209 // agent must be over the owners land 4613 // agent must be over the owners land
4210 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4614 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4211 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 4615 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
@@ -4228,7 +4632,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4228 UUID av = new UUID(); 4632 UUID av = new UUID();
4229 if (!UUID.TryParse(agent,out av)) 4633 if (!UUID.TryParse(agent,out av))
4230 { 4634 {
4231 LSLError("First parameter to llDialog needs to be a key"); 4635 //LSLError("First parameter to llDialog needs to be a key");
4232 return; 4636 return;
4233 } 4637 }
4234 4638
@@ -4265,17 +4669,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4265 UUID soundId = UUID.Zero; 4669 UUID soundId = UUID.Zero;
4266 if (!UUID.TryParse(impact_sound, out soundId)) 4670 if (!UUID.TryParse(impact_sound, out soundId))
4267 { 4671 {
4268 lock (m_host.TaskInventory) 4672 m_host.TaskInventory.LockItemsForRead(true);
4673 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4269 { 4674 {
4270 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4675 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
4271 { 4676 {
4272 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound) 4677 soundId = item.AssetID;
4273 { 4678 break;
4274 soundId = item.AssetID;
4275 break;
4276 }
4277 } 4679 }
4278 } 4680 }
4681 m_host.TaskInventory.LockItemsForRead(false);
4279 } 4682 }
4280 m_host.CollisionSound = soundId; 4683 m_host.CollisionSound = soundId;
4281 m_host.CollisionSoundVolume = (float)impact_volume; 4684 m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4315,6 +4718,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4315 UUID partItemID; 4718 UUID partItemID;
4316 foreach (SceneObjectPart part in parts) 4719 foreach (SceneObjectPart part in parts)
4317 { 4720 {
4721 //Clone is thread safe
4318 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 4722 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
4319 4723
4320 foreach (TaskInventoryItem item in itemsDictionary.Values) 4724 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4529,17 +4933,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4529 4933
4530 m_host.AddScriptLPS(1); 4934 m_host.AddScriptLPS(1);
4531 4935
4532 lock (m_host.TaskInventory) 4936 m_host.TaskInventory.LockItemsForRead(true);
4937 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4533 { 4938 {
4534 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4939 if (item.Type == 10 && item.ItemID == m_itemID)
4535 { 4940 {
4536 if (item.Type == 10 && item.ItemID == m_itemID) 4941 result = item.Name!=null?item.Name:String.Empty;
4537 { 4942 break;
4538 result = item.Name != null ? item.Name : String.Empty;
4539 break;
4540 }
4541 } 4943 }
4542 } 4944 }
4945 m_host.TaskInventory.LockItemsForRead(false);
4543 4946
4544 return result; 4947 return result;
4545 } 4948 }
@@ -4708,23 +5111,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4708 { 5111 {
4709 m_host.AddScriptLPS(1); 5112 m_host.AddScriptLPS(1);
4710 5113
4711 lock (m_host.TaskInventory) 5114 m_host.TaskInventory.LockItemsForRead(true);
5115 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
4712 { 5116 {
4713 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 5117 if (inv.Value.Name == name)
4714 { 5118 {
4715 if (inv.Value.Name == name) 5119 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
4716 { 5120 {
4717 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 5121 m_host.TaskInventory.LockItemsForRead(false);
4718 { 5122 return inv.Value.AssetID.ToString();
4719 return inv.Value.AssetID.ToString(); 5123 }
4720 } 5124 else
4721 else 5125 {
4722 { 5126 m_host.TaskInventory.LockItemsForRead(false);
4723 return UUID.Zero.ToString(); 5127 return UUID.Zero.ToString();
4724 }
4725 } 5128 }
4726 } 5129 }
4727 } 5130 }
5131 m_host.TaskInventory.LockItemsForRead(false);
4728 5132
4729 return UUID.Zero.ToString(); 5133 return UUID.Zero.ToString();
4730 } 5134 }
@@ -4877,14 +5281,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4877 { 5281 {
4878 m_host.AddScriptLPS(1); 5282 m_host.AddScriptLPS(1);
4879 5283
4880 if (src == null) 5284 return src.Length;
4881 {
4882 return 0;
4883 }
4884 else
4885 {
4886 return src.Length;
4887 }
4888 } 5285 }
4889 5286
4890 public LSL_Integer llList2Integer(LSL_List src, int index) 5287 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -4930,7 +5327,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4930 else if (src.Data[index] is LSL_Float) 5327 else if (src.Data[index] is LSL_Float)
4931 return Convert.ToDouble(((LSL_Float) src.Data[index]).value); 5328 return Convert.ToDouble(((LSL_Float) src.Data[index]).value);
4932 else if (src.Data[index] is LSL_String) 5329 else if (src.Data[index] is LSL_String)
4933 return Convert.ToDouble(((LSL_String) src.Data[index]).m_string); 5330 {
5331 string str = ((LSL_String) src.Data[index]).m_string;
5332 Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)");
5333 if (m != Match.Empty)
5334 {
5335 str = m.Value;
5336 double d = 0.0;
5337 if (!Double.TryParse(str, out d))
5338 return 0.0;
5339
5340 return d;
5341 }
5342 return 0.0;
5343 }
4934 return Convert.ToDouble(src.Data[index]); 5344 return Convert.ToDouble(src.Data[index]);
4935 } 5345 }
4936 catch (FormatException) 5346 catch (FormatException)
@@ -5203,7 +5613,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5203 } 5613 }
5204 } 5614 }
5205 } 5615 }
5206 else { 5616 else
5617 {
5207 object[] array = new object[src.Length]; 5618 object[] array = new object[src.Length];
5208 Array.Copy(src.Data, 0, array, 0, src.Length); 5619 Array.Copy(src.Data, 0, array, 0, src.Length);
5209 result = new LSL_List(array); 5620 result = new LSL_List(array);
@@ -5654,10 +6065,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5654 m_host.AddScriptLPS(1); 6065 m_host.AddScriptLPS(1);
5655 6066
5656 List<SceneObjectPart> parts = GetLinkParts(linknumber); 6067 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5657 6068 if (parts.Count > 0)
5658 foreach (var part in parts)
5659 { 6069 {
5660 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); 6070 try
6071 {
6072 parts[0].ParentGroup.areUpdatesSuspended = true;
6073 foreach (var part in parts)
6074 {
6075 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
6076 }
6077 }
6078 finally
6079 {
6080 parts[0].ParentGroup.areUpdatesSuspended = false;
6081 }
5661 } 6082 }
5662 } 6083 }
5663 6084
@@ -5711,6 +6132,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5711 ScriptSleep(5000); 6132 ScriptSleep(5000);
5712 } 6133 }
5713 6134
6135 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
6136 {
6137 return ParseString2List(str, separators, in_spacers, false);
6138 }
6139
5714 public LSL_Integer llOverMyLand(string id) 6140 public LSL_Integer llOverMyLand(string id)
5715 { 6141 {
5716 m_host.AddScriptLPS(1); 6142 m_host.AddScriptLPS(1);
@@ -5775,8 +6201,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5775 UUID agentId = new UUID(); 6201 UUID agentId = new UUID();
5776 if (!UUID.TryParse(agent, out agentId)) 6202 if (!UUID.TryParse(agent, out agentId))
5777 return new LSL_Integer(0); 6203 return new LSL_Integer(0);
6204 if (agentId == m_host.GroupID)
6205 return new LSL_Integer(1);
5778 ScenePresence presence = World.GetScenePresence(agentId); 6206 ScenePresence presence = World.GetScenePresence(agentId);
5779 if (presence == null || presence.IsChildAgent) // Return flase for child agents 6207 if (presence == null || presence.IsChildAgent) // Return false for child agents
5780 return new LSL_Integer(0); 6208 return new LSL_Integer(0);
5781 IClientAPI client = presence.ControllingClient; 6209 IClientAPI client = presence.ControllingClient;
5782 if (m_host.GroupID == client.ActiveGroupId) 6210 if (m_host.GroupID == client.ActiveGroupId)
@@ -5911,7 +6339,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5911 return m_host.ParentGroup.AttachmentPoint; 6339 return m_host.ParentGroup.AttachmentPoint;
5912 } 6340 }
5913 6341
5914 public LSL_Integer llGetFreeMemory() 6342 public virtual LSL_Integer llGetFreeMemory()
5915 { 6343 {
5916 m_host.AddScriptLPS(1); 6344 m_host.AddScriptLPS(1);
5917 // Make scripts designed for LSO happy 6345 // Make scripts designed for LSO happy
@@ -6028,7 +6456,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6028 SetParticleSystem(m_host, rules); 6456 SetParticleSystem(m_host, rules);
6029 } 6457 }
6030 6458
6031 private void SetParticleSystem(SceneObjectPart part, LSL_List rules) { 6459 private void SetParticleSystem(SceneObjectPart part, LSL_List rules)
6460 {
6032 6461
6033 6462
6034 if (rules.Length == 0) 6463 if (rules.Length == 0)
@@ -6222,14 +6651,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6222 6651
6223 protected UUID GetTaskInventoryItem(string name) 6652 protected UUID GetTaskInventoryItem(string name)
6224 { 6653 {
6225 lock (m_host.TaskInventory) 6654 m_host.TaskInventory.LockItemsForRead(true);
6655 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6226 { 6656 {
6227 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6657 if (inv.Value.Name == name)
6228 { 6658 {
6229 if (inv.Value.Name == name) 6659 m_host.TaskInventory.LockItemsForRead(false);
6230 return inv.Key; 6660 return inv.Key;
6231 } 6661 }
6232 } 6662 }
6663 m_host.TaskInventory.LockItemsForRead(false);
6233 6664
6234 return UUID.Zero; 6665 return UUID.Zero;
6235 } 6666 }
@@ -6267,16 +6698,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6267 if (folderID == UUID.Zero) 6698 if (folderID == UUID.Zero)
6268 return; 6699 return;
6269 6700
6270 byte[] bucket = new byte[17]; 6701 byte[] bucket = new byte[1];
6271 bucket[0] = (byte)AssetType.Folder; 6702 bucket[0] = (byte)AssetType.Folder;
6272 byte[] objBytes = folderID.GetBytes(); 6703 //byte[] objBytes = folderID.GetBytes();
6273 Array.Copy(objBytes, 0, bucket, 1, 16); 6704 //Array.Copy(objBytes, 0, bucket, 1, 16);
6274 6705
6275 GridInstantMessage msg = new GridInstantMessage(World, 6706 GridInstantMessage msg = new GridInstantMessage(World,
6276 m_host.UUID, m_host.Name+", an object owned by "+ 6707 m_host.OwnerID, m_host.Name, destID,
6277 resolveName(m_host.OwnerID)+",", destID, 6708 (byte)InstantMessageDialog.TaskInventoryOffered,
6278 (byte)InstantMessageDialog.InventoryOffered, 6709 false, category+". "+m_host.Name+" is located at "+
6279 false, category+"\n"+m_host.Name+" is located at "+
6280 World.RegionInfo.RegionName+" "+ 6710 World.RegionInfo.RegionName+" "+
6281 m_host.AbsolutePosition.ToString(), 6711 m_host.AbsolutePosition.ToString(),
6282 folderID, true, m_host.AbsolutePosition, 6712 folderID, true, m_host.AbsolutePosition,
@@ -6479,13 +6909,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6479 UUID av = new UUID(); 6909 UUID av = new UUID();
6480 if (!UUID.TryParse(avatar,out av)) 6910 if (!UUID.TryParse(avatar,out av))
6481 { 6911 {
6482 LSLError("First parameter to llDialog needs to be a key"); 6912 //LSLError("First parameter to llDialog needs to be a key");
6483 return; 6913 return;
6484 } 6914 }
6485 if (buttons.Length < 1) 6915 if (buttons.Length < 1)
6486 { 6916 {
6487 LSLError("No less than 1 button can be shown"); 6917 buttons.Add("OK");
6488 return;
6489 } 6918 }
6490 if (buttons.Length > 12) 6919 if (buttons.Length > 12)
6491 { 6920 {
@@ -6502,7 +6931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6502 } 6931 }
6503 if (buttons.Data[i].ToString().Length > 24) 6932 if (buttons.Data[i].ToString().Length > 24)
6504 { 6933 {
6505 LSLError("button label cannot be longer than 24 characters"); 6934 llWhisper(ScriptBaseClass.DEBUG_CHANNEL, "button label cannot be longer than 24 characters");
6506 return; 6935 return;
6507 } 6936 }
6508 buts[i] = buttons.Data[i].ToString(); 6937 buts[i] = buttons.Data[i].ToString();
@@ -6561,22 +6990,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6561 } 6990 }
6562 6991
6563 // copy the first script found with this inventory name 6992 // copy the first script found with this inventory name
6564 lock (m_host.TaskInventory) 6993 TaskInventoryItem scriptItem = null;
6994 m_host.TaskInventory.LockItemsForRead(true);
6995 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6565 { 6996 {
6566 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6997 if (inv.Value.Name == name)
6567 { 6998 {
6568 if (inv.Value.Name == name) 6999 // make sure the object is a script
7000 if (10 == inv.Value.Type)
6569 { 7001 {
6570 // make sure the object is a script 7002 found = true;
6571 if (10 == inv.Value.Type) 7003 srcId = inv.Key;
6572 { 7004 scriptItem = inv.Value;
6573 found = true; 7005 break;
6574 srcId = inv.Key;
6575 break;
6576 }
6577 } 7006 }
6578 } 7007 }
6579 } 7008 }
7009 m_host.TaskInventory.LockItemsForRead(false);
6580 7010
6581 if (!found) 7011 if (!found)
6582 { 7012 {
@@ -6584,8 +7014,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6584 return; 7014 return;
6585 } 7015 }
6586 7016
6587 // the rest of the permission checks are done in RezScript, so check the pin there as well 7017 SceneObjectPart dest = World.GetSceneObjectPart(destId);
6588 World.RezScript(srcId, m_host, destId, pin, running, start_param); 7018 if (dest != null)
7019 {
7020 if ((scriptItem.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID)
7021 {
7022 // the rest of the permission checks are done in RezScript, so check the pin there as well
7023 World.RezScript(srcId, m_host, destId, pin, running, start_param);
7024
7025 if ((scriptItem.BasePermissions & (uint)PermissionMask.Copy) == 0)
7026 m_host.Inventory.RemoveInventoryItem(srcId);
7027 }
7028 }
6589 // this will cause the delay even if the script pin or permissions were wrong - seems ok 7029 // this will cause the delay even if the script pin or permissions were wrong - seems ok
6590 ScriptSleep(3000); 7030 ScriptSleep(3000);
6591 } 7031 }
@@ -6648,19 +7088,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6648 public LSL_String llMD5String(string src, int nonce) 7088 public LSL_String llMD5String(string src, int nonce)
6649 { 7089 {
6650 m_host.AddScriptLPS(1); 7090 m_host.AddScriptLPS(1);
6651 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString())); 7091 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()), Encoding.UTF8);
6652 } 7092 }
6653 7093
6654 public LSL_String llSHA1String(string src) 7094 public LSL_String llSHA1String(string src)
6655 { 7095 {
6656 m_host.AddScriptLPS(1); 7096 m_host.AddScriptLPS(1);
6657 return Util.SHA1Hash(src).ToLower(); 7097 return Util.SHA1Hash(src, Encoding.UTF8).ToLower();
6658 } 7098 }
6659 7099
6660 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) 7100 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve)
6661 { 7101 {
6662 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7102 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6663 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7103 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7104 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7105 return shapeBlock;
6664 7106
6665 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 7107 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6666 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 7108 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6765,6 +7207,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6765 // Prim type box, cylinder and prism. 7207 // Prim type box, cylinder and prism.
6766 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte profileshape, byte pathcurve) 7208 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte profileshape, byte pathcurve)
6767 { 7209 {
7210 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7211 return;
7212
6768 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7213 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6769 ObjectShapePacket.ObjectDataBlock shapeBlock; 7214 ObjectShapePacket.ObjectDataBlock shapeBlock;
6770 7215
@@ -6818,6 +7263,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6818 // Prim type sphere. 7263 // Prim type sphere.
6819 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve) 7264 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve)
6820 { 7265 {
7266 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7267 return;
7268
6821 ObjectShapePacket.ObjectDataBlock shapeBlock; 7269 ObjectShapePacket.ObjectDataBlock shapeBlock;
6822 7270
6823 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve); 7271 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve);
@@ -6859,6 +7307,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6859 // Prim type torus, tube and ring. 7307 // Prim type torus, tube and ring.
6860 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte profileshape, byte pathcurve) 7308 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte profileshape, byte pathcurve)
6861 { 7309 {
7310 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7311 return;
7312
6862 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7313 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6863 ObjectShapePacket.ObjectDataBlock shapeBlock; 7314 ObjectShapePacket.ObjectDataBlock shapeBlock;
6864 7315
@@ -6994,6 +7445,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6994 // Prim type sculpt. 7445 // Prim type sculpt.
6995 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve) 7446 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve)
6996 { 7447 {
7448 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7449 return;
7450
6997 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7451 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6998 UUID sculptId; 7452 UUID sculptId;
6999 7453
@@ -7010,13 +7464,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7010 shapeBlock.PathScaleX = 100; 7464 shapeBlock.PathScaleX = 100;
7011 shapeBlock.PathScaleY = 150; 7465 shapeBlock.PathScaleY = 150;
7012 7466
7013 if (type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER && 7467 if ((type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER) == 0 &&
7014 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE && 7468 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE) == 0 &&
7015 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE && 7469 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE) == 0 &&
7016 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) 7470 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) == 0)
7017 { 7471 {
7018 // default 7472 // default
7019 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7473 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
7020 } 7474 }
7021 7475
7022 part.Shape.SetSculptProperties((byte)type, sculptId); 7476 part.Shape.SetSculptProperties((byte)type, sculptId);
@@ -7032,32 +7486,87 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7032 ScriptSleep(200); 7486 ScriptSleep(200);
7033 } 7487 }
7034 7488
7035 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) 7489 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
7036 { 7490 {
7037 m_host.AddScriptLPS(1); 7491 m_host.AddScriptLPS(1);
7038 7492
7039 setLinkPrimParams(linknumber, rules); 7493 setLinkPrimParams(linknumber, rules);
7040
7041 ScriptSleep(200);
7042 } 7494 }
7043 7495
7044 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7496 private void setLinkPrimParams(int linknumber, LSL_List rules)
7045 { 7497 {
7046 m_host.AddScriptLPS(1); 7498 List<SceneObjectPart> parts = GetLinkParts(linknumber);
7499 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7500 if (parts.Count>0)
7501 {
7502 try
7503 {
7504 parts[0].ParentGroup.areUpdatesSuspended = true;
7505 foreach (SceneObjectPart part in parts)
7506 SetPrimParams(part, rules);
7507 }
7508 finally
7509 {
7510 parts[0].ParentGroup.areUpdatesSuspended = false;
7511 }
7512 }
7513 if (avatars.Count > 0)
7514 {
7515 foreach (ScenePresence avatar in avatars)
7516 SetPrimParams(avatar, rules);
7517 }
7518 }
7047 7519
7048 setLinkPrimParams(linknumber, rules); 7520 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7521 {
7522 llSetLinkPrimitiveParamsFast(linknumber, rules);
7523 ScriptSleep(200);
7049 } 7524 }
7050 7525
7051 protected void setLinkPrimParams(int linknumber, LSL_List rules) 7526 protected void SetPrimParams(ScenePresence av, LSL_List rules)
7052 { 7527 {
7053 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7528 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
7529 //We only support PRIM_POSITION and PRIM_ROTATION
7054 7530
7055 foreach (SceneObjectPart part in parts) 7531 int idx = 0;
7056 SetPrimParams(part, rules); 7532
7533 while (idx < rules.Length)
7534 {
7535 int code = rules.GetLSLIntegerItem(idx++);
7536
7537 int remain = rules.Length - idx;
7538
7539
7540
7541 switch (code)
7542 {
7543 case (int)ScriptBaseClass.PRIM_POSITION:
7544 if (remain < 1)
7545 return;
7546 LSL_Vector v;
7547 v = rules.GetVector3Item(idx++);
7548 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
7549 av.SendAvatarDataToAllAgents();
7550
7551 break;
7552
7553 case (int)ScriptBaseClass.PRIM_ROTATION:
7554 if (remain < 1)
7555 return;
7556 LSL_Rotation r;
7557 r = rules.GetQuaternionItem(idx++);
7558 av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
7559 av.SendAvatarDataToAllAgents();
7560 break;
7561 }
7562 }
7057 } 7563 }
7058 7564
7059 protected void SetPrimParams(SceneObjectPart part, LSL_List rules) 7565 protected void SetPrimParams(SceneObjectPart part, LSL_List rules)
7060 { 7566 {
7567 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7568 return;
7569
7061 int idx = 0; 7570 int idx = 0;
7062 7571
7063 bool positionChanged = false; 7572 bool positionChanged = false;
@@ -7462,6 +7971,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7462 } 7971 }
7463 } 7972 }
7464 } 7973 }
7974
7975 if (positionChanged)
7976 {
7977 if (part.ParentGroup.RootPart == part)
7978 {
7979 SceneObjectGroup parent = part.ParentGroup;
7980 parent.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z));
7981 }
7982 else
7983 {
7984 part.OffsetPosition = new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z);
7985 SceneObjectGroup parent = part.ParentGroup;
7986 parent.HasGroupChanged = true;
7987 parent.ScheduleGroupForTerseUpdate();
7988 }
7989 }
7465 } 7990 }
7466 7991
7467 public LSL_String llStringToBase64(string str) 7992 public LSL_String llStringToBase64(string str)
@@ -7610,13 +8135,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7610 public LSL_Integer llGetNumberOfPrims() 8135 public LSL_Integer llGetNumberOfPrims()
7611 { 8136 {
7612 m_host.AddScriptLPS(1); 8137 m_host.AddScriptLPS(1);
7613 int avatarCount = 0; 8138 int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
7614 World.ForEachRootScenePresence(delegate(ScenePresence presence) 8139
7615 {
7616 if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
7617 avatarCount++;
7618 });
7619
7620 return m_host.ParentGroup.PrimCount + avatarCount; 8140 return m_host.ParentGroup.PrimCount + avatarCount;
7621 } 8141 }
7622 8142
@@ -7632,55 +8152,98 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7632 m_host.AddScriptLPS(1); 8152 m_host.AddScriptLPS(1);
7633 UUID objID = UUID.Zero; 8153 UUID objID = UUID.Zero;
7634 LSL_List result = new LSL_List(); 8154 LSL_List result = new LSL_List();
8155
8156 // If the ID is not valid, return null result
7635 if (!UUID.TryParse(obj, out objID)) 8157 if (!UUID.TryParse(obj, out objID))
7636 { 8158 {
7637 result.Add(new LSL_Vector()); 8159 result.Add(new LSL_Vector());
7638 result.Add(new LSL_Vector()); 8160 result.Add(new LSL_Vector());
7639 return result; 8161 return result;
7640 } 8162 }
8163
8164 // Check if this is an attached prim. If so, replace
8165 // the UUID with the avatar UUID and report it's bounding box
8166 SceneObjectPart part = World.GetSceneObjectPart(objID);
8167 if (part != null && part.ParentGroup.IsAttachment)
8168 objID = part.ParentGroup.AttachedAvatar;
8169
8170 // Find out if this is an avatar ID. If so, return it's box
7641 ScenePresence presence = World.GetScenePresence(objID); 8171 ScenePresence presence = World.GetScenePresence(objID);
7642 if (presence != null) 8172 if (presence != null)
7643 { 8173 {
7644 if (presence.ParentID == 0) // not sat on an object 8174 // As per LSL Wiki, there is no difference between sitting
8175 // and standing avatar since server 1.36
8176 LSL_Vector lower;
8177 LSL_Vector upper;
8178 if (presence.Animator.Animations.DefaultAnimation.AnimID
8179 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
7645 { 8180 {
7646 LSL_Vector lower; 8181 // This is for ground sitting avatars
7647 LSL_Vector upper; 8182 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7648 if (presence.Animator.Animations.DefaultAnimation.AnimID 8183 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7649 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 8184 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7650 {
7651 // This is for ground sitting avatars
7652 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7653 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7654 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7655 }
7656 else
7657 {
7658 // This is for standing/flying avatars
7659 float height = presence.Appearance.AvatarHeight / 2.0f;
7660 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7661 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7662 }
7663 result.Add(lower);
7664 result.Add(upper);
7665 return result;
7666 } 8185 }
7667 else 8186 else
7668 { 8187 {
7669 // sitting on an object so we need the bounding box of that 8188 // This is for standing/flying avatars
7670 // which should include the avatar so set the UUID to the 8189 float height = presence.Appearance.AvatarHeight / 2.0f;
7671 // UUID of the object the avatar is sat on and allow it to fall through 8190 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7672 // to processing an object 8191 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7673 SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
7674 objID = p.UUID;
7675 } 8192 }
8193
8194 // Adjust to the documented error offsets (see LSL Wiki)
8195 lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
8196 upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
8197
8198 if (lower.x > upper.x)
8199 lower.x = upper.x;
8200 if (lower.y > upper.y)
8201 lower.y = upper.y;
8202 if (lower.z > upper.z)
8203 lower.z = upper.z;
8204
8205 result.Add(lower);
8206 result.Add(upper);
8207 return result;
7676 } 8208 }
7677 SceneObjectPart part = World.GetSceneObjectPart(objID); 8209
8210 part = World.GetSceneObjectPart(objID);
7678 // Currently only works for single prims without a sitting avatar 8211 // Currently only works for single prims without a sitting avatar
7679 if (part != null) 8212 if (part != null)
7680 { 8213 {
7681 Vector3 halfSize = part.Scale / 2.0f; 8214 float minX;
7682 LSL_Vector lower = new LSL_Vector(halfSize.X * -1.0f, halfSize.Y * -1.0f, halfSize.Z * -1.0f); 8215 float maxX;
7683 LSL_Vector upper = new LSL_Vector(halfSize.X, halfSize.Y, halfSize.Z); 8216 float minY;
8217 float maxY;
8218 float minZ;
8219 float maxZ;
8220
8221 // This BBox is in sim coordinates, with the offset being
8222 // a contained point.
8223 Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
8224 out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
8225
8226 minX -= offsets[0].X;
8227 maxX -= offsets[0].X;
8228 minY -= offsets[0].Y;
8229 maxY -= offsets[0].Y;
8230 minZ -= offsets[0].Z;
8231 maxZ -= offsets[0].Z;
8232
8233 LSL_Vector lower;
8234 LSL_Vector upper;
8235
8236 // Adjust to the documented error offsets (see LSL Wiki)
8237 lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
8238 upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
8239
8240 if (lower.x > upper.x)
8241 lower.x = upper.x;
8242 if (lower.y > upper.y)
8243 lower.y = upper.y;
8244 if (lower.z > upper.z)
8245 lower.z = upper.z;
8246
7684 result.Add(lower); 8247 result.Add(lower);
7685 result.Add(upper); 8248 result.Add(upper);
7686 return result; 8249 return result;
@@ -7760,13 +8323,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7760 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X, 8323 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
7761 part.AbsolutePosition.Y, 8324 part.AbsolutePosition.Y,
7762 part.AbsolutePosition.Z); 8325 part.AbsolutePosition.Z);
7763 // For some reason, the part.AbsolutePosition.* values do not change if the
7764 // linkset is rotated; they always reflect the child prim's world position
7765 // as though the linkset is unrotated. This is incompatible behavior with SL's
7766 // implementation, so will break scripts imported from there (not to mention it
7767 // makes it more difficult to determine a child prim's actual inworld position).
7768 if (part.ParentID != 0)
7769 v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition();
7770 res.Add(v); 8326 res.Add(v);
7771 break; 8327 break;
7772 8328
@@ -7937,56 +8493,92 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7937 case (int)ScriptBaseClass.PRIM_BUMP_SHINY: 8493 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
7938 if (remain < 1) 8494 if (remain < 1)
7939 return res; 8495 return res;
7940 8496 face = (int)rules.GetLSLIntegerItem(idx++);
7941 face=(int)rules.GetLSLIntegerItem(idx++);
7942 8497
7943 tex = part.Shape.Textures; 8498 tex = part.Shape.Textures;
8499 int shiny;
7944 if (face == ScriptBaseClass.ALL_SIDES) 8500 if (face == ScriptBaseClass.ALL_SIDES)
7945 { 8501 {
7946 for (face = 0; face < GetNumberOfSides(part); face++) 8502 for (face = 0; face < GetNumberOfSides(part); face++)
7947 { 8503 {
7948 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8504 Shininess shinyness = tex.GetFace((uint)face).Shiny;
7949 // Convert Shininess to PRIM_SHINY_* 8505 if (shinyness == Shininess.High)
7950 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 8506 {
7951 // PRIM_BUMP_* 8507 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
7952 res.Add(new LSL_Integer((int)texface.Bump)); 8508 }
8509 else if (shinyness == Shininess.Medium)
8510 {
8511 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8512 }
8513 else if (shinyness == Shininess.Low)
8514 {
8515 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8516 }
8517 else
8518 {
8519 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8520 }
8521 res.Add(new LSL_Integer(shiny));
8522 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
7953 } 8523 }
7954 } 8524 }
7955 else 8525 else
7956 { 8526 {
7957 if (face >= 0 && face < GetNumberOfSides(part)) 8527 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8528 if (shinyness == Shininess.High)
7958 { 8529 {
7959 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8530 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
7960 // Convert Shininess to PRIM_SHINY_* 8531 }
7961 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 8532 else if (shinyness == Shininess.Medium)
7962 // PRIM_BUMP_* 8533 {
7963 res.Add(new LSL_Integer((int)texface.Bump)); 8534 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8535 }
8536 else if (shinyness == Shininess.Low)
8537 {
8538 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8539 }
8540 else
8541 {
8542 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
7964 } 8543 }
8544 res.Add(new LSL_Integer(shiny));
8545 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
7965 } 8546 }
7966 break; 8547 break;
7967 8548
7968 case (int)ScriptBaseClass.PRIM_FULLBRIGHT: 8549 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
7969 if (remain < 1) 8550 if (remain < 1)
7970 return res; 8551 return res;
7971 8552 face = (int)rules.GetLSLIntegerItem(idx++);
7972 face=(int)rules.GetLSLIntegerItem(idx++);
7973 8553
7974 tex = part.Shape.Textures; 8554 tex = part.Shape.Textures;
8555 int fullbright;
7975 if (face == ScriptBaseClass.ALL_SIDES) 8556 if (face == ScriptBaseClass.ALL_SIDES)
7976 { 8557 {
7977 for (face = 0; face < GetNumberOfSides(part); face++) 8558 for (face = 0; face < GetNumberOfSides(part); face++)
7978 { 8559 {
7979 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8560 if (tex.GetFace((uint)face).Fullbright == true)
7980 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 8561 {
8562 fullbright = ScriptBaseClass.TRUE;
8563 }
8564 else
8565 {
8566 fullbright = ScriptBaseClass.FALSE;
8567 }
8568 res.Add(new LSL_Integer(fullbright));
7981 } 8569 }
7982 } 8570 }
7983 else 8571 else
7984 { 8572 {
7985 if (face >= 0 && face < GetNumberOfSides(part)) 8573 if (tex.GetFace((uint)face).Fullbright == true)
7986 { 8574 {
7987 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8575 fullbright = ScriptBaseClass.TRUE;
7988 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 8576 }
8577 else
8578 {
8579 fullbright = ScriptBaseClass.FALSE;
7989 } 8580 }
8581 res.Add(new LSL_Integer(fullbright));
7990 } 8582 }
7991 break; 8583 break;
7992 8584
@@ -8008,27 +8600,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8008 break; 8600 break;
8009 8601
8010 case (int)ScriptBaseClass.PRIM_TEXGEN: 8602 case (int)ScriptBaseClass.PRIM_TEXGEN:
8603 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
8011 if (remain < 1) 8604 if (remain < 1)
8012 return res; 8605 return res;
8013 8606 face = (int)rules.GetLSLIntegerItem(idx++);
8014 face=(int)rules.GetLSLIntegerItem(idx++);
8015 8607
8016 tex = part.Shape.Textures; 8608 tex = part.Shape.Textures;
8017 if (face == ScriptBaseClass.ALL_SIDES) 8609 if (face == ScriptBaseClass.ALL_SIDES)
8018 { 8610 {
8019 for (face = 0; face < GetNumberOfSides(part); face++) 8611 for (face = 0; face < GetNumberOfSides(part); face++)
8020 { 8612 {
8021 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8613 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8022 // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc. 8614 {
8023 res.Add(new LSL_Integer((uint)texgen >> 1)); 8615 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8616 }
8617 else
8618 {
8619 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8620 }
8024 } 8621 }
8025 } 8622 }
8026 else 8623 else
8027 { 8624 {
8028 if (face >= 0 && face < GetNumberOfSides(part)) 8625 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8029 { 8626 {
8030 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8627 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8031 res.Add(new LSL_Integer((uint)texgen >> 1)); 8628 }
8629 else
8630 {
8631 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8032 } 8632 }
8033 } 8633 }
8034 break; 8634 break;
@@ -8051,28 +8651,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8051 case (int)ScriptBaseClass.PRIM_GLOW: 8651 case (int)ScriptBaseClass.PRIM_GLOW:
8052 if (remain < 1) 8652 if (remain < 1)
8053 return res; 8653 return res;
8054 8654 face = (int)rules.GetLSLIntegerItem(idx++);
8055 face=(int)rules.GetLSLIntegerItem(idx++);
8056 8655
8057 tex = part.Shape.Textures; 8656 tex = part.Shape.Textures;
8657 float primglow;
8058 if (face == ScriptBaseClass.ALL_SIDES) 8658 if (face == ScriptBaseClass.ALL_SIDES)
8059 { 8659 {
8060 for (face = 0; face < GetNumberOfSides(part); face++) 8660 for (face = 0; face < GetNumberOfSides(part); face++)
8061 { 8661 {
8062 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8662 primglow = tex.GetFace((uint)face).Glow;
8063 res.Add(new LSL_Float(texface.Glow)); 8663 res.Add(new LSL_Float(primglow));
8064 } 8664 }
8065 } 8665 }
8066 else 8666 else
8067 { 8667 {
8068 if (face >= 0 && face < GetNumberOfSides(part)) 8668 primglow = tex.GetFace((uint)face).Glow;
8069 { 8669 res.Add(new LSL_Float(primglow));
8070 Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
8071 res.Add(new LSL_Float(texface.Glow));
8072 }
8073 } 8670 }
8074 break; 8671 break;
8075
8076 case (int)ScriptBaseClass.PRIM_TEXT: 8672 case (int)ScriptBaseClass.PRIM_TEXT:
8077 Color4 textColor = part.GetTextColor(); 8673 Color4 textColor = part.GetTextColor();
8078 res.Add(new LSL_String(part.Text)); 8674 res.Add(new LSL_String(part.Text));
@@ -8624,8 +9220,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8624 // The function returns an ordered list 9220 // The function returns an ordered list
8625 // representing the tokens found in the supplied 9221 // representing the tokens found in the supplied
8626 // sources string. If two successive tokenizers 9222 // sources string. If two successive tokenizers
8627 // are encountered, then a NULL entry is added 9223 // are encountered, then a null-string entry is
8628 // to the list. 9224 // added to the list.
8629 // 9225 //
8630 // It is a precondition that the source and 9226 // It is a precondition that the source and
8631 // toekizer lisst are non-null. If they are null, 9227 // toekizer lisst are non-null. If they are null,
@@ -8633,7 +9229,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8633 // while their lengths are being determined. 9229 // while their lengths are being determined.
8634 // 9230 //
8635 // A small amount of working memoryis required 9231 // A small amount of working memoryis required
8636 // of approximately 8*#tokenizers. 9232 // of approximately 8*#tokenizers + 8*srcstrlen.
8637 // 9233 //
8638 // There are many ways in which this function 9234 // There are many ways in which this function
8639 // can be implemented, this implementation is 9235 // can be implemented, this implementation is
@@ -8649,155 +9245,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8649 // and eliminates redundant tokenizers as soon 9245 // and eliminates redundant tokenizers as soon
8650 // as is possible. 9246 // as is possible.
8651 // 9247 //
8652 // The implementation tries to avoid any copying 9248 // The implementation tries to minimize temporary
8653 // of arrays or other objects. 9249 // garbage generation.
8654 // </remarks> 9250 // </remarks>
8655 9251
8656 private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) 9252 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8657 { 9253 {
8658 int beginning = 0; 9254 return ParseString2List(src, separators, spacers, true);
8659 int srclen = src.Length; 9255 }
8660 int seplen = separators.Length;
8661 object[] separray = separators.Data;
8662 int spclen = spacers.Length;
8663 object[] spcarray = spacers.Data;
8664 int mlen = seplen+spclen;
8665
8666 int[] offset = new int[mlen+1];
8667 bool[] active = new bool[mlen];
8668
8669 int best;
8670 int j;
8671
8672 // Initial capacity reduces resize cost
8673 9256
8674 LSL_List tokens = new LSL_List(); 9257 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
9258 {
9259 int srclen = src.Length;
9260 int seplen = separators.Length;
9261 object[] separray = separators.Data;
9262 int spclen = spacers.Length;
9263 object[] spcarray = spacers.Data;
9264 int dellen = 0;
9265 string[] delarray = new string[seplen+spclen];
8675 9266
8676 // All entries are initially valid 9267 int outlen = 0;
9268 string[] outarray = new string[srclen*2+1];
8677 9269
8678 for (int i = 0; i < mlen; i++) 9270 int i, j;
8679 active[i] = true; 9271 string d;
8680 9272
8681 offset[mlen] = srclen; 9273 m_host.AddScriptLPS(1);
8682 9274
8683 while (beginning < srclen) 9275 /*
9276 * Convert separator and spacer lists to C# strings.
9277 * Also filter out null strings so we don't hang.
9278 */
9279 for (i = 0; i < seplen; i ++)
8684 { 9280 {
9281 d = separray[i].ToString();
9282 if (d.Length > 0)
9283 {
9284 delarray[dellen++] = d;
9285 }
9286 }
9287 seplen = dellen;
8685 9288
8686 best = mlen; // as bad as it gets 9289 for (i = 0; i < spclen; i ++)
9290 {
9291 d = spcarray[i].ToString();
9292 if (d.Length > 0)
9293 {
9294 delarray[dellen++] = d;
9295 }
9296 }
8687 9297
8688 // Scan for separators 9298 /*
9299 * Scan through source string from beginning to end.
9300 */
9301 for (i = 0;;)
9302 {
8689 9303
8690 for (j = 0; j < seplen; j++) 9304 /*
9305 * Find earliest delimeter in src starting at i (if any).
9306 */
9307 int earliestDel = -1;
9308 int earliestSrc = srclen;
9309 string earliestStr = null;
9310 for (j = 0; j < dellen; j ++)
8691 { 9311 {
8692 if (separray[j].ToString() == String.Empty) 9312 d = delarray[j];
8693 active[j] = false; 9313 if (d != null)
8694
8695 if (active[j])
8696 { 9314 {
8697 // scan all of the markers 9315 int index = src.IndexOf(d, i);
8698 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) 9316 if (index < 0)
8699 { 9317 {
8700 // not present at all 9318 delarray[j] = null; // delim nowhere in src, don't check it anymore
8701 active[j] = false;
8702 } 9319 }
8703 else 9320 else if (index < earliestSrc)
8704 { 9321 {
8705 // present and correct 9322 earliestSrc = index; // where delimeter starts in source string
8706 if (offset[j] < offset[best]) 9323 earliestDel = j; // where delimeter is in delarray[]
8707 { 9324 earliestStr = d; // the delimeter string from delarray[]
8708 // closest so far 9325 if (index == i) break; // can't do any better than found at beg of string
8709 best = j;
8710 if (offset[best] == beginning)
8711 break;
8712 }
8713 } 9326 }
8714 } 9327 }
8715 } 9328 }
8716 9329
8717 // Scan for spacers 9330 /*
8718 9331 * Output source string starting at i through start of earliest delimeter.
8719 if (offset[best] != beginning) 9332 */
9333 if (keepNulls || (earliestSrc > i))
8720 { 9334 {
8721 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 9335 outarray[outlen++] = src.Substring(i, earliestSrc - i);
8722 {
8723 if (spcarray[j-seplen].ToString() == String.Empty)
8724 active[j] = false;
8725
8726 if (active[j])
8727 {
8728 // scan all of the markers
8729 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
8730 {
8731 // not present at all
8732 active[j] = false;
8733 }
8734 else
8735 {
8736 // present and correct
8737 if (offset[j] < offset[best])
8738 {
8739 // closest so far
8740 best = j;
8741 }
8742 }
8743 }
8744 }
8745 } 9336 }
8746 9337
8747 // This is the normal exit from the scanning loop 9338 /*
9339 * If no delimeter found at or after i, we're done scanning.
9340 */
9341 if (earliestDel < 0) break;
8748 9342
8749 if (best == mlen) 9343 /*
9344 * If delimeter was a spacer, output the spacer.
9345 */
9346 if (earliestDel >= seplen)
8750 { 9347 {
8751 // no markers were found on this pass 9348 outarray[outlen++] = earliestStr;
8752 // so we're pretty much done
8753 if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
8754 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
8755 break;
8756 } 9349 }
8757 9350
8758 // Otherwise we just add the newly delimited token 9351 /*
8759 // and recalculate where the search should continue. 9352 * Look at rest of src string following delimeter.
8760 if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) 9353 */
8761 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 9354 i = earliestSrc + earliestStr.Length;
8762
8763 if (best < seplen)
8764 {
8765 beginning = offset[best] + (separray[best].ToString()).Length;
8766 }
8767 else
8768 {
8769 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
8770 string str = spcarray[best - seplen].ToString();
8771 if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
8772 tokens.Add(new LSL_String(str));
8773 }
8774 } 9355 }
8775 9356
8776 // This an awkward an not very intuitive boundary case. If the 9357 /*
8777 // last substring is a tokenizer, then there is an implied trailing 9358 * Make up an exact-sized output array suitable for an LSL_List object.
8778 // null list entry. Hopefully the single comparison will not be too 9359 */
8779 // arduous. Alternatively the 'break' could be replced with a return 9360 object[] outlist = new object[outlen];
8780 // but that's shabby programming. 9361 for (i = 0; i < outlen; i ++)
8781
8782 if ((beginning == srclen) && (keepNulls))
8783 { 9362 {
8784 if (srclen != 0) 9363 outlist[i] = new LSL_String(outarray[i]);
8785 tokens.Add(new LSL_String(""));
8786 } 9364 }
8787 9365 return new LSL_List(outlist);
8788 return tokens;
8789 }
8790
8791 public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
8792 {
8793 m_host.AddScriptLPS(1);
8794 return this.ParseString(src, separators, spacers, false);
8795 }
8796
8797 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8798 {
8799 m_host.AddScriptLPS(1);
8800 return this.ParseString(src, separators, spacers, true);
8801 } 9366 }
8802 9367
8803 public LSL_Integer llGetObjectPermMask(int mask) 9368 public LSL_Integer llGetObjectPermMask(int mask)
@@ -8874,28 +9439,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8874 { 9439 {
8875 m_host.AddScriptLPS(1); 9440 m_host.AddScriptLPS(1);
8876 9441
8877 lock (m_host.TaskInventory) 9442 m_host.TaskInventory.LockItemsForRead(true);
9443 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8878 { 9444 {
8879 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9445 if (inv.Value.Name == item)
8880 { 9446 {
8881 if (inv.Value.Name == item) 9447 m_host.TaskInventory.LockItemsForRead(false);
9448 switch (mask)
8882 { 9449 {
8883 switch (mask) 9450 case 0:
8884 { 9451 return (int)inv.Value.BasePermissions;
8885 case 0: 9452 case 1:
8886 return (int)inv.Value.BasePermissions; 9453 return (int)inv.Value.CurrentPermissions;
8887 case 1: 9454 case 2:
8888 return (int)inv.Value.CurrentPermissions; 9455 return (int)inv.Value.GroupPermissions;
8889 case 2: 9456 case 3:
8890 return (int)inv.Value.GroupPermissions; 9457 return (int)inv.Value.EveryonePermissions;
8891 case 3: 9458 case 4:
8892 return (int)inv.Value.EveryonePermissions; 9459 return (int)inv.Value.NextPermissions;
8893 case 4:
8894 return (int)inv.Value.NextPermissions;
8895 }
8896 } 9460 }
8897 } 9461 }
8898 } 9462 }
9463 m_host.TaskInventory.LockItemsForRead(false);
8899 9464
8900 return -1; 9465 return -1;
8901 } 9466 }
@@ -8942,16 +9507,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8942 { 9507 {
8943 m_host.AddScriptLPS(1); 9508 m_host.AddScriptLPS(1);
8944 9509
8945 lock (m_host.TaskInventory) 9510 m_host.TaskInventory.LockItemsForRead(true);
9511 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8946 { 9512 {
8947 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9513 if (inv.Value.Name == item)
8948 { 9514 {
8949 if (inv.Value.Name == item) 9515 m_host.TaskInventory.LockItemsForRead(false);
8950 { 9516 return inv.Value.CreatorID.ToString();
8951 return inv.Value.CreatorID.ToString();
8952 }
8953 } 9517 }
8954 } 9518 }
9519 m_host.TaskInventory.LockItemsForRead(false);
8955 9520
8956 llSay(0, "No item name '" + item + "'"); 9521 llSay(0, "No item name '" + item + "'");
8957 9522
@@ -9099,7 +9664,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9099 } 9664 }
9100 9665
9101 /// <summary> 9666 /// <summary>
9102 /// illListReplaceList removes the sub-list defined by the inclusive indices 9667 /// llListReplaceList removes the sub-list defined by the inclusive indices
9103 /// start and end and inserts the src list in its place. The inclusive 9668 /// start and end and inserts the src list in its place. The inclusive
9104 /// nature of the indices means that at least one element must be deleted 9669 /// nature of the indices means that at least one element must be deleted
9105 /// if the indices are within the bounds of the existing list. I.e. 2,2 9670 /// if the indices are within the bounds of the existing list. I.e. 2,2
@@ -9156,16 +9721,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9156 // based upon end. Note that if end exceeds the upper 9721 // based upon end. Note that if end exceeds the upper
9157 // bound in this case, the entire destination list 9722 // bound in this case, the entire destination list
9158 // is removed. 9723 // is removed.
9159 else 9724 else if (start == 0)
9160 { 9725 {
9161 if (end + 1 < dest.Length) 9726 if (end + 1 < dest.Length)
9162 {
9163 return src + dest.GetSublist(end + 1, -1); 9727 return src + dest.GetSublist(end + 1, -1);
9164 }
9165 else 9728 else
9166 {
9167 return src; 9729 return src;
9168 } 9730 }
9731 else // Start < 0
9732 {
9733 if (end + 1 < dest.Length)
9734 return dest.GetSublist(end + 1, -1);
9735 else
9736 return new LSL_List();
9169 } 9737 }
9170 } 9738 }
9171 // Finally, if start > end, we strip away a prefix and 9739 // Finally, if start > end, we strip away a prefix and
@@ -9216,17 +9784,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9216 int width = 0; 9784 int width = 0;
9217 int height = 0; 9785 int height = 0;
9218 9786
9219 ParcelMediaCommandEnum? commandToSend = null; 9787 uint commandToSend = 0;
9220 float time = 0.0f; // default is from start 9788 float time = 0.0f; // default is from start
9221 9789
9222 ScenePresence presence = null; 9790 ScenePresence presence = null;
9223 9791
9224 for (int i = 0; i < commandList.Data.Length; i++) 9792 for (int i = 0; i < commandList.Data.Length; i++)
9225 { 9793 {
9226 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 9794 uint command = (uint)(commandList.GetLSLIntegerItem(i));
9227 switch (command) 9795 switch (command)
9228 { 9796 {
9229 case ParcelMediaCommandEnum.Agent: 9797 case (uint)ParcelMediaCommandEnum.Agent:
9230 // we send only to one agent 9798 // we send only to one agent
9231 if ((i + 1) < commandList.Length) 9799 if ((i + 1) < commandList.Length)
9232 { 9800 {
@@ -9243,25 +9811,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9243 } 9811 }
9244 break; 9812 break;
9245 9813
9246 case ParcelMediaCommandEnum.Loop: 9814 case (uint)ParcelMediaCommandEnum.Loop:
9247 loop = 1; 9815 loop = 1;
9248 commandToSend = command; 9816 commandToSend = command;
9249 update = true; //need to send the media update packet to set looping 9817 update = true; //need to send the media update packet to set looping
9250 break; 9818 break;
9251 9819
9252 case ParcelMediaCommandEnum.Play: 9820 case (uint)ParcelMediaCommandEnum.Play:
9253 loop = 0; 9821 loop = 0;
9254 commandToSend = command; 9822 commandToSend = command;
9255 update = true; //need to send the media update packet to make sure it doesn't loop 9823 update = true; //need to send the media update packet to make sure it doesn't loop
9256 break; 9824 break;
9257 9825
9258 case ParcelMediaCommandEnum.Pause: 9826 case (uint)ParcelMediaCommandEnum.Pause:
9259 case ParcelMediaCommandEnum.Stop: 9827 case (uint)ParcelMediaCommandEnum.Stop:
9260 case ParcelMediaCommandEnum.Unload: 9828 case (uint)ParcelMediaCommandEnum.Unload:
9261 commandToSend = command; 9829 commandToSend = command;
9262 break; 9830 break;
9263 9831
9264 case ParcelMediaCommandEnum.Url: 9832 case (uint)ParcelMediaCommandEnum.Url:
9265 if ((i + 1) < commandList.Length) 9833 if ((i + 1) < commandList.Length)
9266 { 9834 {
9267 if (commandList.Data[i + 1] is LSL_String) 9835 if (commandList.Data[i + 1] is LSL_String)
@@ -9274,7 +9842,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9274 } 9842 }
9275 break; 9843 break;
9276 9844
9277 case ParcelMediaCommandEnum.Texture: 9845 case (uint)ParcelMediaCommandEnum.Texture:
9278 if ((i + 1) < commandList.Length) 9846 if ((i + 1) < commandList.Length)
9279 { 9847 {
9280 if (commandList.Data[i + 1] is LSL_String) 9848 if (commandList.Data[i + 1] is LSL_String)
@@ -9287,7 +9855,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9287 } 9855 }
9288 break; 9856 break;
9289 9857
9290 case ParcelMediaCommandEnum.Time: 9858 case (uint)ParcelMediaCommandEnum.Time:
9291 if ((i + 1) < commandList.Length) 9859 if ((i + 1) < commandList.Length)
9292 { 9860 {
9293 if (commandList.Data[i + 1] is LSL_Float) 9861 if (commandList.Data[i + 1] is LSL_Float)
@@ -9299,7 +9867,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9299 } 9867 }
9300 break; 9868 break;
9301 9869
9302 case ParcelMediaCommandEnum.AutoAlign: 9870 case (uint)ParcelMediaCommandEnum.AutoAlign:
9303 if ((i + 1) < commandList.Length) 9871 if ((i + 1) < commandList.Length)
9304 { 9872 {
9305 if (commandList.Data[i + 1] is LSL_Integer) 9873 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9313,7 +9881,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9313 } 9881 }
9314 break; 9882 break;
9315 9883
9316 case ParcelMediaCommandEnum.Type: 9884 case (uint)ParcelMediaCommandEnum.Type:
9317 if ((i + 1) < commandList.Length) 9885 if ((i + 1) < commandList.Length)
9318 { 9886 {
9319 if (commandList.Data[i + 1] is LSL_String) 9887 if (commandList.Data[i + 1] is LSL_String)
@@ -9326,7 +9894,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9326 } 9894 }
9327 break; 9895 break;
9328 9896
9329 case ParcelMediaCommandEnum.Desc: 9897 case (uint)ParcelMediaCommandEnum.Desc:
9330 if ((i + 1) < commandList.Length) 9898 if ((i + 1) < commandList.Length)
9331 { 9899 {
9332 if (commandList.Data[i + 1] is LSL_String) 9900 if (commandList.Data[i + 1] is LSL_String)
@@ -9339,7 +9907,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9339 } 9907 }
9340 break; 9908 break;
9341 9909
9342 case ParcelMediaCommandEnum.Size: 9910 case (uint)ParcelMediaCommandEnum.Size:
9343 if ((i + 2) < commandList.Length) 9911 if ((i + 2) < commandList.Length)
9344 { 9912 {
9345 if (commandList.Data[i + 1] is LSL_Integer) 9913 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9409,7 +9977,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9409 } 9977 }
9410 } 9978 }
9411 9979
9412 if (commandToSend != null) 9980 if (commandToSend != 0)
9413 { 9981 {
9414 // the commandList contained a start/stop/... command, too 9982 // the commandList contained a start/stop/... command, too
9415 if (presence == null) 9983 if (presence == null)
@@ -9446,7 +10014,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9446 10014
9447 if (aList.Data[i] != null) 10015 if (aList.Data[i] != null)
9448 { 10016 {
9449 switch ((ParcelMediaCommandEnum) aList.Data[i]) 10017 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
9450 { 10018 {
9451 case ParcelMediaCommandEnum.Url: 10019 case ParcelMediaCommandEnum.Url:
9452 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); 10020 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL));
@@ -9489,16 +10057,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9489 { 10057 {
9490 m_host.AddScriptLPS(1); 10058 m_host.AddScriptLPS(1);
9491 10059
9492 lock (m_host.TaskInventory) 10060 m_host.TaskInventory.LockItemsForRead(true);
10061 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9493 { 10062 {
9494 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 10063 if (inv.Value.Name == name)
9495 { 10064 {
9496 if (inv.Value.Name == name) 10065 m_host.TaskInventory.LockItemsForRead(false);
9497 { 10066 return inv.Value.Type;
9498 return inv.Value.Type;
9499 }
9500 } 10067 }
9501 } 10068 }
10069 m_host.TaskInventory.LockItemsForRead(false);
9502 10070
9503 return -1; 10071 return -1;
9504 } 10072 }
@@ -9509,15 +10077,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9509 10077
9510 if (quick_pay_buttons.Data.Length < 4) 10078 if (quick_pay_buttons.Data.Length < 4)
9511 { 10079 {
9512 LSLError("List must have at least 4 elements"); 10080 int x;
9513 return; 10081 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
10082 {
10083 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
10084 }
9514 } 10085 }
9515 m_host.ParentGroup.RootPart.PayPrice[0]=price; 10086 int[] nPrice = new int[5];
9516 10087 nPrice[0] = price;
9517 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 10088 nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
9518 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 10089 nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
9519 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 10090 nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
9520 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 10091 nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
10092 m_host.ParentGroup.RootPart.PayPrice = nPrice;
9521 m_host.ParentGroup.HasGroupChanged = true; 10093 m_host.ParentGroup.HasGroupChanged = true;
9522 } 10094 }
9523 10095
@@ -9529,17 +10101,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9529 if (invItemID == UUID.Zero) 10101 if (invItemID == UUID.Zero)
9530 return new LSL_Vector(); 10102 return new LSL_Vector();
9531 10103
9532 lock (m_host.TaskInventory) 10104 m_host.TaskInventory.LockItemsForRead(true);
10105 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9533 { 10106 {
9534 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 10107 m_host.TaskInventory.LockItemsForRead(false);
9535 return new LSL_Vector(); 10108 return new LSL_Vector();
10109 }
9536 10110
9537 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 10111 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9538 { 10112 {
9539 ShoutError("No permissions to track the camera"); 10113 ShoutError("No permissions to track the camera");
9540 return new LSL_Vector(); 10114 m_host.TaskInventory.LockItemsForRead(false);
9541 } 10115 return new LSL_Vector();
9542 } 10116 }
10117 m_host.TaskInventory.LockItemsForRead(false);
9543 10118
9544 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10119 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9545 if (presence != null) 10120 if (presence != null)
@@ -9557,17 +10132,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9557 if (invItemID == UUID.Zero) 10132 if (invItemID == UUID.Zero)
9558 return new LSL_Rotation(); 10133 return new LSL_Rotation();
9559 10134
9560 lock (m_host.TaskInventory) 10135 m_host.TaskInventory.LockItemsForRead(true);
10136 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9561 { 10137 {
9562 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 10138 m_host.TaskInventory.LockItemsForRead(false);
9563 return new LSL_Rotation(); 10139 return new LSL_Rotation();
9564 10140 }
9565 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 10141 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9566 { 10142 {
9567 ShoutError("No permissions to track the camera"); 10143 ShoutError("No permissions to track the camera");
9568 return new LSL_Rotation(); 10144 m_host.TaskInventory.LockItemsForRead(false);
9569 } 10145 return new LSL_Rotation();
9570 } 10146 }
10147 m_host.TaskInventory.LockItemsForRead(false);
9571 10148
9572 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10149 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9573 if (presence != null) 10150 if (presence != null)
@@ -9629,8 +10206,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9629 { 10206 {
9630 m_host.AddScriptLPS(1); 10207 m_host.AddScriptLPS(1);
9631 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0); 10208 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0);
9632 if (detectedParams == null) return; // only works on the first detected avatar 10209 if (detectedParams == null)
9633 10210 {
10211 if (m_host.ParentGroup.IsAttachment == true)
10212 {
10213 detectedParams = new DetectParams();
10214 detectedParams.Key = m_host.OwnerID;
10215 }
10216 else
10217 {
10218 return;
10219 }
10220 }
10221
9634 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 10222 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
9635 if (avatar != null) 10223 if (avatar != null)
9636 { 10224 {
@@ -9638,6 +10226,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9638 new Vector3((float)pos.x, (float)pos.y, (float)pos.z), 10226 new Vector3((float)pos.x, (float)pos.y, (float)pos.z),
9639 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z)); 10227 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z));
9640 } 10228 }
10229
9641 ScriptSleep(1000); 10230 ScriptSleep(1000);
9642 } 10231 }
9643 10232
@@ -9730,14 +10319,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9730 if (objectID == UUID.Zero) return; 10319 if (objectID == UUID.Zero) return;
9731 10320
9732 UUID agentID; 10321 UUID agentID;
9733 lock (m_host.TaskInventory) 10322 m_host.TaskInventory.LockItemsForRead(true);
9734 { 10323 // we need the permission first, to know which avatar we want to set the camera for
9735 // we need the permission first, to know which avatar we want to set the camera for 10324 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9736 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9737 10325
9738 if (agentID == UUID.Zero) return; 10326 if (agentID == UUID.Zero)
9739 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 10327 {
10328 m_host.TaskInventory.LockItemsForRead(false);
10329 return;
9740 } 10330 }
10331 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10332 {
10333 m_host.TaskInventory.LockItemsForRead(false);
10334 return;
10335 }
10336 m_host.TaskInventory.LockItemsForRead(false);
9741 10337
9742 ScenePresence presence = World.GetScenePresence(agentID); 10338 ScenePresence presence = World.GetScenePresence(agentID);
9743 10339
@@ -9746,12 +10342,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9746 10342
9747 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 10343 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
9748 object[] data = rules.Data; 10344 object[] data = rules.Data;
9749 for (int i = 0; i < data.Length; ++i) { 10345 for (int i = 0; i < data.Length; ++i)
10346 {
9750 int type = Convert.ToInt32(data[i++].ToString()); 10347 int type = Convert.ToInt32(data[i++].ToString());
9751 if (i >= data.Length) break; // odd number of entries => ignore the last 10348 if (i >= data.Length) break; // odd number of entries => ignore the last
9752 10349
9753 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 10350 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
9754 switch (type) { 10351 switch (type)
10352 {
9755 case ScriptBaseClass.CAMERA_FOCUS: 10353 case ScriptBaseClass.CAMERA_FOCUS:
9756 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 10354 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
9757 case ScriptBaseClass.CAMERA_POSITION: 10355 case ScriptBaseClass.CAMERA_POSITION:
@@ -9787,12 +10385,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9787 10385
9788 // we need the permission first, to know which avatar we want to clear the camera for 10386 // we need the permission first, to know which avatar we want to clear the camera for
9789 UUID agentID; 10387 UUID agentID;
9790 lock (m_host.TaskInventory) 10388 m_host.TaskInventory.LockItemsForRead(true);
10389 agentID = m_host.TaskInventory[invItemID].PermsGranter;
10390 if (agentID == UUID.Zero)
9791 { 10391 {
9792 agentID = m_host.TaskInventory[invItemID].PermsGranter; 10392 m_host.TaskInventory.LockItemsForRead(false);
9793 if (agentID == UUID.Zero) return; 10393 return;
9794 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
9795 } 10394 }
10395 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10396 {
10397 m_host.TaskInventory.LockItemsForRead(false);
10398 return;
10399 }
10400 m_host.TaskInventory.LockItemsForRead(false);
9796 10401
9797 ScenePresence presence = World.GetScenePresence(agentID); 10402 ScenePresence presence = World.GetScenePresence(agentID);
9798 10403
@@ -9859,19 +10464,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9859 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 10464 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
9860 { 10465 {
9861 m_host.AddScriptLPS(1); 10466 m_host.AddScriptLPS(1);
9862 string ret = String.Empty; 10467
9863 string src1 = llBase64ToString(str1); 10468 if (str1 == String.Empty)
9864 string src2 = llBase64ToString(str2); 10469 return String.Empty;
9865 int c = 0; 10470 if (str2 == String.Empty)
9866 for (int i = 0; i < src1.Length; i++) 10471 return str1;
10472
10473 int len = str2.Length;
10474 if ((len % 4) != 0) // LL is EVIL!!!!
9867 { 10475 {
9868 ret += (char) (src1[i] ^ src2[c]); 10476 while (str2.EndsWith("="))
10477 str2 = str2.Substring(0, str2.Length - 1);
10478
10479 len = str2.Length;
10480 int mod = len % 4;
10481
10482 if (mod == 1)
10483 str2 = str2.Substring(0, str2.Length - 1);
10484 else if (mod == 2)
10485 str2 += "==";
10486 else if (mod == 3)
10487 str2 += "=";
10488 }
10489
10490 byte[] data1;
10491 byte[] data2;
10492 try
10493 {
10494 data1 = Convert.FromBase64String(str1);
10495 data2 = Convert.FromBase64String(str2);
10496 }
10497 catch (Exception)
10498 {
10499 return new LSL_String(String.Empty);
10500 }
10501
10502 byte[] d2 = new Byte[data1.Length];
10503 int pos = 0;
10504
10505 if (data1.Length <= data2.Length)
10506 {
10507 Array.Copy(data2, 0, d2, 0, data1.Length);
10508 }
10509 else
10510 {
10511 while (pos < data1.Length)
10512 {
10513 len = data1.Length - pos;
10514 if (len > data2.Length)
10515 len = data2.Length;
9869 10516
9870 c++; 10517 Array.Copy(data2, 0, d2, pos, len);
9871 if (c >= src2.Length) 10518 pos += len;
9872 c = 0; 10519 }
9873 } 10520 }
9874 return llStringToBase64(ret); 10521
10522 for (pos = 0 ; pos < data1.Length ; pos++ )
10523 data1[pos] ^= d2[pos];
10524
10525 return Convert.ToBase64String(data1);
9875 } 10526 }
9876 10527
9877 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 10528 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -9928,12 +10579,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9928 Regex r = new Regex(authregex); 10579 Regex r = new Regex(authregex);
9929 int[] gnums = r.GetGroupNumbers(); 10580 int[] gnums = r.GetGroupNumbers();
9930 Match m = r.Match(url); 10581 Match m = r.Match(url);
9931 if (m.Success) { 10582 if (m.Success)
9932 for (int i = 1; i < gnums.Length; i++) { 10583 {
10584 for (int i = 1; i < gnums.Length; i++)
10585 {
9933 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 10586 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
9934 //CaptureCollection cc = g.Captures; 10587 //CaptureCollection cc = g.Captures;
9935 } 10588 }
9936 if (m.Groups.Count == 5) { 10589 if (m.Groups.Count == 5)
10590 {
9937 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 10591 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
9938 url = m.Groups[1].ToString() + m.Groups[4].ToString(); 10592 url = m.Groups[1].ToString() + m.Groups[4].ToString();
9939 } 10593 }
@@ -10219,15 +10873,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10219 10873
10220 internal UUID ScriptByName(string name) 10874 internal UUID ScriptByName(string name)
10221 { 10875 {
10222 lock (m_host.TaskInventory) 10876 m_host.TaskInventory.LockItemsForRead(true);
10877
10878 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
10223 { 10879 {
10224 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 10880 if (item.Type == 10 && item.Name == name)
10225 { 10881 {
10226 if (item.Type == 10 && item.Name == name) 10882 m_host.TaskInventory.LockItemsForRead(false);
10227 return item.ItemID; 10883 return item.ItemID;
10228 } 10884 }
10229 } 10885 }
10230 10886
10887 m_host.TaskInventory.LockItemsForRead(false);
10888
10231 return UUID.Zero; 10889 return UUID.Zero;
10232 } 10890 }
10233 10891
@@ -10268,6 +10926,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10268 { 10926 {
10269 m_host.AddScriptLPS(1); 10927 m_host.AddScriptLPS(1);
10270 10928
10929 //Clone is thread safe
10271 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10930 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10272 10931
10273 UUID assetID = UUID.Zero; 10932 UUID assetID = UUID.Zero;
@@ -10330,6 +10989,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10330 { 10989 {
10331 m_host.AddScriptLPS(1); 10990 m_host.AddScriptLPS(1);
10332 10991
10992 //Clone is thread safe
10333 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10993 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10334 10994
10335 UUID assetID = UUID.Zero; 10995 UUID assetID = UUID.Zero;
@@ -10410,15 +11070,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10410 return GetLinkPrimitiveParams(obj, rules); 11070 return GetLinkPrimitiveParams(obj, rules);
10411 } 11071 }
10412 11072
10413 public void print(string str) 11073 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
10414 { 11074 {
10415 // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print 11075 List<SceneObjectPart> parts = GetLinkParts(link);
10416 IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_itemID, "OSSL"); 11076 if (parts.Count < 1)
10417 if (ossl != null) 11077 return 0;
10418 { 11078
10419 ossl.CheckThreatLevel(ThreatLevel.High, "print"); 11079 return GetNumberOfSides(parts[0]);
10420 m_log.Info("LSL print():" + str);
10421 }
10422 } 11080 }
10423 11081
10424 private string Name2Username(string name) 11082 private string Name2Username(string name)
@@ -10464,6 +11122,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10464 return rq.ToString(); 11122 return rq.ToString();
10465 } 11123 }
10466 11124
11125 private void SayShoutTimerElapsed(Object sender, ElapsedEventArgs args)
11126 {
11127 m_SayShoutCount = 0;
11128 }
10467 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) 11129 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
10468 { 11130 {
10469 m_host.AddScriptLPS(1); 11131 m_host.AddScriptLPS(1);
@@ -10633,22 +11295,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10633 NotImplemented("llGetSPMaxMemory"); 11295 NotImplemented("llGetSPMaxMemory");
10634 } 11296 }
10635 11297
10636 public void llGetUsedMemory() 11298 public virtual LSL_Integer llGetUsedMemory()
10637 { 11299 {
10638 m_host.AddScriptLPS(1); 11300 m_host.AddScriptLPS(1);
10639 NotImplemented("llGetUsedMemory"); 11301 NotImplemented("llGetUsedMemory");
11302 return 0;
10640 } 11303 }
10641 11304
10642 public void llScriptProfiler(LSL_Integer flags) 11305 public void llScriptProfiler(LSL_Integer flags)
10643 { 11306 {
10644 m_host.AddScriptLPS(1); 11307 m_host.AddScriptLPS(1);
10645 NotImplemented("llScriptProfiler"); 11308 //NotImplemented("llScriptProfiler");
10646 } 11309 }
10647 11310
10648 public void llSetSoundQueueing(int queue) 11311 public void llSetSoundQueueing(int queue)
10649 { 11312 {
10650 m_host.AddScriptLPS(1); 11313 m_host.AddScriptLPS(1);
10651 NotImplemented("llSetSoundQueueing");
10652 } 11314 }
10653 11315
10654 public void llCollisionSprite(string impact_sprite) 11316 public void llCollisionSprite(string impact_sprite)
@@ -10660,7 +11322,133 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10660 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 11322 public void llGodLikeRezObject(string inventory, LSL_Vector pos)
10661 { 11323 {
10662 m_host.AddScriptLPS(1); 11324 m_host.AddScriptLPS(1);
10663 NotImplemented("llGodLikeRezObject"); 11325
11326 if (!World.Permissions.IsGod(m_host.OwnerID))
11327 NotImplemented("llGodLikeRezObject");
11328
11329 AssetBase rezAsset = World.AssetService.Get(inventory);
11330 if (rezAsset == null)
11331 {
11332 llSay(0, "Asset not found");
11333 return;
11334 }
11335
11336 SceneObjectGroup group = null;
11337
11338 try
11339 {
11340 string xmlData = Utils.BytesToString(rezAsset.Data);
11341 group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
11342 }
11343 catch
11344 {
11345 llSay(0, "Asset not found");
11346 return;
11347 }
11348
11349 if (group == null)
11350 {
11351 llSay(0, "Asset not found");
11352 return;
11353 }
11354
11355 group.RootPart.AttachPoint = group.RootPart.Shape.State;
11356 group.RootPart.AttachOffset = group.AbsolutePosition;
11357
11358 group.ResetIDs();
11359
11360 Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
11361 World.AddNewSceneObject(group, true, llpos, Quaternion.Identity, Vector3.Zero);
11362 group.CreateScriptInstances(0, true, World.DefaultScriptEngine, 3);
11363 group.ScheduleGroupForFullUpdate();
11364
11365 // objects rezzed with this method are die_at_edge by default.
11366 group.RootPart.SetDieAtEdge(true);
11367
11368 group.ResumeScripts();
11369
11370 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
11371 "object_rez", new Object[] {
11372 new LSL_String(
11373 group.RootPart.UUID.ToString()) },
11374 new DetectParams[0]));
11375 }
11376
11377 public LSL_String llTransferLindenDollars(string destination, int amount)
11378 {
11379 UUID txn = UUID.Random();
11380
11381 Util.FireAndForget(delegate(object x)
11382 {
11383 int replycode = 0;
11384 string replydata = destination + "," + amount.ToString();
11385
11386 try
11387 {
11388 UUID invItemID=InventorySelf();
11389 if (invItemID == UUID.Zero)
11390 {
11391 replydata = "SERVICE_ERROR";
11392 return;
11393 }
11394
11395 m_host.AddScriptLPS(1);
11396
11397 m_host.TaskInventory.LockItemsForRead(true);
11398 TaskInventoryItem item = m_host.TaskInventory[invItemID];
11399 m_host.TaskInventory.LockItemsForRead(false);
11400
11401 if (item.PermsGranter == UUID.Zero)
11402 {
11403 replydata = "MISSING_PERMISSION_DEBIT";
11404 return;
11405 }
11406
11407 if ((item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0)
11408 {
11409 replydata = "MISSING_PERMISSION_DEBIT";
11410 return;
11411 }
11412
11413 UUID toID = new UUID();
11414
11415 if (!UUID.TryParse(destination, out toID))
11416 {
11417 replydata = "INVALID_AGENT";
11418 return;
11419 }
11420
11421 IMoneyModule money = World.RequestModuleInterface<IMoneyModule>();
11422
11423 if (money == null)
11424 {
11425 replydata = "TRANSFERS_DISABLED";
11426 return;
11427 }
11428
11429 bool result = money.ObjectGiveMoney(
11430 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount);
11431
11432 if (result)
11433 {
11434 replycode = 1;
11435 return;
11436 }
11437
11438 replydata = "LINDENDOLLAR_INSUFFICIENTFUNDS";
11439 }
11440 finally
11441 {
11442 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
11443 "transaction_result", new Object[] {
11444 new LSL_String(txn.ToString()),
11445 new LSL_Integer(replycode),
11446 new LSL_String(replydata) },
11447 new DetectParams[0]));
11448 }
11449 });
11450
11451 return txn.ToString();
10664 } 11452 }
10665 11453
10666 #endregion 11454 #endregion
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index f3206ac..c0d2f38 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -137,6 +137,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
137 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; 137 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
138 internal float m_ScriptDelayFactor = 1.0f; 138 internal float m_ScriptDelayFactor = 1.0f;
139 internal float m_ScriptDistanceFactor = 1.0f; 139 internal float m_ScriptDistanceFactor = 1.0f;
140 internal bool m_debuggerSafe = false;
140 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); 141 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
141 142
142 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) 143 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
@@ -145,6 +146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
145 m_host = host; 146 m_host = host;
146 m_localID = localID; 147 m_localID = localID;
147 m_itemID = itemID; 148 m_itemID = itemID;
149 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
148 150
149 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) 151 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
150 m_OSFunctionsEnabled = true; 152 m_OSFunctionsEnabled = true;
@@ -203,7 +205,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
203 205
204 internal void OSSLError(string msg) 206 internal void OSSLError(string msg)
205 { 207 {
206 throw new Exception("OSSL Runtime Error: " + msg); 208 if (m_debuggerSafe)
209 {
210 OSSLShoutError(msg);
211 }
212 else
213 {
214 throw new Exception("OSSL Runtime Error: " + msg);
215 }
207 } 216 }
208 217
209 private void InitLSL() 218 private void InitLSL()
@@ -894,18 +903,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
894 if (target != null) 903 if (target != null)
895 { 904 {
896 UUID animID=UUID.Zero; 905 UUID animID=UUID.Zero;
897 lock (m_host.TaskInventory) 906 m_host.TaskInventory.LockItemsForRead(true);
907 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
898 { 908 {
899 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 909 if (inv.Value.Name == animation)
900 { 910 {
901 if (inv.Value.Name == animation) 911 if (inv.Value.Type == (int)AssetType.Animation)
902 { 912 animID = inv.Value.AssetID;
903 if (inv.Value.Type == (int)AssetType.Animation) 913 continue;
904 animID = inv.Value.AssetID;
905 continue;
906 }
907 } 914 }
908 } 915 }
916 m_host.TaskInventory.LockItemsForRead(false);
909 if (animID == UUID.Zero) 917 if (animID == UUID.Zero)
910 target.Animator.AddAnimation(animation, m_host.UUID); 918 target.Animator.AddAnimation(animation, m_host.UUID);
911 else 919 else
@@ -927,18 +935,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
927 if (target != null) 935 if (target != null)
928 { 936 {
929 UUID animID = UUID.Zero; 937 UUID animID = UUID.Zero;
930 lock (m_host.TaskInventory) 938 m_host.TaskInventory.LockItemsForRead(true);
939 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
931 { 940 {
932 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 941 if (inv.Value.Name == animation)
933 { 942 {
934 if (inv.Value.Name == animation) 943 if (inv.Value.Type == (int)AssetType.Animation)
935 { 944 animID = inv.Value.AssetID;
936 if (inv.Value.Type == (int)AssetType.Animation) 945 continue;
937 animID = inv.Value.AssetID;
938 continue;
939 }
940 } 946 }
941 } 947 }
948 m_host.TaskInventory.LockItemsForRead(false);
942 949
943 if (animID == UUID.Zero) 950 if (animID == UUID.Zero)
944 target.Animator.RemoveAnimation(animation); 951 target.Animator.RemoveAnimation(animation);
@@ -1895,6 +1902,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1895 1902
1896 if (!UUID.TryParse(notecardNameOrUuid, out assetID)) 1903 if (!UUID.TryParse(notecardNameOrUuid, out assetID))
1897 { 1904 {
1905 m_host.TaskInventory.LockItemsForRead(true);
1898 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1906 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1899 { 1907 {
1900 if (item.Type == 7 && item.Name == notecardNameOrUuid) 1908 if (item.Type == 7 && item.Name == notecardNameOrUuid)
@@ -1902,6 +1910,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1902 assetID = item.AssetID; 1910 assetID = item.AssetID;
1903 } 1911 }
1904 } 1912 }
1913 m_host.TaskInventory.LockItemsForRead(false);
1905 } 1914 }
1906 1915
1907 if (assetID == UUID.Zero) 1916 if (assetID == UUID.Zero)
@@ -2225,8 +2234,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2225 UUID x = module.CreateNPC(firstname, 2234 UUID x = module.CreateNPC(firstname,
2226 lastname, 2235 lastname,
2227 new Vector3((float) position.x, (float) position.y, (float) position.z), 2236 new Vector3((float) position.x, (float) position.y, (float) position.z),
2228 World, 2237 World,appearance);
2229 appearance);
2230 2238
2231 return new LSL_Key(x.ToString()); 2239 return new LSL_Key(x.ToString());
2232 } 2240 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 3eeb23d..4da8fe7 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,13 +302,15 @@ 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.IsAttachment) 307 if (SensePoint.ParentGroup.IsAttachment)
307 { 308 {
308 // In attachments, the sensor cone always orients with the 309 // In attachments, the sensor cone always orients with the
309 // avatar rotation. This may include a nonzero elevation if 310 // avatar rotation. This may include a nonzero elevation if
310 // in mouselook. 311 // in mouselook.
311 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 312 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
313 fromRegionPos = avatar.AbsolutePosition;
312 q = avatar.Rotation; 314 q = avatar.Rotation;
313 } 315 }
314 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 316 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
@@ -429,6 +431,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
429 // avatar rotation. This may include a nonzero elevation if 431 // avatar rotation. This may include a nonzero elevation if
430 // in mouselook. 432 // in mouselook.
431 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 433 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
434 fromRegionPos = avatar.AbsolutePosition;
432 q = avatar.Rotation; 435 q = avatar.Rotation;
433 } 436 }
434 437
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 62e2854..e0027b2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -123,6 +123,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
123 LSL_Float llGetEnergy(); 123 LSL_Float llGetEnergy();
124 LSL_Vector llGetForce(); 124 LSL_Vector llGetForce();
125 LSL_Integer llGetFreeMemory(); 125 LSL_Integer llGetFreeMemory();
126 LSL_Integer llGetUsedMemory();
126 LSL_Integer llGetFreeURLs(); 127 LSL_Integer llGetFreeURLs();
127 LSL_Vector llGetGeometricCenter(); 128 LSL_Vector llGetGeometricCenter();
128 LSL_Float llGetGMTclock(); 129 LSL_Float llGetGMTclock();
@@ -199,6 +200,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
199 void llGiveInventory(string destination, string inventory); 200 void llGiveInventory(string destination, string inventory);
200 void llGiveInventoryList(string destination, string category, LSL_List inventory); 201 void llGiveInventoryList(string destination, string category, LSL_List inventory);
201 LSL_Integer llGiveMoney(string destination, int amount); 202 LSL_Integer llGiveMoney(string destination, int amount);
203 LSL_String llTransferLindenDollars(string destination, int amount);
202 void llGodLikeRezObject(string inventory, LSL_Vector pos); 204 void llGodLikeRezObject(string inventory, LSL_Vector pos);
203 LSL_Float llGround(LSL_Vector offset); 205 LSL_Float llGround(LSL_Vector offset);
204 LSL_Vector llGroundContour(LSL_Vector offset); 206 LSL_Vector llGroundContour(LSL_Vector offset);
@@ -405,7 +407,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
405 LSL_Vector llWind(LSL_Vector offset); 407 LSL_Vector llWind(LSL_Vector offset);
406 LSL_String llXorBase64Strings(string str1, string str2); 408 LSL_String llXorBase64Strings(string str1, string str2);
407 LSL_String llXorBase64StringsCorrect(string str1, string str2); 409 LSL_String llXorBase64StringsCorrect(string str1, string str2);
408 void print(string str); 410 LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
409 411
410 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 412 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
411 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 413 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 3221833..a61d553 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 fd08373..0ad3f78 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;
@@ -377,6 +378,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
377 public const int PRIM_SCULPT_TYPE_TORUS = 2; 378 public const int PRIM_SCULPT_TYPE_TORUS = 2;
378 public const int PRIM_SCULPT_TYPE_PLANE = 3; 379 public const int PRIM_SCULPT_TYPE_PLANE = 3;
379 public const int PRIM_SCULPT_TYPE_CYLINDER = 4; 380 public const int PRIM_SCULPT_TYPE_CYLINDER = 4;
381 public const int PRIM_SCULPT_FLAG_INVERT = 64;
382 public const int PRIM_SCULPT_FLAG_MIRROR = 128;
380 383
381 public const int MASK_BASE = 0; 384 public const int MASK_BASE = 0;
382 public const int MASK_OWNER = 1; 385 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 508f33b..c717589 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Diagnostics; //for [DebuggerNonUserCode]
29using System.Runtime.Remoting.Lifetime; 30using System.Runtime.Remoting.Lifetime;
30using System.Threading; 31using System.Threading;
31using System.Reflection; 32using System.Reflection;
@@ -314,6 +315,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
314 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); 315 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
315 } 316 }
316 317
318 [DebuggerNonUserCode]
317 public void llDie() 319 public void llDie()
318 { 320 {
319 m_LSL_Functions.llDie(); 321 m_LSL_Functions.llDie();
@@ -464,6 +466,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
464 return m_LSL_Functions.llGetFreeMemory(); 466 return m_LSL_Functions.llGetFreeMemory();
465 } 467 }
466 468
469 public LSL_Integer llGetUsedMemory()
470 {
471 return m_LSL_Functions.llGetUsedMemory();
472 }
473
467 public LSL_Integer llGetFreeURLs() 474 public LSL_Integer llGetFreeURLs()
468 { 475 {
469 return m_LSL_Functions.llGetFreeURLs(); 476 return m_LSL_Functions.llGetFreeURLs();
@@ -839,6 +846,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
839 return m_LSL_Functions.llGiveMoney(destination, amount); 846 return m_LSL_Functions.llGiveMoney(destination, amount);
840 } 847 }
841 848
849 public LSL_String llTransferLindenDollars(string destination, int amount)
850 {
851 return m_LSL_Functions.llTransferLindenDollars(destination, amount);
852 }
853
842 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 854 public void llGodLikeRezObject(string inventory, LSL_Vector pos)
843 { 855 {
844 m_LSL_Functions.llGodLikeRezObject(inventory, pos); 856 m_LSL_Functions.llGodLikeRezObject(inventory, pos);
@@ -1878,9 +1890,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1878 return m_LSL_Functions.llClearPrimMedia(face); 1890 return m_LSL_Functions.llClearPrimMedia(face);
1879 } 1891 }
1880 1892
1881 public void print(string str) 1893 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
1882 { 1894 {
1883 m_LSL_Functions.print(str); 1895 return m_LSL_Functions.llGetLinkNumberOfSides(link);
1884 } 1896 }
1885 } 1897 }
1886} 1898}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index 143b497..2e27f16 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -72,9 +72,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
72 { 72 {
73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); 73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
74 } 74 }
75
75 public void lsClearWindlightScene() 76 public void lsClearWindlightScene()
76 { 77 {
77 m_LS_Functions.lsClearWindlightScene(); 78 m_LS_Functions.lsClearWindlightScene();
78 } 79 }
80
81 public LSL_List cmGetWindlightScene(LSL_List rules)
82 {
83 return m_LS_Functions.lsGetWindlightScene(rules);
84 }
85
86 public int cmSetWindlightScene(LSL_List rules)
87 {
88 return m_LS_Functions.lsSetWindlightScene(rules);
89 }
90
91 public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
92 {
93 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
94 }
95
96 public void cmClearWindlightScene()
97 {
98 m_LS_Functions.lsClearWindlightScene();
99 }
79 } 100 }
80} 101}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index edbbc2a..b138da3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -33,6 +33,7 @@ using System.Threading;
33using System.Reflection; 33using System.Reflection;
34using System.Collections; 34using System.Collections;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.Diagnostics; //for [DebuggerNonUserCode]
36using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared; 38using OpenSim.Region.ScriptEngine.Shared;
38using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; 39using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
@@ -90,6 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
90 return (int)m_Executor.GetStateEventFlags(state); 91 return (int)m_Executor.GetStateEventFlags(state);
91 } 92 }
92 93
94 [DebuggerNonUserCode]
93 public void ExecuteEvent(string state, string FunctionName, object[] args) 95 public void ExecuteEvent(string state, string FunctionName, object[] args)
94 { 96 {
95 m_Executor.ExecuteEvent(state, FunctionName, args); 97 m_Executor.ExecuteEvent(state, FunctionName, args);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 8cebb4a..7e7e278 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -35,6 +35,7 @@ using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.CoreModules; 36using OpenSim.Region.CoreModules;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Services.Interfaces;
38 39
39namespace OpenSim.Region.ScriptEngine.Shared 40namespace OpenSim.Region.ScriptEngine.Shared
40{ 41{
@@ -95,6 +96,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
95 Type = 0; 96 Type = 0;
96 Velocity = new LSL_Types.Vector3(); 97 Velocity = new LSL_Types.Vector3();
97 initializeSurfaceTouch(); 98 initializeSurfaceTouch();
99 Country = String.Empty;
98 } 100 }
99 101
100 public UUID Key; 102 public UUID Key;
@@ -126,6 +128,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
126 private int touchFace; 128 private int touchFace;
127 public int TouchFace { get { return touchFace; } } 129 public int TouchFace { get { return touchFace; } }
128 130
131 public string Country;
132
129 // This can be done in two places including the constructor 133 // This can be done in two places including the constructor
130 // so be carefull what gets added here 134 // so be carefull what gets added here
131 private void initializeSurfaceTouch() 135 private void initializeSurfaceTouch()
@@ -173,6 +177,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
173 return; 177 return;
174 178
175 Name = presence.Firstname + " " + presence.Lastname; 179 Name = presence.Firstname + " " + presence.Lastname;
180 UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, Key);
181 if (account != null)
182 Country = account.UserCountry;
183
176 Owner = Key; 184 Owner = Key;
177 Position = new LSL_Types.Vector3( 185 Position = new LSL_Types.Vector3(
178 presence.AbsolutePosition.X, 186 presence.AbsolutePosition.X,
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index f9d6eee..9ff2e4d 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;
@@ -263,13 +264,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
263 264
264 if (part != null) 265 if (part != null)
265 { 266 {
266 lock (part.TaskInventory) 267 part.TaskInventory.LockItemsForRead(true);
268 if (part.TaskInventory.ContainsKey(m_ItemID))
267 { 269 {
268 if (part.TaskInventory.ContainsKey(m_ItemID)) 270 m_thisScriptTask = part.TaskInventory[m_ItemID];
269 {
270 m_thisScriptTask = part.TaskInventory[m_ItemID];
271 }
272 } 271 }
272 part.TaskInventory.LockItemsForRead(false);
273 } 273 }
274 274
275 ApiManager am = new ApiManager(); 275 ApiManager am = new ApiManager();
@@ -296,9 +296,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
296 //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); 296 //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
297// lease.Register(this); 297// lease.Register(this);
298 } 298 }
299 catch (Exception) 299 catch (Exception e)
300 { 300 {
301 // m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); 301 m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly);
302 throw;
302 } 303 }
303 304
304 try 305 try
@@ -459,14 +460,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
459 { 460 {
460 int permsMask; 461 int permsMask;
461 UUID permsGranter; 462 UUID permsGranter;
462 lock (part.TaskInventory) 463 part.TaskInventory.LockItemsForRead(true);
464 if (!part.TaskInventory.ContainsKey(m_ItemID))
463 { 465 {
464 if (!part.TaskInventory.ContainsKey(m_ItemID)) 466 part.TaskInventory.LockItemsForRead(false);
465 return; 467 return;
466
467 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
468 permsMask = part.TaskInventory[m_ItemID].PermsMask;
469 } 468 }
469 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
470 permsMask = part.TaskInventory[m_ItemID].PermsMask;
471 part.TaskInventory.LockItemsForRead(false);
470 472
471 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) 473 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
472 { 474 {
@@ -575,6 +577,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
575 return true; 577 return true;
576 } 578 }
577 579
580 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
578 public void SetState(string state) 581 public void SetState(string state)
579 { 582 {
580 if (state == State) 583 if (state == State)
@@ -586,7 +589,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
586 new DetectParams[0])); 589 new DetectParams[0]));
587 PostEvent(new EventParams("state_entry", new Object[0], 590 PostEvent(new EventParams("state_entry", new Object[0],
588 new DetectParams[0])); 591 new DetectParams[0]));
589 592
590 throw new EventAbortException(); 593 throw new EventAbortException();
591 } 594 }
592 595
@@ -669,41 +672,42 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
669 /// <returns></returns> 672 /// <returns></returns>
670 public object EventProcessor() 673 public object EventProcessor()
671 { 674 {
672 lock (m_Script) 675 EventParams data = null;
673 {
674// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
675 676
676 if (Suspended) 677// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
677 return 0;
678 678
679 EventParams data = null; 679 if (Suspended)
680 return 0;
680 681
681 lock (m_EventQueue) 682 lock (m_EventQueue)
683 {
684 data = (EventParams) m_EventQueue.Dequeue();
685 if (data == null) // Shouldn't happen
682 { 686 {
683 data = (EventParams) m_EventQueue.Dequeue(); 687 if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
684 if (data == null) // Shouldn't happen
685 { 688 {
686 if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown)) 689 m_CurrentResult = m_Engine.QueueEventHandler(this);
687 {
688 m_CurrentResult = m_Engine.QueueEventHandler(this);
689 }
690 else
691 {
692 m_CurrentResult = null;
693 }
694 return 0;
695 } 690 }
696 691 else
697 if (data.EventName == "timer")
698 m_TimerQueued = false;
699 if (data.EventName == "control")
700 { 692 {
701 if (m_ControlEventsInQueue > 0) 693 m_CurrentResult = null;
702 m_ControlEventsInQueue--;
703 } 694 }
704 if (data.EventName == "collision") 695 return 0;
705 m_CollisionInQueue = false; 696 }
697
698 if (data.EventName == "timer")
699 m_TimerQueued = false;
700 if (data.EventName == "control")
701 {
702 if (m_ControlEventsInQueue > 0)
703 m_ControlEventsInQueue--;
706 } 704 }
705 if (data.EventName == "collision")
706 m_CollisionInQueue = false;
707 }
708
709 lock(m_Script)
710 {
707 711
708// m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this); 712// m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
709 713
@@ -860,6 +864,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
860 new Object[0], new DetectParams[0])); 864 new Object[0], new DetectParams[0]));
861 } 865 }
862 866
867 [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
863 public void ApiResetScript() 868 public void ApiResetScript()
864 { 869 {
865 // bool running = Running; 870 // bool running = Running;
@@ -891,10 +896,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
891 896
892 public Dictionary<string, object> GetVars() 897 public Dictionary<string, object> GetVars()
893 { 898 {
894 if (m_Script != null) 899 return m_Script.GetVars();
895 return m_Script.GetVars();
896 else
897 return new Dictionary<string, object>();
898 } 900 }
899 901
900 public void SetVars(Dictionary<string, object> vars) 902 public void SetVars(Dictionary<string, object> vars)
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index d848b2a..9e6752c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -83,19 +83,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
83 83
84 public override string ToString() 84 public override string ToString()
85 { 85 {
86 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", x, y, z); 86 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", x, y, z);
87 return s; 87 return s;
88 } 88 }
89 89
90 public static explicit operator LSLString(Vector3 vec) 90 public static explicit operator LSLString(Vector3 vec)
91 { 91 {
92 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 92 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
93 return new LSLString(s); 93 return new LSLString(s);
94 } 94 }
95 95
96 public static explicit operator string(Vector3 vec) 96 public static explicit operator string(Vector3 vec)
97 { 97 {
98 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); 98 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
99 return s; 99 return s;
100 } 100 }
101 101
@@ -342,19 +342,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
342 342
343 public override string ToString() 343 public override string ToString()
344 { 344 {
345 string st=String.Format(Culture.FormatProvider, "<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", x, y, z, s); 345 string st=String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", x, y, z, s);
346 return st; 346 return st;
347 } 347 }
348 348
349 public static explicit operator string(Quaternion r) 349 public static explicit operator string(Quaternion r)
350 { 350 {
351 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 351 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
352 return s; 352 return s;
353 } 353 }
354 354
355 public static explicit operator LSLString(Quaternion r) 355 public static explicit operator LSLString(Quaternion r)
356 { 356 {
357 string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); 357 string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
358 return new LSLString(s); 358 return new LSLString(s);
359 } 359 }
360 360
@@ -459,6 +459,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
459 size += 64; 459 size += 64;
460 else if (o is int) 460 else if (o is int)
461 size += 4; 461 size += 4;
462 else if (o is uint)
463 size += 4;
462 else if (o is string) 464 else if (o is string)
463 size += ((string)o).Length; 465 size += ((string)o).Length;
464 else if (o is float) 466 else if (o is float)
@@ -613,24 +615,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
613 615
614 public static bool operator ==(list a, list b) 616 public static bool operator ==(list a, list b)
615 { 617 {
616 int la = -1; 618 int la = a.Length;
617 int lb = -1; 619 int lb = b.Length;
618 try { la = a.Length; }
619 catch (NullReferenceException) { }
620 try { lb = b.Length; }
621 catch (NullReferenceException) { }
622 620
623 return la == lb; 621 return la == lb;
624 } 622 }
625 623
626 public static bool operator !=(list a, list b) 624 public static bool operator !=(list a, list b)
627 { 625 {
628 int la = -1; 626 int la = a.Length;
629 int lb = -1; 627 int lb = b.Length;
630 try { la = a.Length; }
631 catch (NullReferenceException) { }
632 try {lb = b.Length;}
633 catch (NullReferenceException) { }
634 628
635 return la != lb; 629 return la != lb;
636 } 630 }
@@ -1064,7 +1058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1064 { 1058 {
1065 list ret = new list(); 1059 list ret = new list();
1066 double entry; 1060 double entry;
1067 for (int i = 0; i < src.Data.Length - 1; i++) 1061 for (int i = 0; i < src.Data.Length; i++)
1068 { 1062 {
1069 if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry)) 1063 if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry))
1070 { 1064 {
generated by cgit v1.1 at 2024-12-27 14:19:24 +0000