aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs1737
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs36
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs32
6 files changed, 1187 insertions, 654 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/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6edd08d..15af8b1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Diagnostics; //for [DebuggerNonUserCode]
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
@@ -73,7 +74,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
73 /// </summary> 74 /// </summary>
74 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi 75 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
75 { 76 {
76 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 77// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
77 protected IScriptEngine m_ScriptEngine; 78 protected IScriptEngine m_ScriptEngine;
78 protected SceneObjectPart m_host; 79 protected SceneObjectPart m_host;
79 protected uint m_localID; 80 protected uint m_localID;
@@ -151,6 +152,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
151 get { return m_ScriptEngine.World; } 152 get { return m_ScriptEngine.World; }
152 } 153 }
153 154
155 [DebuggerNonUserCode]
154 public void state(string newState) 156 public void state(string newState)
155 { 157 {
156 m_ScriptEngine.SetState(m_itemID, newState); 158 m_ScriptEngine.SetState(m_itemID, newState);
@@ -160,6 +162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
160 /// Reset the named script. The script must be present 162 /// Reset the named script. The script must be present
161 /// in the same prim. 163 /// in the same prim.
162 /// </summary> 164 /// </summary>
165 [DebuggerNonUserCode]
163 public void llResetScript() 166 public void llResetScript()
164 { 167 {
165 m_host.AddScriptLPS(1); 168 m_host.AddScriptLPS(1);
@@ -216,9 +219,62 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
216 } 219 }
217 } 220 }
218 221
222 public List<ScenePresence> GetLinkAvatars(int linkType)
223 {
224 List<ScenePresence> ret = new List<ScenePresence>();
225 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
226 return ret;
227
228 List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars();
229
230 switch (linkType)
231 {
232 case ScriptBaseClass.LINK_SET:
233 return avs;
234
235 case ScriptBaseClass.LINK_ROOT:
236 return ret;
237
238 case ScriptBaseClass.LINK_ALL_OTHERS:
239 return avs;
240
241 case ScriptBaseClass.LINK_ALL_CHILDREN:
242 return avs;
243
244 case ScriptBaseClass.LINK_THIS:
245 return ret;
246
247 default:
248 if (linkType < 0)
249 return ret;
250
251 int partCount = m_host.ParentGroup.GetPartCount();
252
253 if (linkType <= partCount)
254 {
255 return ret;
256 }
257 else
258 {
259 linkType = linkType - partCount;
260 if (linkType > avs.Count)
261 {
262 return ret;
263 }
264 else
265 {
266 ret.Add(avs[linkType-1]);
267 return ret;
268 }
269 }
270 }
271 }
272
219 public List<SceneObjectPart> GetLinkParts(int linkType) 273 public List<SceneObjectPart> GetLinkParts(int linkType)
220 { 274 {
221 List<SceneObjectPart> ret = new List<SceneObjectPart>(); 275 List<SceneObjectPart> ret = new List<SceneObjectPart>();
276 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
277 return ret;
222 ret.Add(m_host); 278 ret.Add(m_host);
223 279
224 switch (linkType) 280 switch (linkType)
@@ -272,40 +328,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
272 protected UUID InventorySelf() 328 protected UUID InventorySelf()
273 { 329 {
274 UUID invItemID = new UUID(); 330 UUID invItemID = new UUID();
275 331 bool unlock = false;
276 lock (m_host.TaskInventory) 332 if (!m_host.TaskInventory.IsReadLockedByMe())
333 {
334 m_host.TaskInventory.LockItemsForRead(true);
335 unlock = true;
336 }
337 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
277 { 338 {
278 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 339 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
279 { 340 {
280 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) 341 invItemID = inv.Key;
281 { 342 break;
282 invItemID = inv.Key;
283 break;
284 }
285 } 343 }
286 } 344 }
287 345 if (unlock)
346 {
347 m_host.TaskInventory.LockItemsForRead(false);
348 }
288 return invItemID; 349 return invItemID;
289 } 350 }
290 351
291 protected UUID InventoryKey(string name, int type) 352 protected UUID InventoryKey(string name, int type)
292 { 353 {
293 m_host.AddScriptLPS(1); 354 m_host.AddScriptLPS(1);
294 355 m_host.TaskInventory.LockItemsForRead(true);
295 lock (m_host.TaskInventory) 356
357 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
296 { 358 {
297 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 359 if (inv.Value.Name == name)
298 { 360 {
299 if (inv.Value.Name == name) 361 m_host.TaskInventory.LockItemsForRead(false);
362
363 if (inv.Value.Type != type)
300 { 364 {
301 if (inv.Value.Type != type) 365 return UUID.Zero;
302 return UUID.Zero;
303
304 return inv.Value.AssetID;
305 } 366 }
367
368 return inv.Value.AssetID;
306 } 369 }
307 } 370 }
308 371
372 m_host.TaskInventory.LockItemsForRead(false);
309 return UUID.Zero; 373 return UUID.Zero;
310 } 374 }
311 375
@@ -313,17 +377,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
313 { 377 {
314 m_host.AddScriptLPS(1); 378 m_host.AddScriptLPS(1);
315 379
316 lock (m_host.TaskInventory) 380
381 m_host.TaskInventory.LockItemsForRead(true);
382
383 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
317 { 384 {
318 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 385 if (inv.Value.Name == name)
319 { 386 {
320 if (inv.Value.Name == name) 387 m_host.TaskInventory.LockItemsForRead(false);
321 { 388 return inv.Value.AssetID;
322 return inv.Value.AssetID;
323 }
324 } 389 }
325 } 390 }
326 391
392 m_host.TaskInventory.LockItemsForRead(false);
393
394
327 return UUID.Zero; 395 return UUID.Zero;
328 } 396 }
329 397
@@ -465,26 +533,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
465 533
466 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke 534 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
467 535
468 // Old implementation of llRot2Euler. Normalization not required as Atan2 function will 536 // Utility function for llRot2Euler
469 // only return values >= -PI (-180 degrees) and <= PI (180 degrees).
470 537
471 public LSL_Vector llRot2Euler(LSL_Rotation r) 538 // normalize an angle between -PI and PI (-180 to +180 degrees)
539 protected double NormalizeAngle(double angle)
540 {
541 if (angle > -Math.PI && angle < Math.PI)
542 return angle;
543
544 int numPis = (int)(Math.PI / angle);
545 double remainder = angle - Math.PI * numPis;
546 if (numPis % 2 == 1)
547 return Math.PI - angle;
548 return remainder;
549 }
550
551 public LSL_Vector llRot2Euler(LSL_Rotation q1)
472 { 552 {
473 m_host.AddScriptLPS(1); 553 m_host.AddScriptLPS(1);
474 //This implementation is from http://lslwiki.net/lslwiki/wakka.php?wakka=LibraryRotationFunctions. ckrinke 554 LSL_Vector eul = new LSL_Vector();
475 LSL_Rotation t = new LSL_Rotation(r.x * r.x, r.y * r.y, r.z * r.z, r.s * r.s); 555
476 double m = (t.x + t.y + t.z + t.s); 556 double sqw = q1.s*q1.s;
477 if (m == 0) return new LSL_Vector(); 557 double sqx = q1.x*q1.x;
478 double n = 2 * (r.y * r.s + r.x * r.z); 558 double sqy = q1.z*q1.z;
479 double p = m * m - n * n; 559 double sqz = q1.y*q1.y;
480 if (p > 0) 560 double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
481 return new LSL_Vector(Math.Atan2(2.0 * (r.x * r.s - r.y * r.z), (-t.x - t.y + t.z + t.s)), 561 double test = q1.x*q1.z + q1.y*q1.s;
482 Math.Atan2(n, Math.Sqrt(p)), 562 if (test > 0.4999*unit) { // singularity at north pole
483 Math.Atan2(2.0 * (r.z * r.s - r.x * r.y), (t.x - t.y - t.z + t.s))); 563 eul.z = 2 * Math.Atan2(q1.x,q1.s);
484 else if (n > 0) 564 eul.y = Math.PI/2;
485 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)); 565 eul.x = 0;
486 else 566 return eul;
487 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)); 567 }
568 if (test < -0.4999*unit) { // singularity at south pole
569 eul.z = -2 * Math.Atan2(q1.x,q1.s);
570 eul.y = -Math.PI/2;
571 eul.x = 0;
572 return eul;
573 }
574 eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw);
575 eul.y = Math.Asin(2*test/unit);
576 eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw);
577 return eul;
488 } 578 }
489 579
490 /* From wiki: 580 /* From wiki:
@@ -686,77 +776,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
686 { 776 {
687 //A and B should both be normalized 777 //A and B should both be normalized
688 m_host.AddScriptLPS(1); 778 m_host.AddScriptLPS(1);
689 LSL_Rotation rotBetween; 779 /* This method is more accurate than the SL one, and thus causes problems
690 // Check for zero vectors. If either is zero, return zero rotation. Otherwise, 780 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
691 // continue calculation. 781
692 if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f)) 782 double dotProduct = LSL_Vector.Dot(a, b);
783 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
784 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
785 double angle = Math.Acos(dotProduct / magProduct);
786 LSL_Vector axis = LSL_Vector.Norm(crossProduct);
787 double s = Math.Sin(angle / 2);
788
789 double x = axis.x * s;
790 double y = axis.y * s;
791 double z = axis.z * s;
792 double w = Math.Cos(angle / 2);
793
794 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
795 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
796
797 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
798 */
799
800 // This method mimics the 180 errors found in SL
801 // See www.euclideanspace.com... angleBetween
802 LSL_Vector vec_a = a;
803 LSL_Vector vec_b = b;
804
805 // Eliminate zero length
806 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
807 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
808 if (vec_a_mag < 0.00001 ||
809 vec_b_mag < 0.00001)
693 { 810 {
694 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 811 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
695 } 812 }
696 else 813
814 // Normalize
815 vec_a = llVecNorm(vec_a);
816 vec_b = llVecNorm(vec_b);
817
818 // Calculate axis and rotation angle
819 LSL_Vector axis = vec_a % vec_b;
820 LSL_Float cos_theta = vec_a * vec_b;
821
822 // Check if parallel
823 if (cos_theta > 0.99999)
697 { 824 {
698 a = LSL_Vector.Norm(a); 825 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
699 b = LSL_Vector.Norm(b); 826 }
700 double dotProduct = LSL_Vector.Dot(a, b); 827
701 // There are two degenerate cases possible. These are for vectors 180 or 828 // Check if anti-parallel
702 // 0 degrees apart. These have to be detected and handled individually. 829 else if (cos_theta < -0.99999)
703 // 830 {
704 // Check for vectors 180 degrees apart. 831 LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
705 // A dot product of -1 would mean the angle between vectors is 180 degrees. 832 if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
706 if (dotProduct < -0.9999999f) 833 return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
707 { 834 }
708 // First assume X axis is orthogonal to the vectors. 835 else // other rotation
709 LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f); 836 {
710 orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a)); 837 LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
711 // Check for near zero vector. A very small non-zero number here will create 838 axis = llVecNorm(axis);
712 // a rotation in an undesired direction. 839 double x, y, z, s, t;
713 if (LSL_Vector.Mag(orthoVector) > 0.0001) 840 s = Math.Cos(theta);
714 { 841 t = Math.Sin(theta);
715 rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f); 842 x = axis.x * t;
716 } 843 y = axis.y * t;
717 // If the magnitude of the vector was near zero, then assume the X axis is not 844 z = axis.z * t;
718 // orthogonal and use the Z axis instead. 845 return new LSL_Rotation(x,y,z,s);
719 else
720 {
721 // Set 180 z rotation.
722 rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f);
723 }
724 }
725 // Check for parallel vectors.
726 // A dot product of 1 would mean the angle between vectors is 0 degrees.
727 else if (dotProduct > 0.9999999f)
728 {
729 // Set zero rotation.
730 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
731 }
732 else
733 {
734 // All special checks have been performed so get the axis of rotation.
735 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
736 // Quarternion s value is the length of the unit vector + dot product.
737 double qs = 1.0 + dotProduct;
738 rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs);
739 // Normalize the rotation.
740 double mag = LSL_Rotation.Mag(rotBetween);
741 // We shouldn't have to worry about a divide by zero here. The qs value will be
742 // non-zero because we already know if we're here, then the dotProduct is not -1 so
743 // qs will not be zero. Also, we've already handled the input vectors being zero so the
744 // crossProduct vector should also not be zero.
745 rotBetween.x = rotBetween.x / mag;
746 rotBetween.y = rotBetween.y / mag;
747 rotBetween.z = rotBetween.z / mag;
748 rotBetween.s = rotBetween.s / mag;
749 // Check for undefined values and set zero rotation if any found. This code might not actually be required
750 // any longer since zero vectors are checked for at the top.
751 if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s))
752 {
753 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
754 }
755 }
756 } 846 }
757 return rotBetween;
758 } 847 }
759 848
760 public void llWhisper(int channelID, string text) 849 public void llWhisper(int channelID, string text)
761 { 850 {
762 m_host.AddScriptLPS(1); 851 m_host.AddScriptLPS(1);
@@ -1080,10 +1169,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1080 return detectedParams.TouchUV; 1169 return detectedParams.TouchUV;
1081 } 1170 }
1082 1171
1172 [DebuggerNonUserCode]
1083 public virtual void llDie() 1173 public virtual void llDie()
1084 { 1174 {
1085 m_host.AddScriptLPS(1); 1175 m_host.AddScriptLPS(1);
1086 throw new SelfDeleteException(); 1176 if (!m_host.IsAttachment) throw new SelfDeleteException();
1087 } 1177 }
1088 1178
1089 public LSL_Float llGround(LSL_Vector offset) 1179 public LSL_Float llGround(LSL_Vector offset)
@@ -1156,6 +1246,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1156 1246
1157 public void llSetStatus(int status, int value) 1247 public void llSetStatus(int status, int value)
1158 { 1248 {
1249 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
1250 return;
1159 m_host.AddScriptLPS(1); 1251 m_host.AddScriptLPS(1);
1160 1252
1161 int statusrotationaxis = 0; 1253 int statusrotationaxis = 0;
@@ -1385,6 +1477,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1385 { 1477 {
1386 m_host.AddScriptLPS(1); 1478 m_host.AddScriptLPS(1);
1387 1479
1480 SetColor(m_host, color, face);
1481 }
1482
1483 protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
1484 {
1485 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1486 return;
1487
1488 Primitive.TextureEntry tex = part.Shape.Textures;
1489 Color4 texcolor;
1490 if (face >= 0 && face < GetNumberOfSides(part))
1491 {
1492 texcolor = tex.CreateFace((uint)face).RGBA;
1493 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1494 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1495 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1496 tex.FaceTextures[face].RGBA = texcolor;
1497 part.UpdateTexture(tex);
1498 return;
1499 }
1500 else if (face == ScriptBaseClass.ALL_SIDES)
1501 {
1502 for (uint i = 0; i < GetNumberOfSides(part); i++)
1503 {
1504 if (tex.FaceTextures[i] != null)
1505 {
1506 texcolor = tex.FaceTextures[i].RGBA;
1507 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1508 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1509 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1510 tex.FaceTextures[i].RGBA = texcolor;
1511 }
1512 texcolor = tex.DefaultTexture.RGBA;
1513 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1514 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1515 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1516 tex.DefaultTexture.RGBA = texcolor;
1517 }
1518 part.UpdateTexture(tex);
1519 return;
1520 }
1521
1388 if (face == ScriptBaseClass.ALL_SIDES) 1522 if (face == ScriptBaseClass.ALL_SIDES)
1389 face = SceneObjectPart.ALL_SIDES; 1523 face = SceneObjectPart.ALL_SIDES;
1390 1524
@@ -1393,6 +1527,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1393 1527
1394 public void SetTexGen(SceneObjectPart part, int face,int style) 1528 public void SetTexGen(SceneObjectPart part, int face,int style)
1395 { 1529 {
1530 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1531 return;
1532
1396 Primitive.TextureEntry tex = part.Shape.Textures; 1533 Primitive.TextureEntry tex = part.Shape.Textures;
1397 MappingType textype; 1534 MappingType textype;
1398 textype = MappingType.Default; 1535 textype = MappingType.Default;
@@ -1423,6 +1560,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1423 1560
1424 public void SetGlow(SceneObjectPart part, int face, float glow) 1561 public void SetGlow(SceneObjectPart part, int face, float glow)
1425 { 1562 {
1563 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1564 return;
1565
1426 Primitive.TextureEntry tex = part.Shape.Textures; 1566 Primitive.TextureEntry tex = part.Shape.Textures;
1427 if (face >= 0 && face < GetNumberOfSides(part)) 1567 if (face >= 0 && face < GetNumberOfSides(part))
1428 { 1568 {
@@ -1448,6 +1588,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1448 1588
1449 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1589 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1450 { 1590 {
1591 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1592 return;
1451 1593
1452 Shininess sval = new Shininess(); 1594 Shininess sval = new Shininess();
1453 1595
@@ -1498,6 +1640,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1498 1640
1499 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1641 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1500 { 1642 {
1643 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1644 return;
1645
1501 Primitive.TextureEntry tex = part.Shape.Textures; 1646 Primitive.TextureEntry tex = part.Shape.Textures;
1502 if (face >= 0 && face < GetNumberOfSides(part)) 1647 if (face >= 0 && face < GetNumberOfSides(part))
1503 { 1648 {
@@ -1558,13 +1703,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1558 m_host.AddScriptLPS(1); 1703 m_host.AddScriptLPS(1);
1559 1704
1560 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1705 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1561 1706 if (parts.Count > 0)
1562 foreach (SceneObjectPart part in parts) 1707 {
1563 SetAlpha(part, alpha, face); 1708 try
1709 {
1710 parts[0].ParentGroup.areUpdatesSuspended = true;
1711 foreach (SceneObjectPart part in parts)
1712 SetAlpha(part, alpha, face);
1713 }
1714 finally
1715 {
1716 parts[0].ParentGroup.areUpdatesSuspended = false;
1717 }
1718 }
1564 } 1719 }
1565 1720
1566 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1721 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1567 { 1722 {
1723 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1724 return;
1725
1568 Primitive.TextureEntry tex = part.Shape.Textures; 1726 Primitive.TextureEntry tex = part.Shape.Textures;
1569 Color4 texcolor; 1727 Color4 texcolor;
1570 if (face >= 0 && face < GetNumberOfSides(part)) 1728 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1610,7 +1768,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1610 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1768 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1611 float wind, float tension, LSL_Vector Force) 1769 float wind, float tension, LSL_Vector Force)
1612 { 1770 {
1613 if (part == null) 1771 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1614 return; 1772 return;
1615 1773
1616 if (flexi) 1774 if (flexi)
@@ -1645,7 +1803,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1645 /// <param name="falloff"></param> 1803 /// <param name="falloff"></param>
1646 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 1804 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1647 { 1805 {
1648 if (part == null) 1806 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1649 return; 1807 return;
1650 1808
1651 if (light) 1809 if (light)
@@ -1722,15 +1880,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1722 m_host.AddScriptLPS(1); 1880 m_host.AddScriptLPS(1);
1723 1881
1724 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1882 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1725 1883 if (parts.Count > 0)
1726 foreach (SceneObjectPart part in parts) 1884 {
1727 SetTexture(part, texture, face); 1885 try
1728 1886 {
1887 parts[0].ParentGroup.areUpdatesSuspended = true;
1888 foreach (SceneObjectPart part in parts)
1889 SetTexture(part, texture, face);
1890 }
1891 finally
1892 {
1893 parts[0].ParentGroup.areUpdatesSuspended = false;
1894 }
1895 }
1729 ScriptSleep(200); 1896 ScriptSleep(200);
1730 } 1897 }
1731 1898
1732 protected void SetTexture(SceneObjectPart part, string texture, int face) 1899 protected void SetTexture(SceneObjectPart part, string texture, int face)
1733 { 1900 {
1901 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1902 return;
1903
1734 UUID textureID=new UUID(); 1904 UUID textureID=new UUID();
1735 1905
1736 if (!UUID.TryParse(texture, out textureID)) 1906 if (!UUID.TryParse(texture, out textureID))
@@ -1776,6 +1946,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1776 1946
1777 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 1947 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1778 { 1948 {
1949 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1950 return;
1951
1779 Primitive.TextureEntry tex = part.Shape.Textures; 1952 Primitive.TextureEntry tex = part.Shape.Textures;
1780 if (face >= 0 && face < GetNumberOfSides(part)) 1953 if (face >= 0 && face < GetNumberOfSides(part))
1781 { 1954 {
@@ -1812,6 +1985,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1812 1985
1813 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 1986 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1814 { 1987 {
1988 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1989 return;
1990
1815 Primitive.TextureEntry tex = part.Shape.Textures; 1991 Primitive.TextureEntry tex = part.Shape.Textures;
1816 if (face >= 0 && face < GetNumberOfSides(part)) 1992 if (face >= 0 && face < GetNumberOfSides(part))
1817 { 1993 {
@@ -1848,6 +2024,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1848 2024
1849 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 2025 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
1850 { 2026 {
2027 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2028 return;
2029
1851 Primitive.TextureEntry tex = part.Shape.Textures; 2030 Primitive.TextureEntry tex = part.Shape.Textures;
1852 if (face >= 0 && face < GetNumberOfSides(part)) 2031 if (face >= 0 && face < GetNumberOfSides(part))
1853 { 2032 {
@@ -1918,6 +2097,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1918 2097
1919 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos) 2098 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos)
1920 { 2099 {
2100 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2101 return;
2102
1921 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2103 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos)
1922 LSL_Vector currentPos = llGetLocalPos(); 2104 LSL_Vector currentPos = llGetLocalPos();
1923 2105
@@ -1954,6 +2136,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1954 public LSL_Vector llGetLocalPos() 2136 public LSL_Vector llGetLocalPos()
1955 { 2137 {
1956 m_host.AddScriptLPS(1); 2138 m_host.AddScriptLPS(1);
2139 if (m_host.IsAttachment == true) {
2140 if (m_host.IsRoot == true)
2141 {
2142 return new LSL_Vector(m_host.AbsolutePosition.X,
2143 m_host.AbsolutePosition.Y,
2144 m_host.AbsolutePosition.Z);
2145
2146 }
2147 else
2148 {
2149 return new LSL_Vector(m_host.OffsetPosition.X,
2150 m_host.OffsetPosition.Y,
2151 m_host.OffsetPosition.Z);
2152 }
2153 }
2154
1957 if (m_host.ParentID != 0) 2155 if (m_host.ParentID != 0)
1958 { 2156 {
1959 return new LSL_Vector(m_host.OffsetPosition.X, 2157 return new LSL_Vector(m_host.OffsetPosition.X,
@@ -2004,6 +2202,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2004 2202
2005 protected void SetRot(SceneObjectPart part, Quaternion rot) 2203 protected void SetRot(SceneObjectPart part, Quaternion rot)
2006 { 2204 {
2205 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2206 return;
2207
2007 part.UpdateRotation(rot); 2208 part.UpdateRotation(rot);
2008 // Update rotation does not move the object in the physics scene if it's a linkset. 2209 // Update rotation does not move the object in the physics scene if it's a linkset.
2009 2210
@@ -2623,12 +2824,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2623 2824
2624 m_host.AddScriptLPS(1); 2825 m_host.AddScriptLPS(1);
2625 2826
2827 m_host.TaskInventory.LockItemsForRead(true);
2626 TaskInventoryItem item = m_host.TaskInventory[invItemID]; 2828 TaskInventoryItem item = m_host.TaskInventory[invItemID];
2627 2829 m_host.TaskInventory.LockItemsForRead(false);
2628 lock (m_host.TaskInventory)
2629 {
2630 item = m_host.TaskInventory[invItemID];
2631 }
2632 2830
2633 if (item.PermsGranter == UUID.Zero) 2831 if (item.PermsGranter == UUID.Zero)
2634 return 0; 2832 return 0;
@@ -2703,6 +2901,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2703 if (dist > m_ScriptDistanceFactor * 10.0f) 2901 if (dist > m_ScriptDistanceFactor * 10.0f)
2704 return; 2902 return;
2705 2903
2904 //Clone is thread-safe
2706 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 2905 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
2707 2906
2708 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory) 2907 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
@@ -2765,6 +2964,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2765 2964
2766 public void llLookAt(LSL_Vector target, double strength, double damping) 2965 public void llLookAt(LSL_Vector target, double strength, double damping)
2767 { 2966 {
2967 /*
2768 m_host.AddScriptLPS(1); 2968 m_host.AddScriptLPS(1);
2769 // Determine where we are looking from 2969 // Determine where we are looking from
2770 LSL_Vector from = llGetPos(); 2970 LSL_Vector from = llGetPos();
@@ -2784,10 +2984,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2784 // the angles of rotation in radians into rotation value 2984 // the angles of rotation in radians into rotation value
2785 2985
2786 LSL_Types.Quaternion rot = llEuler2Rot(angle); 2986 LSL_Types.Quaternion rot = llEuler2Rot(angle);
2787 Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); 2987
2788 m_host.startLookAt(rotation, (float)damping, (float)strength); 2988 // This would only work if your physics system contains an APID controller:
2989 // Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s);
2990 // m_host.startLookAt(rotation, (float)damping, (float)strength);
2991
2789 // Orient the object to the angle calculated 2992 // Orient the object to the angle calculated
2790 //llSetRot(rot); 2993 llSetRot(rot);
2994 */
2995
2996 //The above code, while nice, doesn't replicate the behaviour of SL and tends to "roll" the object.
2997 //There's probably a smarter way of doing this, my rotation math-fu is weak.
2998 // http://bugs.meta7.com/view.php?id=28
2999 // - Tom
3000
3001 LSL_Rotation newrot = llGetRot() * llRotBetween(new LSL_Vector(1.0d, 0.0d, 0.0d) * llGetRot(), new LSL_Vector(0.0d, 0.0d, -1.0d));
3002 llSetRot(newrot * llRotBetween(new LSL_Vector(0.0d,0.0d,1.0d) * newrot, target - llGetPos()));
3003
3004 }
3005
3006 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3007 {
3008 m_host.AddScriptLPS(1);
3009// NotImplemented("llRotLookAt");
3010 m_host.RotLookAt(Rot2Quaternion(target), (float)strength, (float)damping);
3011
2791 } 3012 }
2792 3013
2793 public void llStopLookAt() 3014 public void llStopLookAt()
@@ -2836,13 +3057,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2836 { 3057 {
2837 TaskInventoryItem item; 3058 TaskInventoryItem item;
2838 3059
2839 lock (m_host.TaskInventory) 3060 m_host.TaskInventory.LockItemsForRead(true);
3061 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2840 { 3062 {
2841 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3063 m_host.TaskInventory.LockItemsForRead(false);
2842 return; 3064 return;
2843 else
2844 item = m_host.TaskInventory[InventorySelf()];
2845 } 3065 }
3066 else
3067 {
3068 item = m_host.TaskInventory[InventorySelf()];
3069 }
3070 m_host.TaskInventory.LockItemsForRead(false);
2846 3071
2847 if (item.PermsGranter != UUID.Zero) 3072 if (item.PermsGranter != UUID.Zero)
2848 { 3073 {
@@ -2864,13 +3089,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2864 { 3089 {
2865 TaskInventoryItem item; 3090 TaskInventoryItem item;
2866 3091
3092 m_host.TaskInventory.LockItemsForRead(true);
2867 lock (m_host.TaskInventory) 3093 lock (m_host.TaskInventory)
2868 { 3094 {
3095
2869 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3096 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3097 {
3098 m_host.TaskInventory.LockItemsForRead(false);
2870 return; 3099 return;
3100 }
2871 else 3101 else
3102 {
2872 item = m_host.TaskInventory[InventorySelf()]; 3103 item = m_host.TaskInventory[InventorySelf()];
3104 }
2873 } 3105 }
3106 m_host.TaskInventory.LockItemsForRead(false);
2874 3107
2875 m_host.AddScriptLPS(1); 3108 m_host.AddScriptLPS(1);
2876 3109
@@ -2902,19 +3135,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2902 { 3135 {
2903 m_host.AddScriptLPS(1); 3136 m_host.AddScriptLPS(1);
2904 3137
2905 if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
2906 return;
2907
2908 TaskInventoryItem item; 3138 TaskInventoryItem item;
2909 3139
2910 lock (m_host.TaskInventory) 3140 m_host.TaskInventory.LockItemsForRead(true);
3141
3142 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2911 { 3143 {
2912 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3144 m_host.TaskInventory.LockItemsForRead(false);
2913 return; 3145 return;
2914 else 3146 }
2915 item = m_host.TaskInventory[InventorySelf()]; 3147 else
3148 {
3149 item = m_host.TaskInventory[InventorySelf()];
2916 } 3150 }
2917 3151
3152 m_host.TaskInventory.LockItemsForRead(false);
3153
2918 if (item.PermsGranter != m_host.OwnerID) 3154 if (item.PermsGranter != m_host.OwnerID)
2919 return; 3155 return;
2920 3156
@@ -2924,10 +3160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2924 3160
2925 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 3161 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
2926 3162
2927 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; 3163 grp.AttachToAgent(m_host.OwnerID, (uint)attachment, Vector3.Zero, false);
2928 if (attachmentsModule != null)
2929 attachmentsModule.AttachObject(presence.ControllingClient,
2930 grp, (uint)attachment, false);
2931 } 3164 }
2932 } 3165 }
2933 3166
@@ -2940,13 +3173,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2940 3173
2941 TaskInventoryItem item; 3174 TaskInventoryItem item;
2942 3175
2943 lock (m_host.TaskInventory) 3176 m_host.TaskInventory.LockItemsForRead(true);
3177
3178 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2944 { 3179 {
2945 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3180 m_host.TaskInventory.LockItemsForRead(false);
2946 return; 3181 return;
2947 else 3182 }
2948 item = m_host.TaskInventory[InventorySelf()]; 3183 else
3184 {
3185 item = m_host.TaskInventory[InventorySelf()];
2949 } 3186 }
3187 m_host.TaskInventory.LockItemsForRead(false);
3188
2950 3189
2951 if (item.PermsGranter != m_host.OwnerID) 3190 if (item.PermsGranter != m_host.OwnerID)
2952 return; 3191 return;
@@ -2983,8 +3222,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2983 return m_host.OwnerID.ToString(); 3222 return m_host.OwnerID.ToString();
2984 } 3223 }
2985 3224
3225 [DebuggerNonUserCode]
2986 public void llInstantMessage(string user, string message) 3226 public void llInstantMessage(string user, string message)
2987 { 3227 {
3228 UUID result;
3229 if (!UUID.TryParse(user, out result))
3230 {
3231 throw new Exception(String.Format("An invalid key of '{0} was passed to llInstantMessage", user));
3232 return;
3233 }
3234
3235
2988 m_host.AddScriptLPS(1); 3236 m_host.AddScriptLPS(1);
2989 3237
2990 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3238 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -2999,14 +3247,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2999 UUID friendTransactionID = UUID.Random(); 3247 UUID friendTransactionID = UUID.Random();
3000 3248
3001 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3249 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3002 3250
3003 GridInstantMessage msg = new GridInstantMessage(); 3251 GridInstantMessage msg = new GridInstantMessage();
3004 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3252 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3005 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3253 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3006 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3254 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3007// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3255// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3008// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3256// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3009 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 3257 DateTime dt = DateTime.UtcNow;
3258
3259 // Ticks from UtcNow, but make it look like local. Evil, huh?
3260 dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3261
3262 try
3263 {
3264 // Convert that to the PST timezone
3265 TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3266 dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3267 }
3268 catch
3269 {
3270 // No logging here, as it could be VERY spammy
3271 }
3272
3273 // And make it look local again to fool the unix time util
3274 dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3275
3276 msg.timestamp = (uint)Util.ToUnixTime(dt);
3277
3010 //if (client != null) 3278 //if (client != null)
3011 //{ 3279 //{
3012 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3280 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3020,13 +3288,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3020 msg.message = message.Substring(0, 1024); 3288 msg.message = message.Substring(0, 1024);
3021 else 3289 else
3022 msg.message = message; 3290 msg.message = message;
3023 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3291 msg.dialog = (byte)19; // MessageFromObject
3024 msg.fromGroup = false;// fromGroup; 3292 msg.fromGroup = false;// fromGroup;
3025 msg.offline = (byte)0; //offline; 3293 msg.offline = (byte)0; //offline;
3026 msg.ParentEstateID = 0; //ParentEstateID; 3294 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3027 msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); 3295 msg.Position = new Vector3(m_host.AbsolutePosition);
3028 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3296 msg.RegionID = World.RegionInfo.RegionID.Guid;
3029 msg.binaryBucket = new byte[0];// binaryBucket; 3297 msg.binaryBucket = Util.StringToBytes256(m_host.OwnerID.ToString());
3030 3298
3031 if (m_TransferModule != null) 3299 if (m_TransferModule != null)
3032 { 3300 {
@@ -3046,7 +3314,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3046 } 3314 }
3047 3315
3048 emailModule.SendEmail(m_host.UUID, address, subject, message); 3316 emailModule.SendEmail(m_host.UUID, address, subject, message);
3049 ScriptSleep(20000); 3317 ScriptSleep(15000);
3050 } 3318 }
3051 3319
3052 public void llGetNextEmail(string address, string subject) 3320 public void llGetNextEmail(string address, string subject)
@@ -3148,13 +3416,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3148 m_host.AddScriptLPS(1); 3416 m_host.AddScriptLPS(1);
3149 } 3417 }
3150 3418
3151 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3152 {
3153 m_host.AddScriptLPS(1);
3154 Quaternion rot = new Quaternion((float)target.x, (float)target.y, (float)target.z, (float)target.s);
3155 m_host.RotLookAt(rot, (float)strength, (float)damping);
3156 }
3157
3158 public LSL_Integer llStringLength(string str) 3419 public LSL_Integer llStringLength(string str)
3159 { 3420 {
3160 m_host.AddScriptLPS(1); 3421 m_host.AddScriptLPS(1);
@@ -3178,14 +3439,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3178 3439
3179 TaskInventoryItem item; 3440 TaskInventoryItem item;
3180 3441
3181 lock (m_host.TaskInventory) 3442 m_host.TaskInventory.LockItemsForRead(true);
3443 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3182 { 3444 {
3183 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3445 m_host.TaskInventory.LockItemsForRead(false);
3184 return; 3446 return;
3185 else
3186 item = m_host.TaskInventory[InventorySelf()];
3187 } 3447 }
3188 3448 else
3449 {
3450 item = m_host.TaskInventory[InventorySelf()];
3451 }
3452 m_host.TaskInventory.LockItemsForRead(false);
3189 if (item.PermsGranter == UUID.Zero) 3453 if (item.PermsGranter == UUID.Zero)
3190 return; 3454 return;
3191 3455
@@ -3215,13 +3479,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3215 3479
3216 TaskInventoryItem item; 3480 TaskInventoryItem item;
3217 3481
3218 lock (m_host.TaskInventory) 3482 m_host.TaskInventory.LockItemsForRead(true);
3483 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3219 { 3484 {
3220 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3485 m_host.TaskInventory.LockItemsForRead(false);
3221 return; 3486 return;
3222 else 3487 }
3223 item = m_host.TaskInventory[InventorySelf()]; 3488 else
3489 {
3490 item = m_host.TaskInventory[InventorySelf()];
3224 } 3491 }
3492 m_host.TaskInventory.LockItemsForRead(false);
3493
3225 3494
3226 if (item.PermsGranter == UUID.Zero) 3495 if (item.PermsGranter == UUID.Zero)
3227 return; 3496 return;
@@ -3298,10 +3567,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3298 3567
3299 TaskInventoryItem item; 3568 TaskInventoryItem item;
3300 3569
3301 lock (m_host.TaskInventory) 3570
3571 m_host.TaskInventory.LockItemsForRead(true);
3572 if (!m_host.TaskInventory.ContainsKey(invItemID))
3573 {
3574 m_host.TaskInventory.LockItemsForRead(false);
3575 return;
3576 }
3577 else
3302 { 3578 {
3303 item = m_host.TaskInventory[invItemID]; 3579 item = m_host.TaskInventory[invItemID];
3304 } 3580 }
3581 m_host.TaskInventory.LockItemsForRead(false);
3305 3582
3306 if (agentID == UUID.Zero || perm == 0) // Releasing permissions 3583 if (agentID == UUID.Zero || perm == 0) // Releasing permissions
3307 { 3584 {
@@ -3333,11 +3610,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3333 3610
3334 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3611 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3335 { 3612 {
3336 lock (m_host.TaskInventory) 3613 m_host.TaskInventory.LockItemsForWrite(true);
3337 { 3614 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3338 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3615 m_host.TaskInventory[invItemID].PermsMask = perm;
3339 m_host.TaskInventory[invItemID].PermsMask = perm; 3616 m_host.TaskInventory.LockItemsForWrite(false);
3340 }
3341 3617
3342 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3618 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3343 "run_time_permissions", new Object[] { 3619 "run_time_permissions", new Object[] {
@@ -3357,11 +3633,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3357 3633
3358 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3634 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3359 { 3635 {
3360 lock (m_host.TaskInventory) 3636 m_host.TaskInventory.LockItemsForWrite(true);
3361 { 3637 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3362 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3638 m_host.TaskInventory[invItemID].PermsMask = perm;
3363 m_host.TaskInventory[invItemID].PermsMask = perm; 3639 m_host.TaskInventory.LockItemsForWrite(false);
3364 }
3365 3640
3366 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3641 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3367 "run_time_permissions", new Object[] { 3642 "run_time_permissions", new Object[] {
@@ -3382,11 +3657,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3382 3657
3383 if (!m_waitingForScriptAnswer) 3658 if (!m_waitingForScriptAnswer)
3384 { 3659 {
3385 lock (m_host.TaskInventory) 3660 m_host.TaskInventory.LockItemsForWrite(true);
3386 { 3661 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3387 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3662 m_host.TaskInventory[invItemID].PermsMask = 0;
3388 m_host.TaskInventory[invItemID].PermsMask = 0; 3663 m_host.TaskInventory.LockItemsForWrite(false);
3389 }
3390 3664
3391 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3665 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3392 m_waitingForScriptAnswer=true; 3666 m_waitingForScriptAnswer=true;
@@ -3421,10 +3695,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3421 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3695 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3422 llReleaseControls(); 3696 llReleaseControls();
3423 3697
3424 lock (m_host.TaskInventory) 3698
3425 { 3699 m_host.TaskInventory.LockItemsForWrite(true);
3426 m_host.TaskInventory[invItemID].PermsMask = answer; 3700 m_host.TaskInventory[invItemID].PermsMask = answer;
3427 } 3701 m_host.TaskInventory.LockItemsForWrite(false);
3702
3428 3703
3429 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3704 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3430 "run_time_permissions", new Object[] { 3705 "run_time_permissions", new Object[] {
@@ -3436,16 +3711,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3436 { 3711 {
3437 m_host.AddScriptLPS(1); 3712 m_host.AddScriptLPS(1);
3438 3713
3439 lock (m_host.TaskInventory) 3714 m_host.TaskInventory.LockItemsForRead(true);
3715
3716 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3440 { 3717 {
3441 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3718 if (item.Type == 10 && item.ItemID == m_itemID)
3442 { 3719 {
3443 if (item.Type == 10 && item.ItemID == m_itemID) 3720 m_host.TaskInventory.LockItemsForRead(false);
3444 { 3721 return item.PermsGranter.ToString();
3445 return item.PermsGranter.ToString();
3446 }
3447 } 3722 }
3448 } 3723 }
3724 m_host.TaskInventory.LockItemsForRead(false);
3449 3725
3450 return UUID.Zero.ToString(); 3726 return UUID.Zero.ToString();
3451 } 3727 }
@@ -3454,19 +3730,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3454 { 3730 {
3455 m_host.AddScriptLPS(1); 3731 m_host.AddScriptLPS(1);
3456 3732
3457 lock (m_host.TaskInventory) 3733 m_host.TaskInventory.LockItemsForRead(true);
3734
3735 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3458 { 3736 {
3459 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3737 if (item.Type == 10 && item.ItemID == m_itemID)
3460 { 3738 {
3461 if (item.Type == 10 && item.ItemID == m_itemID) 3739 int perms = item.PermsMask;
3462 { 3740 if (m_automaticLinkPermission)
3463 int perms = item.PermsMask; 3741 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
3464 if (m_automaticLinkPermission) 3742 m_host.TaskInventory.LockItemsForRead(false);
3465 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 3743 return perms;
3466 return perms;
3467 }
3468 } 3744 }
3469 } 3745 }
3746 m_host.TaskInventory.LockItemsForRead(false);
3470 3747
3471 return 0; 3748 return 0;
3472 } 3749 }
@@ -3488,9 +3765,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3488 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 3765 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3489 { 3766 {
3490 List<SceneObjectPart> parts = GetLinkParts(linknumber); 3767 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3491 3768 if (parts.Count > 0)
3492 foreach (SceneObjectPart part in parts) 3769 {
3493 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); 3770 try
3771 {
3772 parts[0].ParentGroup.areUpdatesSuspended = true;
3773 foreach (SceneObjectPart part in parts)
3774 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
3775 }
3776 finally
3777 {
3778 parts[0].ParentGroup.areUpdatesSuspended = false;
3779 }
3780 }
3494 } 3781 }
3495 3782
3496 public void llCreateLink(string target, int parent) 3783 public void llCreateLink(string target, int parent)
@@ -3499,11 +3786,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3499 UUID invItemID = InventorySelf(); 3786 UUID invItemID = InventorySelf();
3500 3787
3501 TaskInventoryItem item; 3788 TaskInventoryItem item;
3502 lock (m_host.TaskInventory) 3789 m_host.TaskInventory.LockItemsForRead(true);
3503 { 3790 item = m_host.TaskInventory[invItemID];
3504 item = m_host.TaskInventory[invItemID]; 3791 m_host.TaskInventory.LockItemsForRead(false);
3505 } 3792
3506
3507 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3793 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3508 && !m_automaticLinkPermission) 3794 && !m_automaticLinkPermission)
3509 { 3795 {
@@ -3556,16 +3842,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3556 m_host.AddScriptLPS(1); 3842 m_host.AddScriptLPS(1);
3557 UUID invItemID = InventorySelf(); 3843 UUID invItemID = InventorySelf();
3558 3844
3559 lock (m_host.TaskInventory) 3845 m_host.TaskInventory.LockItemsForRead(true);
3560 {
3561 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3846 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3562 && !m_automaticLinkPermission) 3847 && !m_automaticLinkPermission)
3563 { 3848 {
3564 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 3849 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
3850 m_host.TaskInventory.LockItemsForRead(false);
3565 return; 3851 return;
3566 } 3852 }
3567 } 3853 m_host.TaskInventory.LockItemsForRead(false);
3568 3854
3569 if (linknum < ScriptBaseClass.LINK_THIS) 3855 if (linknum < ScriptBaseClass.LINK_THIS)
3570 return; 3856 return;
3571 3857
@@ -3604,10 +3890,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3604 // Restructuring Multiple Prims. 3890 // Restructuring Multiple Prims.
3605 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values); 3891 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values);
3606 parts.Remove(parentPrim.RootPart); 3892 parts.Remove(parentPrim.RootPart);
3607 foreach (SceneObjectPart part in parts) 3893 if (parts.Count > 0)
3608 { 3894 {
3609 parentPrim.DelinkFromGroup(part.LocalId, true); 3895 try
3896 {
3897 parts[0].ParentGroup.areUpdatesSuspended = true;
3898 foreach (SceneObjectPart part in parts)
3899 {
3900 parentPrim.DelinkFromGroup(part.LocalId, true);
3901 }
3902 }
3903 finally
3904 {
3905 parts[0].ParentGroup.areUpdatesSuspended = false;
3906 }
3610 } 3907 }
3908
3611 parentPrim.HasGroupChanged = true; 3909 parentPrim.HasGroupChanged = true;
3612 parentPrim.ScheduleGroupForFullUpdate(); 3910 parentPrim.ScheduleGroupForFullUpdate();
3613 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 3911 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3616,11 +3914,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3616 { 3914 {
3617 SceneObjectPart newRoot = parts[0]; 3915 SceneObjectPart newRoot = parts[0];
3618 parts.Remove(newRoot); 3916 parts.Remove(newRoot);
3619 foreach (SceneObjectPart part in parts) 3917
3918 try
3620 { 3919 {
3621 part.UpdateFlag = 0; 3920 parts[0].ParentGroup.areUpdatesSuspended = true;
3622 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 3921 foreach (SceneObjectPart part in parts)
3922 {
3923 part.UpdateFlag = 0;
3924 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
3925 }
3623 } 3926 }
3927 finally
3928 {
3929 parts[0].ParentGroup.areUpdatesSuspended = false;
3930 }
3931
3932
3624 newRoot.ParentGroup.HasGroupChanged = true; 3933 newRoot.ParentGroup.HasGroupChanged = true;
3625 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 3934 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3626 } 3935 }
@@ -3646,11 +3955,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3646 3955
3647 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values); 3956 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values);
3648 parts.Remove(parentPrim.RootPart); 3957 parts.Remove(parentPrim.RootPart);
3649 3958 if (parts.Count > 0)
3650 foreach (SceneObjectPart part in parts)
3651 { 3959 {
3652 parentPrim.DelinkFromGroup(part.LocalId, true); 3960 try
3653 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 3961 {
3962 parts[0].ParentGroup.areUpdatesSuspended = true;
3963 foreach (SceneObjectPart part in parts)
3964 {
3965 parentPrim.DelinkFromGroup(part.LocalId, true);
3966 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
3967 }
3968 }
3969 finally
3970 {
3971 parts[0].ParentGroup.areUpdatesSuspended = false;
3972 }
3654 } 3973 }
3655 parentPrim.HasGroupChanged = true; 3974 parentPrim.HasGroupChanged = true;
3656 parentPrim.ScheduleGroupForFullUpdate(); 3975 parentPrim.ScheduleGroupForFullUpdate();
@@ -3742,17 +4061,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3742 m_host.AddScriptLPS(1); 4061 m_host.AddScriptLPS(1);
3743 int count = 0; 4062 int count = 0;
3744 4063
3745 lock (m_host.TaskInventory) 4064 m_host.TaskInventory.LockItemsForRead(true);
4065 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3746 { 4066 {
3747 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4067 if (inv.Value.Type == type || type == -1)
3748 { 4068 {
3749 if (inv.Value.Type == type || type == -1) 4069 count = count + 1;
3750 {
3751 count = count + 1;
3752 }
3753 } 4070 }
3754 } 4071 }
3755 4072
4073 m_host.TaskInventory.LockItemsForRead(false);
3756 return count; 4074 return count;
3757 } 4075 }
3758 4076
@@ -3761,16 +4079,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3761 m_host.AddScriptLPS(1); 4079 m_host.AddScriptLPS(1);
3762 ArrayList keys = new ArrayList(); 4080 ArrayList keys = new ArrayList();
3763 4081
3764 lock (m_host.TaskInventory) 4082 m_host.TaskInventory.LockItemsForRead(true);
4083 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3765 { 4084 {
3766 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4085 if (inv.Value.Type == type || type == -1)
3767 { 4086 {
3768 if (inv.Value.Type == type || type == -1) 4087 keys.Add(inv.Value.Name);
3769 {
3770 keys.Add(inv.Value.Name);
3771 }
3772 } 4088 }
3773 } 4089 }
4090 m_host.TaskInventory.LockItemsForRead(false);
3774 4091
3775 if (keys.Count == 0) 4092 if (keys.Count == 0)
3776 { 4093 {
@@ -3807,20 +4124,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3807 } 4124 }
3808 4125
3809 // move the first object found with this inventory name 4126 // move the first object found with this inventory name
3810 lock (m_host.TaskInventory) 4127 m_host.TaskInventory.LockItemsForRead(true);
4128 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3811 { 4129 {
3812 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4130 if (inv.Value.Name == inventory)
3813 { 4131 {
3814 if (inv.Value.Name == inventory) 4132 found = true;
3815 { 4133 objId = inv.Key;
3816 found = true; 4134 assetType = inv.Value.Type;
3817 objId = inv.Key; 4135 objName = inv.Value.Name;
3818 assetType = inv.Value.Type; 4136 break;
3819 objName = inv.Value.Name;
3820 break;
3821 }
3822 } 4137 }
3823 } 4138 }
4139 m_host.TaskInventory.LockItemsForRead(false);
3824 4140
3825 if (!found) 4141 if (!found)
3826 { 4142 {
@@ -3828,9 +4144,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3828 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4144 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
3829 } 4145 }
3830 4146
3831 // check if destination is an avatar 4147 // check if destination is an object
3832 if (World.GetScenePresence(destId) != null) 4148 if (World.GetSceneObjectPart(destId) != null)
4149 {
4150 // destination is an object
4151 World.MoveTaskInventoryItem(destId, m_host, objId);
4152 }
4153 else
3833 { 4154 {
4155 ScenePresence presence = World.GetScenePresence(destId);
4156
4157 if (presence == null)
4158 {
4159 UserAccount account =
4160 World.UserAccountService.GetUserAccount(
4161 World.RegionInfo.ScopeID,
4162 destId);
4163
4164 if (account == null)
4165 {
4166 llSay(0, "Can't find destination "+destId.ToString());
4167 return;
4168 }
4169 }
4170
3834 // destination is an avatar 4171 // destination is an avatar
3835 InventoryItemBase agentItem = 4172 InventoryItemBase agentItem =
3836 World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4173 World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
@@ -3840,7 +4177,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3840 4177
3841 byte[] bucket = new byte[17]; 4178 byte[] bucket = new byte[17];
3842 bucket[0] = (byte)assetType; 4179 bucket[0] = (byte)assetType;
3843 byte[] objBytes = objId.GetBytes(); 4180 byte[] objBytes = agentItem.ID.GetBytes();
3844 Array.Copy(objBytes, 0, bucket, 1, 16); 4181 Array.Copy(objBytes, 0, bucket, 1, 16);
3845 4182
3846 Console.WriteLine("Giving inventory"); 4183 Console.WriteLine("Giving inventory");
@@ -3856,33 +4193,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3856 4193
3857 if (m_TransferModule != null) 4194 if (m_TransferModule != null)
3858 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4195 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4196
4197 //This delay should only occur when giving inventory to avatars.
4198 ScriptSleep(3000);
3859 } 4199 }
3860 else
3861 {
3862 // destination is an object
3863 World.MoveTaskInventoryItem(destId, m_host, objId);
3864 }
3865 ScriptSleep(3000);
3866 } 4200 }
3867 4201
4202 [DebuggerNonUserCode]
3868 public void llRemoveInventory(string name) 4203 public void llRemoveInventory(string name)
3869 { 4204 {
3870 m_host.AddScriptLPS(1); 4205 m_host.AddScriptLPS(1);
3871 4206
3872 lock (m_host.TaskInventory) 4207 m_host.TaskInventory.LockItemsForRead(true);
4208 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3873 { 4209 {
3874 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4210 if (item.Name == name)
3875 { 4211 {
3876 if (item.Name == name) 4212 if (item.ItemID == m_itemID)
3877 { 4213 throw new ScriptDeleteException();
3878 if (item.ItemID == m_itemID) 4214 else
3879 throw new ScriptDeleteException(); 4215 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3880 else 4216
3881 m_host.Inventory.RemoveInventoryItem(item.ItemID); 4217 m_host.TaskInventory.LockItemsForRead(false);
3882 return; 4218 return;
3883 }
3884 } 4219 }
3885 } 4220 }
4221 m_host.TaskInventory.LockItemsForRead(false);
3886 } 4222 }
3887 4223
3888 public void llSetText(string text, LSL_Vector color, double alpha) 4224 public void llSetText(string text, LSL_Vector color, double alpha)
@@ -3972,6 +4308,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3972 { 4308 {
3973 m_host.AddScriptLPS(1); 4309 m_host.AddScriptLPS(1);
3974 4310
4311 //Clone is thread safe
3975 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 4312 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
3976 4313
3977 foreach (TaskInventoryItem item in itemDictionary.Values) 4314 foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -4025,6 +4362,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4025 ScenePresence presence = World.GetScenePresence(agentId); 4362 ScenePresence presence = World.GetScenePresence(agentId);
4026 if (presence != null) 4363 if (presence != null)
4027 { 4364 {
4365 // agent must not be a god
4366 if (presence.GodLevel >= 200) return;
4367
4028 // agent must be over the owners land 4368 // agent must be over the owners land
4029 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4369 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4030 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 4370 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
@@ -4085,17 +4425,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4085 UUID soundId = UUID.Zero; 4425 UUID soundId = UUID.Zero;
4086 if (!UUID.TryParse(impact_sound, out soundId)) 4426 if (!UUID.TryParse(impact_sound, out soundId))
4087 { 4427 {
4088 lock (m_host.TaskInventory) 4428 m_host.TaskInventory.LockItemsForRead(true);
4429 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4089 { 4430 {
4090 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4431 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
4091 { 4432 {
4092 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound) 4433 soundId = item.AssetID;
4093 { 4434 break;
4094 soundId = item.AssetID;
4095 break;
4096 }
4097 } 4435 }
4098 } 4436 }
4437 m_host.TaskInventory.LockItemsForRead(false);
4099 } 4438 }
4100 m_host.CollisionSound = soundId; 4439 m_host.CollisionSound = soundId;
4101 m_host.CollisionSoundVolume = (float)impact_volume; 4440 m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4141,6 +4480,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4141 UUID partItemID; 4480 UUID partItemID;
4142 foreach (SceneObjectPart part in parts) 4481 foreach (SceneObjectPart part in parts)
4143 { 4482 {
4483 //Clone is thread safe
4144 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 4484 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
4145 4485
4146 foreach (TaskInventoryItem item in itemsDictionary.Values) 4486 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4355,17 +4695,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4355 4695
4356 m_host.AddScriptLPS(1); 4696 m_host.AddScriptLPS(1);
4357 4697
4358 lock (m_host.TaskInventory) 4698 m_host.TaskInventory.LockItemsForRead(true);
4699 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4359 { 4700 {
4360 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4701 if (item.Type == 10 && item.ItemID == m_itemID)
4361 { 4702 {
4362 if (item.Type == 10 && item.ItemID == m_itemID) 4703 result = item.Name!=null?item.Name:String.Empty;
4363 { 4704 break;
4364 result = item.Name != null ? item.Name : String.Empty;
4365 break;
4366 }
4367 } 4705 }
4368 } 4706 }
4707 m_host.TaskInventory.LockItemsForRead(false);
4369 4708
4370 return result; 4709 return result;
4371 } 4710 }
@@ -4518,23 +4857,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4518 { 4857 {
4519 m_host.AddScriptLPS(1); 4858 m_host.AddScriptLPS(1);
4520 4859
4521 lock (m_host.TaskInventory) 4860 m_host.TaskInventory.LockItemsForRead(true);
4861 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
4522 { 4862 {
4523 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4863 if (inv.Value.Name == name)
4524 { 4864 {
4525 if (inv.Value.Name == name) 4865 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
4526 { 4866 {
4527 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 4867 m_host.TaskInventory.LockItemsForRead(false);
4528 { 4868 return inv.Value.AssetID.ToString();
4529 return inv.Value.AssetID.ToString(); 4869 }
4530 } 4870 else
4531 else 4871 {
4532 { 4872 m_host.TaskInventory.LockItemsForRead(false);
4533 return UUID.Zero.ToString(); 4873 return UUID.Zero.ToString();
4534 }
4535 } 4874 }
4536 } 4875 }
4537 } 4876 }
4877 m_host.TaskInventory.LockItemsForRead(false);
4538 4878
4539 return UUID.Zero.ToString(); 4879 return UUID.Zero.ToString();
4540 } 4880 }
@@ -4687,14 +5027,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4687 { 5027 {
4688 m_host.AddScriptLPS(1); 5028 m_host.AddScriptLPS(1);
4689 5029
4690 if (src == null) 5030 return src.Length;
4691 {
4692 return 0;
4693 }
4694 else
4695 {
4696 return src.Length;
4697 }
4698 } 5031 }
4699 5032
4700 public LSL_Integer llList2Integer(LSL_List src, int index) 5033 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -5470,10 +5803,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5470 m_host.AddScriptLPS(1); 5803 m_host.AddScriptLPS(1);
5471 5804
5472 List<SceneObjectPart> parts = GetLinkParts(linknumber); 5805 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5473 5806 if (parts.Count > 0)
5474 foreach (var part in parts)
5475 { 5807 {
5476 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); 5808 try
5809 {
5810 parts[0].ParentGroup.areUpdatesSuspended = true;
5811 foreach (var part in parts)
5812 {
5813 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
5814 }
5815 }
5816 finally
5817 {
5818 parts[0].ParentGroup.areUpdatesSuspended = false;
5819 }
5477 } 5820 }
5478 } 5821 }
5479 5822
@@ -5529,74 +5872,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5529 5872
5530 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers) 5873 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
5531 { 5874 {
5532 m_host.AddScriptLPS(1); 5875 return ParseString2List(str, separators, in_spacers, false);
5533 LSL_List ret = new LSL_List();
5534 LSL_List spacers = new LSL_List();
5535 if (in_spacers.Length > 0 && separators.Length > 0)
5536 {
5537 for (int i = 0; i < in_spacers.Length; i++)
5538 {
5539 object s = in_spacers.Data[i];
5540 for (int j = 0; j < separators.Length; j++)
5541 {
5542 if (separators.Data[j].ToString() == s.ToString())
5543 {
5544 s = null;
5545 break;
5546 }
5547 }
5548 if (s != null)
5549 {
5550 spacers.Add(s);
5551 }
5552 }
5553 }
5554 object[] delimiters = new object[separators.Length + spacers.Length];
5555 separators.Data.CopyTo(delimiters, 0);
5556 spacers.Data.CopyTo(delimiters, separators.Length);
5557 bool dfound = false;
5558 do
5559 {
5560 dfound = false;
5561 int cindex = -1;
5562 string cdeli = "";
5563 for (int i = 0; i < delimiters.Length; i++)
5564 {
5565 int index = str.IndexOf(delimiters[i].ToString());
5566 bool found = index != -1;
5567 if (found && String.Empty != delimiters[i].ToString())
5568 {
5569 if ((cindex > index) || (cindex == -1))
5570 {
5571 cindex = index;
5572 cdeli = delimiters[i].ToString();
5573 }
5574 dfound = dfound || found;
5575 }
5576 }
5577 if (cindex != -1)
5578 {
5579 if (cindex > 0)
5580 {
5581 ret.Add(new LSL_String(str.Substring(0, cindex)));
5582 }
5583 // Cannot use spacers.Contains() because spacers may be either type String or LSLString
5584 for (int j = 0; j < spacers.Length; j++)
5585 {
5586 if (spacers.Data[j].ToString() == cdeli)
5587 {
5588 ret.Add(new LSL_String(cdeli));
5589 break;
5590 }
5591 }
5592 str = str.Substring(cindex + cdeli.Length);
5593 }
5594 } while (dfound);
5595 if (str != "")
5596 {
5597 ret.Add(new LSL_String(str));
5598 }
5599 return ret;
5600 } 5876 }
5601 5877
5602 public LSL_Integer llOverMyLand(string id) 5878 public LSL_Integer llOverMyLand(string id)
@@ -5799,7 +6075,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5799 return m_host.ParentGroup.RootPart.AttachmentPoint; 6075 return m_host.ParentGroup.RootPart.AttachmentPoint;
5800 } 6076 }
5801 6077
5802 public LSL_Integer llGetFreeMemory() 6078 public virtual LSL_Integer llGetFreeMemory()
5803 { 6079 {
5804 m_host.AddScriptLPS(1); 6080 m_host.AddScriptLPS(1);
5805 // Make scripts designed for LSO happy 6081 // Make scripts designed for LSO happy
@@ -6110,14 +6386,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6110 6386
6111 protected UUID GetTaskInventoryItem(string name) 6387 protected UUID GetTaskInventoryItem(string name)
6112 { 6388 {
6113 lock (m_host.TaskInventory) 6389 m_host.TaskInventory.LockItemsForRead(true);
6390 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6114 { 6391 {
6115 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6392 if (inv.Value.Name == name)
6116 { 6393 {
6117 if (inv.Value.Name == name) 6394 m_host.TaskInventory.LockItemsForRead(false);
6118 return inv.Key; 6395 return inv.Key;
6119 } 6396 }
6120 } 6397 }
6398 m_host.TaskInventory.LockItemsForRead(false);
6121 6399
6122 return UUID.Zero; 6400 return UUID.Zero;
6123 } 6401 }
@@ -6445,22 +6723,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6445 } 6723 }
6446 6724
6447 // copy the first script found with this inventory name 6725 // copy the first script found with this inventory name
6448 lock (m_host.TaskInventory) 6726 m_host.TaskInventory.LockItemsForRead(true);
6727 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6449 { 6728 {
6450 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6729 if (inv.Value.Name == name)
6451 { 6730 {
6452 if (inv.Value.Name == name) 6731 // make sure the object is a script
6732 if (10 == inv.Value.Type)
6453 { 6733 {
6454 // make sure the object is a script 6734 found = true;
6455 if (10 == inv.Value.Type) 6735 srcId = inv.Key;
6456 { 6736 break;
6457 found = true;
6458 srcId = inv.Key;
6459 break;
6460 }
6461 } 6737 }
6462 } 6738 }
6463 } 6739 }
6740 m_host.TaskInventory.LockItemsForRead(false);
6464 6741
6465 if (!found) 6742 if (!found)
6466 { 6743 {
@@ -6544,6 +6821,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6544 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist) 6821 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist)
6545 { 6822 {
6546 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 6823 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6824 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6825 return shapeBlock;
6547 6826
6548 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 6827 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6549 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 6828 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6619,6 +6898,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6619 6898
6620 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge) 6899 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge)
6621 { 6900 {
6901 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6902 return;
6903
6622 ObjectShapePacket.ObjectDataBlock shapeBlock; 6904 ObjectShapePacket.ObjectDataBlock shapeBlock;
6623 6905
6624 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 6906 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6668,6 +6950,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6668 6950
6669 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge) 6951 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge)
6670 { 6952 {
6953 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6954 return;
6955
6671 ObjectShapePacket.ObjectDataBlock shapeBlock; 6956 ObjectShapePacket.ObjectDataBlock shapeBlock;
6672 6957
6673 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 6958 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6710,6 +6995,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6710 6995
6711 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte fudge) 6996 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte fudge)
6712 { 6997 {
6998 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6999 return;
7000
6713 ObjectShapePacket.ObjectDataBlock shapeBlock; 7001 ObjectShapePacket.ObjectDataBlock shapeBlock;
6714 7002
6715 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7003 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6836,6 +7124,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6836 7124
6837 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type) 7125 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type)
6838 { 7126 {
7127 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7128 return;
7129
6839 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7130 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6840 UUID sculptId; 7131 UUID sculptId;
6841 7132
@@ -6851,13 +7142,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6851 shapeBlock.PathScaleX = 100; 7142 shapeBlock.PathScaleX = 100;
6852 shapeBlock.PathScaleY = 150; 7143 shapeBlock.PathScaleY = 150;
6853 7144
6854 if (type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER && 7145 if ((type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER) == 0 &&
6855 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE && 7146 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE) == 0 &&
6856 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE && 7147 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE) == 0 &&
6857 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) 7148 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) == 0)
6858 { 7149 {
6859 // default 7150 // default
6860 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7151 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
6861 } 7152 }
6862 7153
6863 // retain pathcurve 7154 // retain pathcurve
@@ -6874,23 +7165,83 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6874 SetPrimParams(m_host, rules); 7165 SetPrimParams(m_host, rules);
6875 } 7166 }
6876 7167
6877 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) 7168 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
6878 { 7169 {
6879 m_host.AddScriptLPS(1); 7170 m_host.AddScriptLPS(1);
6880 7171
6881 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7172 List<SceneObjectPart> parts = GetLinkParts(linknumber);
7173 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7174 if (parts.Count>0)
7175 {
7176 try
7177 {
7178 parts[0].ParentGroup.areUpdatesSuspended = true;
7179 foreach (SceneObjectPart part in parts)
7180 SetPrimParams(part, rules);
7181 }
7182 finally
7183 {
7184 parts[0].ParentGroup.areUpdatesSuspended = false;
7185 }
7186 }
7187 if (avatars.Count > 0)
7188 {
7189 foreach (ScenePresence avatar in avatars)
7190 SetPrimParams(avatar, rules);
7191 }
7192 }
6882 7193
6883 foreach (SceneObjectPart part in parts) 7194 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
6884 SetPrimParams(part, rules); 7195 {
7196 llSetLinkPrimitiveParamsFast(linknumber, rules);
7197 ScriptSleep(200);
6885 } 7198 }
6886 7199
6887 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7200 protected void SetPrimParams(ScenePresence av, LSL_List rules)
6888 { 7201 {
6889 llSetLinkPrimitiveParams(linknumber, rules); 7202 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
7203 //We only support PRIM_POSITION and PRIM_ROTATION
7204
7205 int idx = 0;
7206
7207 while (idx < rules.Length)
7208 {
7209 int code = rules.GetLSLIntegerItem(idx++);
7210
7211 int remain = rules.Length - idx;
7212
7213
7214
7215 switch (code)
7216 {
7217 case (int)ScriptBaseClass.PRIM_POSITION:
7218 if (remain < 1)
7219 return;
7220 LSL_Vector v;
7221 v = rules.GetVector3Item(idx++);
7222 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
7223 av.SendFullUpdateToAllClients();
7224
7225 break;
7226
7227 case (int)ScriptBaseClass.PRIM_ROTATION:
7228 if (remain < 1)
7229 return;
7230 LSL_Rotation r;
7231 r = rules.GetQuaternionItem(idx++);
7232 av.OffsetRotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
7233 av.SendFullUpdateToAllClients();
7234 break;
7235 }
7236 }
7237
6890 } 7238 }
6891 7239
6892 protected void SetPrimParams(SceneObjectPart part, LSL_List rules) 7240 protected void SetPrimParams(SceneObjectPart part, LSL_List rules)
6893 { 7241 {
7242 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7243 return;
7244
6894 int idx = 0; 7245 int idx = 0;
6895 7246
6896 while (idx < rules.Length) 7247 while (idx < rules.Length)
@@ -7722,24 +8073,95 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7722 break; 8073 break;
7723 8074
7724 case (int)ScriptBaseClass.PRIM_BUMP_SHINY: 8075 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
7725 // TODO--------------
7726 if (remain < 1) 8076 if (remain < 1)
7727 return res; 8077 return res;
8078 face = (int)rules.GetLSLIntegerItem(idx++);
7728 8079
7729 face=(int)rules.GetLSLIntegerItem(idx++); 8080 tex = part.Shape.Textures;
7730 8081 int shiny;
7731 res.Add(new LSL_Integer(0)); 8082 if (face == ScriptBaseClass.ALL_SIDES)
7732 res.Add(new LSL_Integer(0)); 8083 {
8084 for (face = 0; face < GetNumberOfSides(part); face++)
8085 {
8086 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8087 if (shinyness == Shininess.High)
8088 {
8089 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8090 }
8091 else if (shinyness == Shininess.Medium)
8092 {
8093 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8094 }
8095 else if (shinyness == Shininess.Low)
8096 {
8097 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8098 }
8099 else
8100 {
8101 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8102 }
8103 res.Add(new LSL_Integer(shiny));
8104 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8105 }
8106 }
8107 else
8108 {
8109 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8110 if (shinyness == Shininess.High)
8111 {
8112 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8113 }
8114 else if (shinyness == Shininess.Medium)
8115 {
8116 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8117 }
8118 else if (shinyness == Shininess.Low)
8119 {
8120 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8121 }
8122 else
8123 {
8124 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8125 }
8126 res.Add(new LSL_Integer(shiny));
8127 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8128 }
7733 break; 8129 break;
7734 8130
7735 case (int)ScriptBaseClass.PRIM_FULLBRIGHT: 8131 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
7736 // TODO--------------
7737 if (remain < 1) 8132 if (remain < 1)
7738 return res; 8133 return res;
8134 face = (int)rules.GetLSLIntegerItem(idx++);
7739 8135
7740 face=(int)rules.GetLSLIntegerItem(idx++); 8136 tex = part.Shape.Textures;
7741 8137 int fullbright;
7742 res.Add(new LSL_Integer(0)); 8138 if (face == ScriptBaseClass.ALL_SIDES)
8139 {
8140 for (face = 0; face < GetNumberOfSides(part); face++)
8141 {
8142 if (tex.GetFace((uint)face).Fullbright == true)
8143 {
8144 fullbright = ScriptBaseClass.TRUE;
8145 }
8146 else
8147 {
8148 fullbright = ScriptBaseClass.FALSE;
8149 }
8150 res.Add(new LSL_Integer(fullbright));
8151 }
8152 }
8153 else
8154 {
8155 if (tex.GetFace((uint)face).Fullbright == true)
8156 {
8157 fullbright = ScriptBaseClass.TRUE;
8158 }
8159 else
8160 {
8161 fullbright = ScriptBaseClass.FALSE;
8162 }
8163 res.Add(new LSL_Integer(fullbright));
8164 }
7743 break; 8165 break;
7744 8166
7745 case (int)ScriptBaseClass.PRIM_FLEXIBLE: 8167 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
@@ -7760,14 +8182,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7760 break; 8182 break;
7761 8183
7762 case (int)ScriptBaseClass.PRIM_TEXGEN: 8184 case (int)ScriptBaseClass.PRIM_TEXGEN:
7763 // TODO--------------
7764 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR) 8185 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
7765 if (remain < 1) 8186 if (remain < 1)
7766 return res; 8187 return res;
8188 face = (int)rules.GetLSLIntegerItem(idx++);
7767 8189
7768 face=(int)rules.GetLSLIntegerItem(idx++); 8190 tex = part.Shape.Textures;
7769 8191 if (face == ScriptBaseClass.ALL_SIDES)
7770 res.Add(new LSL_Integer(0)); 8192 {
8193 for (face = 0; face < GetNumberOfSides(part); face++)
8194 {
8195 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8196 {
8197 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8198 }
8199 else
8200 {
8201 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8202 }
8203 }
8204 }
8205 else
8206 {
8207 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8208 {
8209 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8210 }
8211 else
8212 {
8213 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8214 }
8215 }
7771 break; 8216 break;
7772 8217
7773 case (int)ScriptBaseClass.PRIM_POINT_LIGHT: 8218 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
@@ -7786,13 +8231,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7786 break; 8231 break;
7787 8232
7788 case (int)ScriptBaseClass.PRIM_GLOW: 8233 case (int)ScriptBaseClass.PRIM_GLOW:
7789 // TODO--------------
7790 if (remain < 1) 8234 if (remain < 1)
7791 return res; 8235 return res;
8236 face = (int)rules.GetLSLIntegerItem(idx++);
7792 8237
7793 face=(int)rules.GetLSLIntegerItem(idx++); 8238 tex = part.Shape.Textures;
7794 8239 float primglow;
7795 res.Add(new LSL_Float(0)); 8240 if (face == ScriptBaseClass.ALL_SIDES)
8241 {
8242 for (face = 0; face < GetNumberOfSides(part); face++)
8243 {
8244 primglow = tex.GetFace((uint)face).Glow;
8245 res.Add(new LSL_Float(primglow));
8246 }
8247 }
8248 else
8249 {
8250 primglow = tex.GetFace((uint)face).Glow;
8251 res.Add(new LSL_Float(primglow));
8252 }
7796 break; 8253 break;
7797 case (int)ScriptBaseClass.PRIM_TEXT: 8254 case (int)ScriptBaseClass.PRIM_TEXT:
7798 Color4 textColor = part.GetTextColor(); 8255 Color4 textColor = part.GetTextColor();
@@ -8098,8 +8555,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8098 // The function returns an ordered list 8555 // The function returns an ordered list
8099 // representing the tokens found in the supplied 8556 // representing the tokens found in the supplied
8100 // sources string. If two successive tokenizers 8557 // sources string. If two successive tokenizers
8101 // are encountered, then a NULL entry is added 8558 // are encountered, then a null-string entry is
8102 // to the list. 8559 // added to the list.
8103 // 8560 //
8104 // It is a precondition that the source and 8561 // It is a precondition that the source and
8105 // toekizer lisst are non-null. If they are null, 8562 // toekizer lisst are non-null. If they are null,
@@ -8107,7 +8564,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8107 // while their lengths are being determined. 8564 // while their lengths are being determined.
8108 // 8565 //
8109 // A small amount of working memoryis required 8566 // A small amount of working memoryis required
8110 // of approximately 8*#tokenizers. 8567 // of approximately 8*#tokenizers + 8*srcstrlen.
8111 // 8568 //
8112 // There are many ways in which this function 8569 // There are many ways in which this function
8113 // can be implemented, this implementation is 8570 // can be implemented, this implementation is
@@ -8123,136 +8580,111 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8123 // and eliminates redundant tokenizers as soon 8580 // and eliminates redundant tokenizers as soon
8124 // as is possible. 8581 // as is possible.
8125 // 8582 //
8126 // The implementation tries to avoid any copying 8583 // The implementation tries to minimize temporary
8127 // of arrays or other objects. 8584 // garbage generation.
8128 // </remarks> 8585 // </remarks>
8129 8586
8130 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers) 8587 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8131 { 8588 {
8132 int beginning = 0; 8589 return ParseString2List(src, separators, spacers, true);
8133 int srclen = src.Length; 8590 }
8134 int seplen = separators.Length;
8135 object[] separray = separators.Data;
8136 int spclen = spacers.Length;
8137 object[] spcarray = spacers.Data;
8138 int mlen = seplen+spclen;
8139
8140 int[] offset = new int[mlen+1];
8141 bool[] active = new bool[mlen];
8142 8591
8143 int best; 8592 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
8144 int j; 8593 {
8594 int srclen = src.Length;
8595 int seplen = separators.Length;
8596 object[] separray = separators.Data;
8597 int spclen = spacers.Length;
8598 object[] spcarray = spacers.Data;
8599 int dellen = 0;
8600 string[] delarray = new string[seplen+spclen];
8145 8601
8146 // Initial capacity reduces resize cost 8602 int outlen = 0;
8603 string[] outarray = new string[srclen*2+1];
8147 8604
8148 LSL_List tokens = new LSL_List(); 8605 int i, j;
8606 string d;
8149 8607
8150 m_host.AddScriptLPS(1); 8608 m_host.AddScriptLPS(1);
8151 8609
8152 // All entries are initially valid 8610 /*
8153 8611 * Convert separator and spacer lists to C# strings.
8154 for (int i = 0; i < mlen; i++) 8612 * Also filter out null strings so we don't hang.
8155 active[i] = true; 8613 */
8156 8614 for (i = 0; i < seplen; i ++) {
8157 offset[mlen] = srclen; 8615 d = separray[i].ToString();
8158 8616 if (d.Length > 0) {
8159 while (beginning < srclen) 8617 delarray[dellen++] = d;
8160 { 8618 }
8161 8619 }
8162 best = mlen; // as bad as it gets 8620 seplen = dellen;
8163
8164 // Scan for separators
8165 8621
8166 for (j = 0; j < seplen; j++) 8622 for (i = 0; i < spclen; i ++) {
8167 { 8623 d = spcarray[i].ToString();
8168 if (active[j]) 8624 if (d.Length > 0) {
8169 { 8625 delarray[dellen++] = d;
8170 // scan all of the markers
8171 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1)
8172 {
8173 // not present at all
8174 active[j] = false;
8175 }
8176 else
8177 {
8178 // present and correct
8179 if (offset[j] < offset[best])
8180 {
8181 // closest so far
8182 best = j;
8183 if (offset[best] == beginning)
8184 break;
8185 }
8186 }
8187 }
8188 } 8626 }
8627 }
8189 8628
8190 // Scan for spacers 8629 /*
8630 * Scan through source string from beginning to end.
8631 */
8632 for (i = 0;;) {
8191 8633
8192 if (offset[best] != beginning) 8634 /*
8193 { 8635 * Find earliest delimeter in src starting at i (if any).
8194 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 8636 */
8195 { 8637 int earliestDel = -1;
8196 if (active[j]) 8638 int earliestSrc = srclen;
8197 { 8639 string earliestStr = null;
8198 // scan all of the markers 8640 for (j = 0; j < dellen; j ++) {
8199 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1) 8641 d = delarray[j];
8200 { 8642 if (d != null) {
8201 // not present at all 8643 int index = src.IndexOf(d, i);
8202 active[j] = false; 8644 if (index < 0) {
8203 } 8645 delarray[j] = null; // delim nowhere in src, don't check it anymore
8204 else 8646 } else if (index < earliestSrc) {
8205 { 8647 earliestSrc = index; // where delimeter starts in source string
8206 // present and correct 8648 earliestDel = j; // where delimeter is in delarray[]
8207 if (offset[j] < offset[best]) 8649 earliestStr = d; // the delimeter string from delarray[]
8208 { 8650 if (index == i) break; // can't do any better than found at beg of string
8209 // closest so far
8210 best = j;
8211 }
8212 }
8213 } 8651 }
8214 } 8652 }
8215 } 8653 }
8216 8654
8217 // This is the normal exit from the scanning loop 8655 /*
8218 8656 * Output source string starting at i through start of earliest delimeter.
8219 if (best == mlen) 8657 */
8220 { 8658 if (keepNulls || (earliestSrc > i)) {
8221 // no markers were found on this pass 8659 outarray[outlen++] = src.Substring(i, earliestSrc - i);
8222 // so we're pretty much done
8223 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
8224 break;
8225 } 8660 }
8226 8661
8227 // Otherwise we just add the newly delimited token 8662 /*
8228 // and recalculate where the search should continue. 8663 * If no delimeter found at or after i, we're done scanning.
8664 */
8665 if (earliestDel < 0) break;
8229 8666
8230 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 8667 /*
8231 8668 * If delimeter was a spacer, output the spacer.
8232 if (best < seplen) 8669 */
8233 { 8670 if (earliestDel >= seplen) {
8234 beginning = offset[best] + (separray[best].ToString()).Length; 8671 outarray[outlen++] = earliestStr;
8235 } 8672 }
8236 else
8237 {
8238 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
8239 tokens.Add(new LSL_String(spcarray[best - seplen].ToString()));
8240 }
8241 }
8242 8673
8243 // This an awkward an not very intuitive boundary case. If the 8674 /*
8244 // last substring is a tokenizer, then there is an implied trailing 8675 * Look at rest of src string following delimeter.
8245 // null list entry. Hopefully the single comparison will not be too 8676 */
8246 // arduous. Alternatively the 'break' could be replced with a return 8677 i = earliestSrc + earliestStr.Length;
8247 // but that's shabby programming.
8248
8249 if (beginning == srclen)
8250 {
8251 if (srclen != 0)
8252 tokens.Add(new LSL_String(""));
8253 } 8678 }
8254 8679
8255 return tokens; 8680 /*
8681 * Make up an exact-sized output array suitable for an LSL_List object.
8682 */
8683 object[] outlist = new object[outlen];
8684 for (i = 0; i < outlen; i ++) {
8685 outlist[i] = new LSL_String(outarray[i]);
8686 }
8687 return new LSL_List(outlist);
8256 } 8688 }
8257 8689
8258 public LSL_Integer llGetObjectPermMask(int mask) 8690 public LSL_Integer llGetObjectPermMask(int mask)
@@ -8329,28 +8761,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8329 { 8761 {
8330 m_host.AddScriptLPS(1); 8762 m_host.AddScriptLPS(1);
8331 8763
8332 lock (m_host.TaskInventory) 8764 m_host.TaskInventory.LockItemsForRead(true);
8765 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8333 { 8766 {
8334 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 8767 if (inv.Value.Name == item)
8335 { 8768 {
8336 if (inv.Value.Name == item) 8769 m_host.TaskInventory.LockItemsForRead(false);
8770 switch (mask)
8337 { 8771 {
8338 switch (mask) 8772 case 0:
8339 { 8773 return (int)inv.Value.BasePermissions;
8340 case 0: 8774 case 1:
8341 return (int)inv.Value.BasePermissions; 8775 return (int)inv.Value.CurrentPermissions;
8342 case 1: 8776 case 2:
8343 return (int)inv.Value.CurrentPermissions; 8777 return (int)inv.Value.GroupPermissions;
8344 case 2: 8778 case 3:
8345 return (int)inv.Value.GroupPermissions; 8779 return (int)inv.Value.EveryonePermissions;
8346 case 3: 8780 case 4:
8347 return (int)inv.Value.EveryonePermissions; 8781 return (int)inv.Value.NextPermissions;
8348 case 4:
8349 return (int)inv.Value.NextPermissions;
8350 }
8351 } 8782 }
8352 } 8783 }
8353 } 8784 }
8785 m_host.TaskInventory.LockItemsForRead(false);
8354 8786
8355 return -1; 8787 return -1;
8356 } 8788 }
@@ -8397,16 +8829,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8397 { 8829 {
8398 m_host.AddScriptLPS(1); 8830 m_host.AddScriptLPS(1);
8399 8831
8400 lock (m_host.TaskInventory) 8832 m_host.TaskInventory.LockItemsForRead(true);
8833 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8401 { 8834 {
8402 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 8835 if (inv.Value.Name == item)
8403 { 8836 {
8404 if (inv.Value.Name == item) 8837 m_host.TaskInventory.LockItemsForRead(false);
8405 { 8838 return inv.Value.CreatorID.ToString();
8406 return inv.Value.CreatorID.ToString();
8407 }
8408 } 8839 }
8409 } 8840 }
8841 m_host.TaskInventory.LockItemsForRead(false);
8410 8842
8411 llSay(0, "No item name '" + item + "'"); 8843 llSay(0, "No item name '" + item + "'");
8412 8844
@@ -8666,17 +9098,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8666 int width = 0; 9098 int width = 0;
8667 int height = 0; 9099 int height = 0;
8668 9100
8669 ParcelMediaCommandEnum? commandToSend = null; 9101 uint commandToSend = 0;
8670 float time = 0.0f; // default is from start 9102 float time = 0.0f; // default is from start
8671 9103
8672 ScenePresence presence = null; 9104 ScenePresence presence = null;
8673 9105
8674 for (int i = 0; i < commandList.Data.Length; i++) 9106 for (int i = 0; i < commandList.Data.Length; i++)
8675 { 9107 {
8676 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 9108 uint command = (uint)(commandList.GetLSLIntegerItem(i));
8677 switch (command) 9109 switch (command)
8678 { 9110 {
8679 case ParcelMediaCommandEnum.Agent: 9111 case (uint)ParcelMediaCommandEnum.Agent:
8680 // we send only to one agent 9112 // we send only to one agent
8681 if ((i + 1) < commandList.Length) 9113 if ((i + 1) < commandList.Length)
8682 { 9114 {
@@ -8693,25 +9125,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8693 } 9125 }
8694 break; 9126 break;
8695 9127
8696 case ParcelMediaCommandEnum.Loop: 9128 case (uint)ParcelMediaCommandEnum.Loop:
8697 loop = 1; 9129 loop = 1;
8698 commandToSend = command; 9130 commandToSend = command;
8699 update = true; //need to send the media update packet to set looping 9131 update = true; //need to send the media update packet to set looping
8700 break; 9132 break;
8701 9133
8702 case ParcelMediaCommandEnum.Play: 9134 case (uint)ParcelMediaCommandEnum.Play:
8703 loop = 0; 9135 loop = 0;
8704 commandToSend = command; 9136 commandToSend = command;
8705 update = true; //need to send the media update packet to make sure it doesn't loop 9137 update = true; //need to send the media update packet to make sure it doesn't loop
8706 break; 9138 break;
8707 9139
8708 case ParcelMediaCommandEnum.Pause: 9140 case (uint)ParcelMediaCommandEnum.Pause:
8709 case ParcelMediaCommandEnum.Stop: 9141 case (uint)ParcelMediaCommandEnum.Stop:
8710 case ParcelMediaCommandEnum.Unload: 9142 case (uint)ParcelMediaCommandEnum.Unload:
8711 commandToSend = command; 9143 commandToSend = command;
8712 break; 9144 break;
8713 9145
8714 case ParcelMediaCommandEnum.Url: 9146 case (uint)ParcelMediaCommandEnum.Url:
8715 if ((i + 1) < commandList.Length) 9147 if ((i + 1) < commandList.Length)
8716 { 9148 {
8717 if (commandList.Data[i + 1] is LSL_String) 9149 if (commandList.Data[i + 1] is LSL_String)
@@ -8724,7 +9156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8724 } 9156 }
8725 break; 9157 break;
8726 9158
8727 case ParcelMediaCommandEnum.Texture: 9159 case (uint)ParcelMediaCommandEnum.Texture:
8728 if ((i + 1) < commandList.Length) 9160 if ((i + 1) < commandList.Length)
8729 { 9161 {
8730 if (commandList.Data[i + 1] is LSL_String) 9162 if (commandList.Data[i + 1] is LSL_String)
@@ -8737,7 +9169,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8737 } 9169 }
8738 break; 9170 break;
8739 9171
8740 case ParcelMediaCommandEnum.Time: 9172 case (uint)ParcelMediaCommandEnum.Time:
8741 if ((i + 1) < commandList.Length) 9173 if ((i + 1) < commandList.Length)
8742 { 9174 {
8743 if (commandList.Data[i + 1] is LSL_Float) 9175 if (commandList.Data[i + 1] is LSL_Float)
@@ -8749,7 +9181,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8749 } 9181 }
8750 break; 9182 break;
8751 9183
8752 case ParcelMediaCommandEnum.AutoAlign: 9184 case (uint)ParcelMediaCommandEnum.AutoAlign:
8753 if ((i + 1) < commandList.Length) 9185 if ((i + 1) < commandList.Length)
8754 { 9186 {
8755 if (commandList.Data[i + 1] is LSL_Integer) 9187 if (commandList.Data[i + 1] is LSL_Integer)
@@ -8763,7 +9195,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8763 } 9195 }
8764 break; 9196 break;
8765 9197
8766 case ParcelMediaCommandEnum.Type: 9198 case (uint)ParcelMediaCommandEnum.Type:
8767 if ((i + 1) < commandList.Length) 9199 if ((i + 1) < commandList.Length)
8768 { 9200 {
8769 if (commandList.Data[i + 1] is LSL_String) 9201 if (commandList.Data[i + 1] is LSL_String)
@@ -8776,7 +9208,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8776 } 9208 }
8777 break; 9209 break;
8778 9210
8779 case ParcelMediaCommandEnum.Desc: 9211 case (uint)ParcelMediaCommandEnum.Desc:
8780 if ((i + 1) < commandList.Length) 9212 if ((i + 1) < commandList.Length)
8781 { 9213 {
8782 if (commandList.Data[i + 1] is LSL_String) 9214 if (commandList.Data[i + 1] is LSL_String)
@@ -8789,7 +9221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8789 } 9221 }
8790 break; 9222 break;
8791 9223
8792 case ParcelMediaCommandEnum.Size: 9224 case (uint)ParcelMediaCommandEnum.Size:
8793 if ((i + 2) < commandList.Length) 9225 if ((i + 2) < commandList.Length)
8794 { 9226 {
8795 if (commandList.Data[i + 1] is LSL_Integer) 9227 if (commandList.Data[i + 1] is LSL_Integer)
@@ -8859,7 +9291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8859 } 9291 }
8860 } 9292 }
8861 9293
8862 if (commandToSend != null) 9294 if (commandToSend != 0)
8863 { 9295 {
8864 // the commandList contained a start/stop/... command, too 9296 // the commandList contained a start/stop/... command, too
8865 if (presence == null) 9297 if (presence == null)
@@ -8896,7 +9328,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8896 9328
8897 if (aList.Data[i] != null) 9329 if (aList.Data[i] != null)
8898 { 9330 {
8899 switch ((ParcelMediaCommandEnum) aList.Data[i]) 9331 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
8900 { 9332 {
8901 case ParcelMediaCommandEnum.Url: 9333 case ParcelMediaCommandEnum.Url:
8902 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); 9334 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL));
@@ -8939,16 +9371,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8939 { 9371 {
8940 m_host.AddScriptLPS(1); 9372 m_host.AddScriptLPS(1);
8941 9373
8942 lock (m_host.TaskInventory) 9374 m_host.TaskInventory.LockItemsForRead(true);
9375 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8943 { 9376 {
8944 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9377 if (inv.Value.Name == name)
8945 { 9378 {
8946 if (inv.Value.Name == name) 9379 m_host.TaskInventory.LockItemsForRead(false);
8947 { 9380 return inv.Value.Type;
8948 return inv.Value.Type;
8949 }
8950 } 9381 }
8951 } 9382 }
9383 m_host.TaskInventory.LockItemsForRead(false);
8952 9384
8953 return -1; 9385 return -1;
8954 } 9386 }
@@ -8959,15 +9391,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8959 9391
8960 if (quick_pay_buttons.Data.Length < 4) 9392 if (quick_pay_buttons.Data.Length < 4)
8961 { 9393 {
8962 LSLError("List must have at least 4 elements"); 9394 int x;
8963 return; 9395 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
9396 {
9397 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
9398 }
8964 } 9399 }
8965 m_host.ParentGroup.RootPart.PayPrice[0]=price; 9400 int[] nPrice = new int[5];
8966 9401 nPrice[0]=price;
8967 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 9402 nPrice[1] = (LSL_Integer)quick_pay_buttons.Data[0];
8968 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 9403 nPrice[2] = (LSL_Integer)quick_pay_buttons.Data[1];
8969 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 9404 nPrice[3] = (LSL_Integer)quick_pay_buttons.Data[2];
8970 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 9405 nPrice[4] = (LSL_Integer)quick_pay_buttons.Data[3];
9406 m_host.ParentGroup.RootPart.PayPrice = nPrice;
8971 m_host.ParentGroup.HasGroupChanged = true; 9407 m_host.ParentGroup.HasGroupChanged = true;
8972 } 9408 }
8973 9409
@@ -8979,17 +9415,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8979 if (invItemID == UUID.Zero) 9415 if (invItemID == UUID.Zero)
8980 return new LSL_Vector(); 9416 return new LSL_Vector();
8981 9417
8982 lock (m_host.TaskInventory) 9418 m_host.TaskInventory.LockItemsForRead(true);
9419 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
8983 { 9420 {
8984 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9421 m_host.TaskInventory.LockItemsForRead(false);
8985 return new LSL_Vector(); 9422 return new LSL_Vector();
9423 }
8986 9424
8987 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 9425 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
8988 { 9426 {
8989 ShoutError("No permissions to track the camera"); 9427 ShoutError("No permissions to track the camera");
8990 return new LSL_Vector(); 9428 m_host.TaskInventory.LockItemsForRead(false);
8991 } 9429 return new LSL_Vector();
8992 } 9430 }
9431 m_host.TaskInventory.LockItemsForRead(false);
8993 9432
8994 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 9433 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
8995 if (presence != null) 9434 if (presence != null)
@@ -9007,17 +9446,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9007 if (invItemID == UUID.Zero) 9446 if (invItemID == UUID.Zero)
9008 return new LSL_Rotation(); 9447 return new LSL_Rotation();
9009 9448
9010 lock (m_host.TaskInventory) 9449 m_host.TaskInventory.LockItemsForRead(true);
9450 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9011 { 9451 {
9012 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9452 m_host.TaskInventory.LockItemsForRead(false);
9013 return new LSL_Rotation(); 9453 return new LSL_Rotation();
9014 9454 }
9015 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 9455 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9016 { 9456 {
9017 ShoutError("No permissions to track the camera"); 9457 ShoutError("No permissions to track the camera");
9018 return new LSL_Rotation(); 9458 m_host.TaskInventory.LockItemsForRead(false);
9019 } 9459 return new LSL_Rotation();
9020 } 9460 }
9461 m_host.TaskInventory.LockItemsForRead(false);
9021 9462
9022 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 9463 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9023 if (presence != null) 9464 if (presence != null)
@@ -9079,8 +9520,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9079 { 9520 {
9080 m_host.AddScriptLPS(1); 9521 m_host.AddScriptLPS(1);
9081 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0); 9522 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0);
9082 if (detectedParams == null) return; // only works on the first detected avatar 9523 if (detectedParams == null)
9083 9524 {
9525 if (m_host.IsAttachment == true)
9526 {
9527 detectedParams = new DetectParams();
9528 detectedParams.Key = m_host.OwnerID;
9529 }
9530 else
9531 {
9532 return;
9533 }
9534 }
9535
9084 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 9536 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
9085 if (avatar != null) 9537 if (avatar != null)
9086 { 9538 {
@@ -9088,6 +9540,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9088 new Vector3((float)pos.x, (float)pos.y, (float)pos.z), 9540 new Vector3((float)pos.x, (float)pos.y, (float)pos.z),
9089 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z)); 9541 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z));
9090 } 9542 }
9543
9091 ScriptSleep(1000); 9544 ScriptSleep(1000);
9092 } 9545 }
9093 9546
@@ -9167,14 +9620,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9167 if (objectID == UUID.Zero) return; 9620 if (objectID == UUID.Zero) return;
9168 9621
9169 UUID agentID; 9622 UUID agentID;
9170 lock (m_host.TaskInventory) 9623 m_host.TaskInventory.LockItemsForRead(true);
9171 { 9624 // we need the permission first, to know which avatar we want to set the camera for
9172 // we need the permission first, to know which avatar we want to set the camera for 9625 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9173 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9174 9626
9175 if (agentID == UUID.Zero) return; 9627 if (agentID == UUID.Zero)
9176 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 9628 {
9629 m_host.TaskInventory.LockItemsForRead(false);
9630 return;
9631 }
9632 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
9633 {
9634 m_host.TaskInventory.LockItemsForRead(false);
9635 return;
9177 } 9636 }
9637 m_host.TaskInventory.LockItemsForRead(false);
9178 9638
9179 ScenePresence presence = World.GetScenePresence(agentID); 9639 ScenePresence presence = World.GetScenePresence(agentID);
9180 9640
@@ -9224,12 +9684,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9224 9684
9225 // we need the permission first, to know which avatar we want to clear the camera for 9685 // we need the permission first, to know which avatar we want to clear the camera for
9226 UUID agentID; 9686 UUID agentID;
9227 lock (m_host.TaskInventory) 9687 m_host.TaskInventory.LockItemsForRead(true);
9688 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9689 if (agentID == UUID.Zero)
9690 {
9691 m_host.TaskInventory.LockItemsForRead(false);
9692 return;
9693 }
9694 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
9228 { 9695 {
9229 agentID = m_host.TaskInventory[invItemID].PermsGranter; 9696 m_host.TaskInventory.LockItemsForRead(false);
9230 if (agentID == UUID.Zero) return; 9697 return;
9231 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
9232 } 9698 }
9699 m_host.TaskInventory.LockItemsForRead(false);
9233 9700
9234 ScenePresence presence = World.GetScenePresence(agentID); 9701 ScenePresence presence = World.GetScenePresence(agentID);
9235 9702
@@ -9296,19 +9763,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9296 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 9763 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
9297 { 9764 {
9298 m_host.AddScriptLPS(1); 9765 m_host.AddScriptLPS(1);
9299 string ret = String.Empty; 9766
9300 string src1 = llBase64ToString(str1); 9767 if (str1 == String.Empty)
9301 string src2 = llBase64ToString(str2); 9768 return String.Empty;
9302 int c = 0; 9769 if (str2 == String.Empty)
9303 for (int i = 0; i < src1.Length; i++) 9770 return str1;
9771
9772 byte[] data1 = Convert.FromBase64String(str1);
9773 byte[] data2 = Convert.FromBase64String(str2);
9774
9775 byte[] d2 = new Byte[data1.Length];
9776 int pos = 0;
9777
9778 if (data1.Length <= data2.Length)
9304 { 9779 {
9305 ret += (char) (src1[i] ^ src2[c]); 9780 Array.Copy(data2, 0, d2, 0, data1.Length);
9781 }
9782 else
9783 {
9784 while (pos < data1.Length)
9785 {
9786 int len = data1.Length - pos;
9787 if (len > data2.Length)
9788 len = data2.Length;
9306 9789
9307 c++; 9790 Array.Copy(data2, 0, d2, pos, len);
9308 if (c >= src2.Length) 9791 pos += len;
9309 c = 0; 9792 }
9310 } 9793 }
9311 return llStringToBase64(ret); 9794
9795 for (pos = 0 ; pos < data1.Length ; pos++ )
9796 data1[pos] ^= d2[pos];
9797
9798 return Convert.ToBase64String(data1);
9312 } 9799 }
9313 9800
9314 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 9801 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -9686,15 +10173,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9686 10173
9687 internal UUID ScriptByName(string name) 10174 internal UUID ScriptByName(string name)
9688 { 10175 {
9689 lock (m_host.TaskInventory) 10176 m_host.TaskInventory.LockItemsForRead(true);
10177
10178 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
9690 { 10179 {
9691 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 10180 if (item.Type == 10 && item.Name == name)
9692 { 10181 {
9693 if (item.Type == 10 && item.Name == name) 10182 m_host.TaskInventory.LockItemsForRead(false);
9694 return item.ItemID; 10183 return item.ItemID;
9695 } 10184 }
9696 } 10185 }
9697 10186
10187 m_host.TaskInventory.LockItemsForRead(false);
10188
9698 return UUID.Zero; 10189 return UUID.Zero;
9699 } 10190 }
9700 10191
@@ -9735,6 +10226,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9735 { 10226 {
9736 m_host.AddScriptLPS(1); 10227 m_host.AddScriptLPS(1);
9737 10228
10229 //Clone is thread safe
9738 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10230 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
9739 10231
9740 UUID assetID = UUID.Zero; 10232 UUID assetID = UUID.Zero;
@@ -9797,6 +10289,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9797 { 10289 {
9798 m_host.AddScriptLPS(1); 10290 m_host.AddScriptLPS(1);
9799 10291
10292 //Clone is thread safe
9800 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10293 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
9801 10294
9802 UUID assetID = UUID.Zero; 10295 UUID assetID = UUID.Zero;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index fe71ed5..1fa8c30 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -73,6 +73,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
73 if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false)) 73 if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
74 m_LSFunctionsEnabled = true; 74 m_LSFunctionsEnabled = true;
75 75
76 if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
77 m_LSFunctionsEnabled = true;
78
76 m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>(); 79 m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
77 if (m_comms == null) 80 if (m_comms == null)
78 m_LSFunctionsEnabled = false; 81 m_LSFunctionsEnabled = false;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 01b64eb..db43902 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -769,18 +769,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
769 if (target != null) 769 if (target != null)
770 { 770 {
771 UUID animID=UUID.Zero; 771 UUID animID=UUID.Zero;
772 lock (m_host.TaskInventory) 772 m_host.TaskInventory.LockItemsForRead(true);
773 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
773 { 774 {
774 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 775 if (inv.Value.Name == animation)
775 { 776 {
776 if (inv.Value.Name == animation) 777 if (inv.Value.Type == (int)AssetType.Animation)
777 { 778 animID = inv.Value.AssetID;
778 if (inv.Value.Type == (int)AssetType.Animation) 779 continue;
779 animID = inv.Value.AssetID;
780 continue;
781 }
782 } 780 }
783 } 781 }
782 m_host.TaskInventory.LockItemsForRead(false);
784 if (animID == UUID.Zero) 783 if (animID == UUID.Zero)
785 target.Animator.AddAnimation(animation, m_host.UUID); 784 target.Animator.AddAnimation(animation, m_host.UUID);
786 else 785 else
@@ -802,18 +801,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
802 if (target != null) 801 if (target != null)
803 { 802 {
804 UUID animID=UUID.Zero; 803 UUID animID=UUID.Zero;
805 lock (m_host.TaskInventory) 804 m_host.TaskInventory.LockItemsForRead(true);
805 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
806 { 806 {
807 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 807 if (inv.Value.Name == animation)
808 { 808 {
809 if (inv.Value.Name == animation) 809 if (inv.Value.Type == (int)AssetType.Animation)
810 { 810 animID = inv.Value.AssetID;
811 if (inv.Value.Type == (int)AssetType.Animation) 811 continue;
812 animID = inv.Value.AssetID;
813 continue;
814 }
815 } 812 }
816 } 813 }
814 m_host.TaskInventory.LockItemsForRead(false);
817 815
818 if (animID == UUID.Zero) 816 if (animID == UUID.Zero)
819 target.Animator.RemoveAnimation(animation); 817 target.Animator.RemoveAnimation(animation);
@@ -1664,6 +1662,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1664 1662
1665 if (!UUID.TryParse(name, out assetID)) 1663 if (!UUID.TryParse(name, out assetID))
1666 { 1664 {
1665 m_host.TaskInventory.LockItemsForRead(true);
1667 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1666 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1668 { 1667 {
1669 if (item.Type == 7 && item.Name == name) 1668 if (item.Type == 7 && item.Name == name)
@@ -1671,6 +1670,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1671 assetID = item.AssetID; 1670 assetID = item.AssetID;
1672 } 1671 }
1673 } 1672 }
1673 m_host.TaskInventory.LockItemsForRead(false);
1674 } 1674 }
1675 1675
1676 if (assetID == UUID.Zero) 1676 if (assetID == UUID.Zero)
@@ -1717,6 +1717,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1717 1717
1718 if (!UUID.TryParse(name, out assetID)) 1718 if (!UUID.TryParse(name, out assetID))
1719 { 1719 {
1720 m_host.TaskInventory.LockItemsForRead(true);
1720 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1721 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1721 { 1722 {
1722 if (item.Type == 7 && item.Name == name) 1723 if (item.Type == 7 && item.Name == name)
@@ -1724,6 +1725,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1724 assetID = item.AssetID; 1725 assetID = item.AssetID;
1725 } 1726 }
1726 } 1727 }
1728 m_host.TaskInventory.LockItemsForRead(false);
1727 } 1729 }
1728 1730
1729 if (assetID == UUID.Zero) 1731 if (assetID == UUID.Zero)
@@ -1774,6 +1776,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1774 1776
1775 if (!UUID.TryParse(name, out assetID)) 1777 if (!UUID.TryParse(name, out assetID))
1776 { 1778 {
1779 m_host.TaskInventory.LockItemsForRead(true);
1777 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1780 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1778 { 1781 {
1779 if (item.Type == 7 && item.Name == name) 1782 if (item.Type == 7 && item.Name == name)
@@ -1781,6 +1784,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1781 assetID = item.AssetID; 1784 assetID = item.AssetID;
1782 } 1785 }
1783 } 1786 }
1787 m_host.TaskInventory.LockItemsForRead(false);
1784 } 1788 }
1785 1789
1786 if (assetID == UUID.Zero) 1790 if (assetID == UUID.Zero)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 5c2abd5..a5b1124 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -204,7 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
204 // Is the sensor type is AGENT and not SCRIPTED then include agents 204 // Is the sensor type is AGENT and not SCRIPTED then include agents
205 if ((ts.type & AGENT) != 0 && (ts.type & SCRIPTED) == 0) 205 if ((ts.type & AGENT) != 0 && (ts.type & SCRIPTED) == 0)
206 { 206 {
207 sensedEntities.AddRange(doAgentSensor(ts)); 207 sensedEntities.AddRange(doAgentSensor(ts));
208 } 208 }
209 209
210 // If SCRIPTED or PASSIVE or ACTIVE check objects 210 // If SCRIPTED or PASSIVE or ACTIVE check objects
@@ -309,6 +309,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
309 // in mouselook. 309 // in mouselook.
310 310
311 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar); 311 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
312 fromRegionPos = avatar.AbsolutePosition;
312 q = avatar.Rotation; 313 q = avatar.Rotation;
313 } 314 }
314 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 315 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
@@ -422,6 +423,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
422 SceneObjectPart SensePoint = ts.host; 423 SceneObjectPart SensePoint = ts.host;
423 Vector3 fromRegionPos = SensePoint.AbsolutePosition; 424 Vector3 fromRegionPos = SensePoint.AbsolutePosition;
424 Quaternion q = SensePoint.RotationOffset; 425 Quaternion q = SensePoint.RotationOffset;
426 if (SensePoint.ParentGroup.RootPart.IsAttachment)
427 {
428 // In attachments, the sensor cone always orients with the
429 // avatar rotation. This may include a nonzero elevation if
430 // in mouselook.
431
432 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
433 fromRegionPos = avatar.AbsolutePosition;
434 q = avatar.Rotation;
435 }
425 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 436 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
426 LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r); 437 LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
427 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir); 438 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index eeb59d9..2fd33fe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -109,25 +109,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
109 if (Timers.Count == 0) 109 if (Timers.Count == 0)
110 return; 110 return;
111 111
112 Dictionary<string, TimerClass>.ValueCollection tvals;
112 lock (TimerListLock) 113 lock (TimerListLock)
113 { 114 {
114 // Go through all timers 115 // Go through all timers
115 Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values; 116 tvals = Timers.Values;
116 foreach (TimerClass ts in tvals) 117 }
118
119 foreach (TimerClass ts in tvals)
120 {
121 // Time has passed?
122 if (ts.next < DateTime.Now.Ticks)
117 { 123 {
118 // Time has passed? 124 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
119 if (ts.next < DateTime.Now.Ticks) 125 // Add it to queue
120 { 126 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
121 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 127 new EventParams("timer", new Object[0],
122 // Add it to queue 128 new DetectParams[0]));
123 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 129 // set next interval
124 new EventParams("timer", new Object[0], 130
125 new DetectParams[0])); 131 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
126 // set next interval 132 ts.next = DateTime.Now.Ticks + ts.interval;
127
128 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
129 ts.next = DateTime.Now.Ticks + ts.interval;
130 }
131 } 133 }
132 } 134 }
133 } 135 }
generated by cgit v1.1 at 2024-10-25 16:33:22 +0000