aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs1879
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs53
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs16
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs2
12 files changed, 1344 insertions, 692 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 30fb252..f06fd24 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;
@@ -81,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
81 /// </summary> 82 /// </summary>
82 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi 83 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
83 { 84 {
84 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 85// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
85 protected IScriptEngine m_ScriptEngine; 86 protected IScriptEngine m_ScriptEngine;
86 protected SceneObjectPart m_host; 87 protected SceneObjectPart m_host;
87 protected uint m_localID; 88 protected uint m_localID;
@@ -99,6 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
99 protected int m_notecardLineReadCharsMax = 255; 100 protected int m_notecardLineReadCharsMax = 255;
100 protected int m_scriptConsoleChannel = 0; 101 protected int m_scriptConsoleChannel = 0;
101 protected bool m_scriptConsoleChannelEnabled = false; 102 protected bool m_scriptConsoleChannelEnabled = false;
103 protected bool m_debuggerSafe = false;
102 protected IUrlModule m_UrlModule = null; 104 protected IUrlModule m_UrlModule = null;
103 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = 105 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
104 new Dictionary<UUID, UserInfoCacheEntry>(); 106 new Dictionary<UUID, UserInfoCacheEntry>();
@@ -109,6 +111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
109 m_host = host; 111 m_host = host;
110 m_localID = localID; 112 m_localID = localID;
111 m_itemID = itemID; 113 m_itemID = itemID;
114 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
112 115
113 m_ScriptDelayFactor = 116 m_ScriptDelayFactor =
114 m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); 117 m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
@@ -161,6 +164,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
161 get { return m_ScriptEngine.World; } 164 get { return m_ScriptEngine.World; }
162 } 165 }
163 166
167 [DebuggerNonUserCode]
164 public void state(string newState) 168 public void state(string newState)
165 { 169 {
166 m_ScriptEngine.SetState(m_itemID, newState); 170 m_ScriptEngine.SetState(m_itemID, newState);
@@ -170,6 +174,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
170 /// Reset the named script. The script must be present 174 /// Reset the named script. The script must be present
171 /// in the same prim. 175 /// in the same prim.
172 /// </summary> 176 /// </summary>
177 [DebuggerNonUserCode]
173 public void llResetScript() 178 public void llResetScript()
174 { 179 {
175 m_host.AddScriptLPS(1); 180 m_host.AddScriptLPS(1);
@@ -226,9 +231,62 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
226 } 231 }
227 } 232 }
228 233
234 public List<ScenePresence> GetLinkAvatars(int linkType)
235 {
236 List<ScenePresence> ret = new List<ScenePresence>();
237 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
238 return ret;
239
240 List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars();
241
242 switch (linkType)
243 {
244 case ScriptBaseClass.LINK_SET:
245 return avs;
246
247 case ScriptBaseClass.LINK_ROOT:
248 return ret;
249
250 case ScriptBaseClass.LINK_ALL_OTHERS:
251 return avs;
252
253 case ScriptBaseClass.LINK_ALL_CHILDREN:
254 return avs;
255
256 case ScriptBaseClass.LINK_THIS:
257 return ret;
258
259 default:
260 if (linkType < 0)
261 return ret;
262
263 int partCount = m_host.ParentGroup.GetPartCount();
264
265 if (linkType <= partCount)
266 {
267 return ret;
268 }
269 else
270 {
271 linkType = linkType - partCount;
272 if (linkType > avs.Count)
273 {
274 return ret;
275 }
276 else
277 {
278 ret.Add(avs[linkType-1]);
279 return ret;
280 }
281 }
282 }
283 }
284
229 public List<SceneObjectPart> GetLinkParts(int linkType) 285 public List<SceneObjectPart> GetLinkParts(int linkType)
230 { 286 {
231 List<SceneObjectPart> ret = new List<SceneObjectPart>(); 287 List<SceneObjectPart> ret = new List<SceneObjectPart>();
288 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
289 return ret;
232 ret.Add(m_host); 290 ret.Add(m_host);
233 291
234 switch (linkType) 292 switch (linkType)
@@ -288,40 +346,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
288 protected UUID InventorySelf() 346 protected UUID InventorySelf()
289 { 347 {
290 UUID invItemID = new UUID(); 348 UUID invItemID = new UUID();
291 349 bool unlock = false;
292 lock (m_host.TaskInventory) 350 if (!m_host.TaskInventory.IsReadLockedByMe())
351 {
352 m_host.TaskInventory.LockItemsForRead(true);
353 unlock = true;
354 }
355 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
293 { 356 {
294 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 357 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
295 { 358 {
296 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) 359 invItemID = inv.Key;
297 { 360 break;
298 invItemID = inv.Key;
299 break;
300 }
301 } 361 }
302 } 362 }
303 363 if (unlock)
364 {
365 m_host.TaskInventory.LockItemsForRead(false);
366 }
304 return invItemID; 367 return invItemID;
305 } 368 }
306 369
307 protected UUID InventoryKey(string name, int type) 370 protected UUID InventoryKey(string name, int type)
308 { 371 {
309 m_host.AddScriptLPS(1); 372 m_host.AddScriptLPS(1);
310 373 m_host.TaskInventory.LockItemsForRead(true);
311 lock (m_host.TaskInventory) 374
375 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
312 { 376 {
313 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 377 if (inv.Value.Name == name)
314 { 378 {
315 if (inv.Value.Name == name) 379 m_host.TaskInventory.LockItemsForRead(false);
380
381 if (inv.Value.Type != type)
316 { 382 {
317 if (inv.Value.Type != type) 383 return UUID.Zero;
318 return UUID.Zero;
319
320 return inv.Value.AssetID;
321 } 384 }
385
386 return inv.Value.AssetID;
322 } 387 }
323 } 388 }
324 389
390 m_host.TaskInventory.LockItemsForRead(false);
325 return UUID.Zero; 391 return UUID.Zero;
326 } 392 }
327 393
@@ -329,17 +395,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
329 { 395 {
330 m_host.AddScriptLPS(1); 396 m_host.AddScriptLPS(1);
331 397
332 lock (m_host.TaskInventory) 398
399 m_host.TaskInventory.LockItemsForRead(true);
400
401 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
333 { 402 {
334 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 403 if (inv.Value.Name == name)
335 { 404 {
336 if (inv.Value.Name == name) 405 m_host.TaskInventory.LockItemsForRead(false);
337 { 406 return inv.Value.AssetID;
338 return inv.Value.AssetID;
339 }
340 } 407 }
341 } 408 }
342 409
410 m_host.TaskInventory.LockItemsForRead(false);
411
412
343 return UUID.Zero; 413 return UUID.Zero;
344 } 414 }
345 415
@@ -481,26 +551,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
481 551
482 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke 552 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
483 553
484 // Old implementation of llRot2Euler. Normalization not required as Atan2 function will 554 // Utility function for llRot2Euler
485 // only return values >= -PI (-180 degrees) and <= PI (180 degrees). 555
556 // normalize an angle between -PI and PI (-180 to +180 degrees)
557 protected double NormalizeAngle(double angle)
558 {
559 if (angle > -Math.PI && angle < Math.PI)
560 return angle;
561
562 int numPis = (int)(Math.PI / angle);
563 double remainder = angle - Math.PI * numPis;
564 if (numPis % 2 == 1)
565 return Math.PI - angle;
566 return remainder;
567 }
486 568
487 public LSL_Vector llRot2Euler(LSL_Rotation r) 569 public LSL_Vector llRot2Euler(LSL_Rotation q1)
488 { 570 {
489 m_host.AddScriptLPS(1); 571 m_host.AddScriptLPS(1);
490 //This implementation is from http://lslwiki.net/lslwiki/wakka.php?wakka=LibraryRotationFunctions. ckrinke 572 LSL_Vector eul = new LSL_Vector();
491 LSL_Rotation t = new LSL_Rotation(r.x * r.x, r.y * r.y, r.z * r.z, r.s * r.s); 573
492 double m = (t.x + t.y + t.z + t.s); 574 double sqw = q1.s*q1.s;
493 if (m == 0) return new LSL_Vector(); 575 double sqx = q1.x*q1.x;
494 double n = 2 * (r.y * r.s + r.x * r.z); 576 double sqy = q1.z*q1.z;
495 double p = m * m - n * n; 577 double sqz = q1.y*q1.y;
496 if (p > 0) 578 double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
497 return new LSL_Vector(Math.Atan2(2.0 * (r.x * r.s - r.y * r.z), (-t.x - t.y + t.z + t.s)), 579 double test = q1.x*q1.z + q1.y*q1.s;
498 Math.Atan2(n, Math.Sqrt(p)), 580 if (test > 0.4999*unit) { // singularity at north pole
499 Math.Atan2(2.0 * (r.z * r.s - r.x * r.y), (t.x - t.y - t.z + t.s))); 581 eul.z = 2 * Math.Atan2(q1.x,q1.s);
500 else if (n > 0) 582 eul.y = Math.PI/2;
501 return new LSL_Vector(0.0, Math.PI * 0.5, Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)); 583 eul.x = 0;
502 else 584 return eul;
503 return new LSL_Vector(0.0, -Math.PI * 0.5, Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)); 585 }
586 if (test < -0.4999*unit) { // singularity at south pole
587 eul.z = -2 * Math.Atan2(q1.x,q1.s);
588 eul.y = -Math.PI/2;
589 eul.x = 0;
590 return eul;
591 }
592 eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw);
593 eul.y = Math.Asin(2*test/unit);
594 eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw);
595 return eul;
504 } 596 }
505 597
506 /* From wiki: 598 /* From wiki:
@@ -702,77 +794,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
702 { 794 {
703 //A and B should both be normalized 795 //A and B should both be normalized
704 m_host.AddScriptLPS(1); 796 m_host.AddScriptLPS(1);
705 LSL_Rotation rotBetween; 797 /* This method is more accurate than the SL one, and thus causes problems
706 // Check for zero vectors. If either is zero, return zero rotation. Otherwise, 798 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
707 // continue calculation. 799
708 if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f)) 800 double dotProduct = LSL_Vector.Dot(a, b);
709 { 801 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
710 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 802 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
711 } 803 double angle = Math.Acos(dotProduct / magProduct);
712 else 804 LSL_Vector axis = LSL_Vector.Norm(crossProduct);
713 { 805 double s = Math.Sin(angle / 2);
714 a = LSL_Vector.Norm(a); 806
715 b = LSL_Vector.Norm(b); 807 double x = axis.x * s;
716 double dotProduct = LSL_Vector.Dot(a, b); 808 double y = axis.y * s;
717 // There are two degenerate cases possible. These are for vectors 180 or 809 double z = axis.z * s;
718 // 0 degrees apart. These have to be detected and handled individually. 810 double w = Math.Cos(angle / 2);
719 // 811
720 // Check for vectors 180 degrees apart. 812 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
721 // A dot product of -1 would mean the angle between vectors is 180 degrees. 813 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
722 if (dotProduct < -0.9999999f) 814
723 { 815 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
724 // First assume X axis is orthogonal to the vectors. 816 */
725 LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f); 817
726 orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a)); 818 // This method mimics the 180 errors found in SL
727 // Check for near zero vector. A very small non-zero number here will create 819 // See www.euclideanspace.com... angleBetween
728 // a rotation in an undesired direction. 820 LSL_Vector vec_a = a;
729 if (LSL_Vector.Mag(orthoVector) > 0.0001) 821 LSL_Vector vec_b = b;
730 { 822
731 rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f); 823 // Eliminate zero length
732 } 824 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
733 // If the magnitude of the vector was near zero, then assume the X axis is not 825 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
734 // orthogonal and use the Z axis instead. 826 if (vec_a_mag < 0.00001 ||
735 else 827 vec_b_mag < 0.00001)
736 { 828 {
737 // Set 180 z rotation. 829 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
738 rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f); 830 }
739 } 831
740 } 832 // Normalize
741 // Check for parallel vectors. 833 vec_a = llVecNorm(vec_a);
742 // A dot product of 1 would mean the angle between vectors is 0 degrees. 834 vec_b = llVecNorm(vec_b);
743 else if (dotProduct > 0.9999999f) 835
744 { 836 // Calculate axis and rotation angle
745 // Set zero rotation. 837 LSL_Vector axis = vec_a % vec_b;
746 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 838 LSL_Float cos_theta = vec_a * vec_b;
747 } 839
748 else 840 // Check if parallel
749 { 841 if (cos_theta > 0.99999)
750 // All special checks have been performed so get the axis of rotation. 842 {
751 LSL_Vector crossProduct = LSL_Vector.Cross(a, b); 843 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
752 // Quarternion s value is the length of the unit vector + dot product. 844 }
753 double qs = 1.0 + dotProduct; 845
754 rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs); 846 // Check if anti-parallel
755 // Normalize the rotation. 847 else if (cos_theta < -0.99999)
756 double mag = LSL_Rotation.Mag(rotBetween); 848 {
757 // We shouldn't have to worry about a divide by zero here. The qs value will be 849 LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
758 // non-zero because we already know if we're here, then the dotProduct is not -1 so 850 if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
759 // qs will not be zero. Also, we've already handled the input vectors being zero so the 851 return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
760 // crossProduct vector should also not be zero. 852 }
761 rotBetween.x = rotBetween.x / mag; 853 else // other rotation
762 rotBetween.y = rotBetween.y / mag; 854 {
763 rotBetween.z = rotBetween.z / mag; 855 LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
764 rotBetween.s = rotBetween.s / mag; 856 axis = llVecNorm(axis);
765 // Check for undefined values and set zero rotation if any found. This code might not actually be required 857 double x, y, z, s, t;
766 // any longer since zero vectors are checked for at the top. 858 s = Math.Cos(theta);
767 if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s)) 859 t = Math.Sin(theta);
768 { 860 x = axis.x * t;
769 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 861 y = axis.y * t;
770 } 862 z = axis.z * t;
771 } 863 return new LSL_Rotation(x,y,z,s);
772 } 864 }
773 return rotBetween; 865 }
774 } 866
775
776 public void llWhisper(int channelID, string text) 867 public void llWhisper(int channelID, string text)
777 { 868 {
778 m_host.AddScriptLPS(1); 869 m_host.AddScriptLPS(1);
@@ -1096,10 +1187,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1096 return detectedParams.TouchUV; 1187 return detectedParams.TouchUV;
1097 } 1188 }
1098 1189
1190 [DebuggerNonUserCode]
1099 public virtual void llDie() 1191 public virtual void llDie()
1100 { 1192 {
1101 m_host.AddScriptLPS(1); 1193 m_host.AddScriptLPS(1);
1102 throw new SelfDeleteException(); 1194 if (!m_host.IsAttachment) throw new SelfDeleteException();
1103 } 1195 }
1104 1196
1105 public LSL_Float llGround(LSL_Vector offset) 1197 public LSL_Float llGround(LSL_Vector offset)
@@ -1172,6 +1264,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1172 1264
1173 public void llSetStatus(int status, int value) 1265 public void llSetStatus(int status, int value)
1174 { 1266 {
1267 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
1268 return;
1175 m_host.AddScriptLPS(1); 1269 m_host.AddScriptLPS(1);
1176 1270
1177 int statusrotationaxis = 0; 1271 int statusrotationaxis = 0;
@@ -1402,6 +1496,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1402 { 1496 {
1403 m_host.AddScriptLPS(1); 1497 m_host.AddScriptLPS(1);
1404 1498
1499 SetColor(m_host, color, face);
1500 }
1501
1502 protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
1503 {
1504 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1505 return;
1506
1507 Primitive.TextureEntry tex = part.Shape.Textures;
1508 Color4 texcolor;
1509 if (face >= 0 && face < GetNumberOfSides(part))
1510 {
1511 texcolor = tex.CreateFace((uint)face).RGBA;
1512 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1513 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1514 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1515 tex.FaceTextures[face].RGBA = texcolor;
1516 part.UpdateTexture(tex);
1517 return;
1518 }
1519 else if (face == ScriptBaseClass.ALL_SIDES)
1520 {
1521 for (uint i = 0; i < GetNumberOfSides(part); i++)
1522 {
1523 if (tex.FaceTextures[i] != null)
1524 {
1525 texcolor = tex.FaceTextures[i].RGBA;
1526 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1527 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1528 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1529 tex.FaceTextures[i].RGBA = texcolor;
1530 }
1531 texcolor = tex.DefaultTexture.RGBA;
1532 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1533 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1534 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1535 tex.DefaultTexture.RGBA = texcolor;
1536 }
1537 part.UpdateTexture(tex);
1538 return;
1539 }
1540
1405 if (face == ScriptBaseClass.ALL_SIDES) 1541 if (face == ScriptBaseClass.ALL_SIDES)
1406 face = SceneObjectPart.ALL_SIDES; 1542 face = SceneObjectPart.ALL_SIDES;
1407 1543
@@ -1410,6 +1546,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1410 1546
1411 public void SetTexGen(SceneObjectPart part, int face,int style) 1547 public void SetTexGen(SceneObjectPart part, int face,int style)
1412 { 1548 {
1549 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1550 return;
1551
1413 Primitive.TextureEntry tex = part.Shape.Textures; 1552 Primitive.TextureEntry tex = part.Shape.Textures;
1414 MappingType textype; 1553 MappingType textype;
1415 textype = MappingType.Default; 1554 textype = MappingType.Default;
@@ -1440,6 +1579,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1440 1579
1441 public void SetGlow(SceneObjectPart part, int face, float glow) 1580 public void SetGlow(SceneObjectPart part, int face, float glow)
1442 { 1581 {
1582 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1583 return;
1584
1443 Primitive.TextureEntry tex = part.Shape.Textures; 1585 Primitive.TextureEntry tex = part.Shape.Textures;
1444 if (face >= 0 && face < GetNumberOfSides(part)) 1586 if (face >= 0 && face < GetNumberOfSides(part))
1445 { 1587 {
@@ -1465,6 +1607,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1465 1607
1466 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1608 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1467 { 1609 {
1610 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1611 return;
1468 1612
1469 Shininess sval = new Shininess(); 1613 Shininess sval = new Shininess();
1470 1614
@@ -1515,6 +1659,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1515 1659
1516 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1660 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1517 { 1661 {
1662 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1663 return;
1664
1518 Primitive.TextureEntry tex = part.Shape.Textures; 1665 Primitive.TextureEntry tex = part.Shape.Textures;
1519 if (face >= 0 && face < GetNumberOfSides(part)) 1666 if (face >= 0 && face < GetNumberOfSides(part))
1520 { 1667 {
@@ -1575,13 +1722,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1575 m_host.AddScriptLPS(1); 1722 m_host.AddScriptLPS(1);
1576 1723
1577 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1724 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1578 1725 if (parts.Count > 0)
1579 foreach (SceneObjectPart part in parts) 1726 {
1580 SetAlpha(part, alpha, face); 1727 try
1728 {
1729 parts[0].ParentGroup.areUpdatesSuspended = true;
1730 foreach (SceneObjectPart part in parts)
1731 SetAlpha(part, alpha, face);
1732 }
1733 finally
1734 {
1735 parts[0].ParentGroup.areUpdatesSuspended = false;
1736 }
1737 }
1581 } 1738 }
1582 1739
1583 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1740 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1584 { 1741 {
1742 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1743 return;
1744
1585 Primitive.TextureEntry tex = part.Shape.Textures; 1745 Primitive.TextureEntry tex = part.Shape.Textures;
1586 Color4 texcolor; 1746 Color4 texcolor;
1587 if (face >= 0 && face < GetNumberOfSides(part)) 1747 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1627,7 +1787,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1627 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1787 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1628 float wind, float tension, LSL_Vector Force) 1788 float wind, float tension, LSL_Vector Force)
1629 { 1789 {
1630 if (part == null) 1790 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1631 return; 1791 return;
1632 1792
1633 if (flexi) 1793 if (flexi)
@@ -1662,7 +1822,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1662 /// <param name="falloff"></param> 1822 /// <param name="falloff"></param>
1663 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 1823 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1664 { 1824 {
1665 if (part == null) 1825 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1666 return; 1826 return;
1667 1827
1668 if (light) 1828 if (light)
@@ -1739,15 +1899,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1739 m_host.AddScriptLPS(1); 1899 m_host.AddScriptLPS(1);
1740 1900
1741 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1901 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1742 1902 if (parts.Count > 0)
1743 foreach (SceneObjectPart part in parts) 1903 {
1744 SetTexture(part, texture, face); 1904 try
1745 1905 {
1906 parts[0].ParentGroup.areUpdatesSuspended = true;
1907 foreach (SceneObjectPart part in parts)
1908 SetTexture(part, texture, face);
1909 }
1910 finally
1911 {
1912 parts[0].ParentGroup.areUpdatesSuspended = false;
1913 }
1914 }
1746 ScriptSleep(200); 1915 ScriptSleep(200);
1747 } 1916 }
1748 1917
1749 protected void SetTexture(SceneObjectPart part, string texture, int face) 1918 protected void SetTexture(SceneObjectPart part, string texture, int face)
1750 { 1919 {
1920 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1921 return;
1922
1751 UUID textureID=new UUID(); 1923 UUID textureID=new UUID();
1752 1924
1753 if (!UUID.TryParse(texture, out textureID)) 1925 if (!UUID.TryParse(texture, out textureID))
@@ -1793,6 +1965,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1793 1965
1794 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 1966 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1795 { 1967 {
1968 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1969 return;
1970
1796 Primitive.TextureEntry tex = part.Shape.Textures; 1971 Primitive.TextureEntry tex = part.Shape.Textures;
1797 if (face >= 0 && face < GetNumberOfSides(part)) 1972 if (face >= 0 && face < GetNumberOfSides(part))
1798 { 1973 {
@@ -1829,6 +2004,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1829 2004
1830 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 2005 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1831 { 2006 {
2007 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2008 return;
2009
1832 Primitive.TextureEntry tex = part.Shape.Textures; 2010 Primitive.TextureEntry tex = part.Shape.Textures;
1833 if (face >= 0 && face < GetNumberOfSides(part)) 2011 if (face >= 0 && face < GetNumberOfSides(part))
1834 { 2012 {
@@ -1865,6 +2043,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1865 2043
1866 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 2044 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
1867 { 2045 {
2046 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2047 return;
2048
1868 Primitive.TextureEntry tex = part.Shape.Textures; 2049 Primitive.TextureEntry tex = part.Shape.Textures;
1869 if (face >= 0 && face < GetNumberOfSides(part)) 2050 if (face >= 0 && face < GetNumberOfSides(part))
1870 { 2051 {
@@ -1935,6 +2116,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1935 2116
1936 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos) 2117 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos)
1937 { 2118 {
2119 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2120 return;
2121
1938 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2122 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos)
1939 LSL_Vector currentPos = GetPartLocalPos(part); 2123 LSL_Vector currentPos = GetPartLocalPos(part);
1940 2124
@@ -1951,7 +2135,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1951 } 2135 }
1952 else 2136 else
1953 { 2137 {
1954 LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos); 2138 LSL_Vector rel_vec = SetPosAdjust(new LSL_Vector(part.OffsetPosition.X, part.OffsetPosition.Y, part.OffsetPosition.Z), targetPos);
1955 part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z); 2139 part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z);
1956 SceneObjectGroup parent = part.ParentGroup; 2140 SceneObjectGroup parent = part.ParentGroup;
1957 parent.HasGroupChanged = true; 2141 parent.HasGroupChanged = true;
@@ -2003,9 +2187,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2003 m_host.AddScriptLPS(1); 2187 m_host.AddScriptLPS(1);
2004 2188
2005 // try to let this work as in SL... 2189 // try to let this work as in SL...
2006 if (m_host.ParentID == 0) 2190 if (m_host.LinkNum < 2)
2007 { 2191 {
2008 // special case: If we are root, rotate complete SOG to new rotation 2192 // Special case: If we are root, rotate complete SOG to new
2193 // rotation.
2194 // We are root if the link number is 0 (single prim) or 1
2195 // (root prim). ParentID may be nonzero in attachments and
2196 // using it would cause attachments and HUDs to rotate
2197 // to the wrong positions.
2009 SetRot(m_host, Rot2Quaternion(rot)); 2198 SetRot(m_host, Rot2Quaternion(rot));
2010 } 2199 }
2011 else 2200 else
@@ -2034,6 +2223,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2034 2223
2035 protected void SetRot(SceneObjectPart part, Quaternion rot) 2224 protected void SetRot(SceneObjectPart part, Quaternion rot)
2036 { 2225 {
2226 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2227 return;
2228
2037 part.UpdateRotation(rot); 2229 part.UpdateRotation(rot);
2038 // Update rotation does not move the object in the physics scene if it's a linkset. 2230 // Update rotation does not move the object in the physics scene if it's a linkset.
2039 2231
@@ -2653,12 +2845,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2653 2845
2654 m_host.AddScriptLPS(1); 2846 m_host.AddScriptLPS(1);
2655 2847
2848 m_host.TaskInventory.LockItemsForRead(true);
2656 TaskInventoryItem item = m_host.TaskInventory[invItemID]; 2849 TaskInventoryItem item = m_host.TaskInventory[invItemID];
2657 2850 m_host.TaskInventory.LockItemsForRead(false);
2658 lock (m_host.TaskInventory)
2659 {
2660 item = m_host.TaskInventory[invItemID];
2661 }
2662 2851
2663 if (item.PermsGranter == UUID.Zero) 2852 if (item.PermsGranter == UUID.Zero)
2664 return 0; 2853 return 0;
@@ -2733,6 +2922,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2733 if (dist > m_ScriptDistanceFactor * 10.0f) 2922 if (dist > m_ScriptDistanceFactor * 10.0f)
2734 return; 2923 return;
2735 2924
2925 //Clone is thread-safe
2736 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 2926 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
2737 2927
2738 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory) 2928 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
@@ -2795,6 +2985,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2795 2985
2796 public void llLookAt(LSL_Vector target, double strength, double damping) 2986 public void llLookAt(LSL_Vector target, double strength, double damping)
2797 { 2987 {
2988 /*
2798 m_host.AddScriptLPS(1); 2989 m_host.AddScriptLPS(1);
2799 // Determine where we are looking from 2990 // Determine where we are looking from
2800 LSL_Vector from = llGetPos(); 2991 LSL_Vector from = llGetPos();
@@ -2814,10 +3005,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2814 // the angles of rotation in radians into rotation value 3005 // the angles of rotation in radians into rotation value
2815 3006
2816 LSL_Types.Quaternion rot = llEuler2Rot(angle); 3007 LSL_Types.Quaternion rot = llEuler2Rot(angle);
2817 Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s); 3008
2818 m_host.startLookAt(rotation, (float)damping, (float)strength); 3009 // This would only work if your physics system contains an APID controller:
3010 // Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s);
3011 // m_host.startLookAt(rotation, (float)damping, (float)strength);
3012
2819 // Orient the object to the angle calculated 3013 // Orient the object to the angle calculated
2820 //llSetRot(rot); 3014 llSetRot(rot);
3015 */
3016
3017 //The above code, while nice, doesn't replicate the behaviour of SL and tends to "roll" the object.
3018 //There's probably a smarter way of doing this, my rotation math-fu is weak.
3019 // http://bugs.meta7.com/view.php?id=28
3020 // - Tom
3021
3022 LSL_Rotation newrot = llGetRot() * llRotBetween(new LSL_Vector(1.0d, 0.0d, 0.0d) * llGetRot(), new LSL_Vector(0.0d, 0.0d, -1.0d));
3023 llSetRot(newrot * llRotBetween(new LSL_Vector(0.0d,0.0d,1.0d) * newrot, target - llGetPos()));
3024
3025 }
3026
3027 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3028 {
3029 m_host.AddScriptLPS(1);
3030// NotImplemented("llRotLookAt");
3031 m_host.RotLookAt(Rot2Quaternion(target), (float)strength, (float)damping);
3032
2821 } 3033 }
2822 3034
2823 public void llStopLookAt() 3035 public void llStopLookAt()
@@ -2866,13 +3078,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2866 { 3078 {
2867 TaskInventoryItem item; 3079 TaskInventoryItem item;
2868 3080
2869 lock (m_host.TaskInventory) 3081 m_host.TaskInventory.LockItemsForRead(true);
3082 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2870 { 3083 {
2871 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3084 m_host.TaskInventory.LockItemsForRead(false);
2872 return; 3085 return;
2873 else 3086 }
2874 item = m_host.TaskInventory[InventorySelf()]; 3087 else
3088 {
3089 item = m_host.TaskInventory[InventorySelf()];
2875 } 3090 }
3091 m_host.TaskInventory.LockItemsForRead(false);
2876 3092
2877 if (item.PermsGranter != UUID.Zero) 3093 if (item.PermsGranter != UUID.Zero)
2878 { 3094 {
@@ -2894,13 +3110,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2894 { 3110 {
2895 TaskInventoryItem item; 3111 TaskInventoryItem item;
2896 3112
3113 m_host.TaskInventory.LockItemsForRead(true);
2897 lock (m_host.TaskInventory) 3114 lock (m_host.TaskInventory)
2898 { 3115 {
3116
2899 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3117 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3118 {
3119 m_host.TaskInventory.LockItemsForRead(false);
2900 return; 3120 return;
3121 }
2901 else 3122 else
3123 {
2902 item = m_host.TaskInventory[InventorySelf()]; 3124 item = m_host.TaskInventory[InventorySelf()];
3125 }
2903 } 3126 }
3127 m_host.TaskInventory.LockItemsForRead(false);
2904 3128
2905 m_host.AddScriptLPS(1); 3129 m_host.AddScriptLPS(1);
2906 3130
@@ -2932,19 +3156,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2932 { 3156 {
2933 m_host.AddScriptLPS(1); 3157 m_host.AddScriptLPS(1);
2934 3158
2935 if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
2936 return;
2937
2938 TaskInventoryItem item; 3159 TaskInventoryItem item;
2939 3160
2940 lock (m_host.TaskInventory) 3161 m_host.TaskInventory.LockItemsForRead(true);
3162
3163 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2941 { 3164 {
2942 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3165 m_host.TaskInventory.LockItemsForRead(false);
2943 return; 3166 return;
2944 else 3167 }
2945 item = m_host.TaskInventory[InventorySelf()]; 3168 else
3169 {
3170 item = m_host.TaskInventory[InventorySelf()];
2946 } 3171 }
2947 3172
3173 m_host.TaskInventory.LockItemsForRead(false);
3174
2948 if (item.PermsGranter != m_host.OwnerID) 3175 if (item.PermsGranter != m_host.OwnerID)
2949 return; 3176 return;
2950 3177
@@ -2954,10 +3181,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2954 3181
2955 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 3182 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
2956 3183
2957 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; 3184 grp.AttachToAgent(m_host.OwnerID, (uint)attachment, Vector3.Zero, false);
2958 if (attachmentsModule != null)
2959 attachmentsModule.AttachObject(presence.ControllingClient,
2960 grp, (uint)attachment, false);
2961 } 3185 }
2962 } 3186 }
2963 3187
@@ -2970,13 +3194,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2970 3194
2971 TaskInventoryItem item; 3195 TaskInventoryItem item;
2972 3196
2973 lock (m_host.TaskInventory) 3197 m_host.TaskInventory.LockItemsForRead(true);
3198
3199 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2974 { 3200 {
2975 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3201 m_host.TaskInventory.LockItemsForRead(false);
2976 return; 3202 return;
2977 else
2978 item = m_host.TaskInventory[InventorySelf()];
2979 } 3203 }
3204 else
3205 {
3206 item = m_host.TaskInventory[InventorySelf()];
3207 }
3208 m_host.TaskInventory.LockItemsForRead(false);
3209
2980 3210
2981 if (item.PermsGranter != m_host.OwnerID) 3211 if (item.PermsGranter != m_host.OwnerID)
2982 return; 3212 return;
@@ -3023,6 +3253,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3023 3253
3024 public void llInstantMessage(string user, string message) 3254 public void llInstantMessage(string user, string message)
3025 { 3255 {
3256 UUID result;
3257 if (!UUID.TryParse(user, out result))
3258 {
3259 ShoutError("An invalid key was passed to llInstantMessage");
3260 ScriptSleep(2000);
3261 return;
3262 }
3263
3264
3026 m_host.AddScriptLPS(1); 3265 m_host.AddScriptLPS(1);
3027 3266
3028 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3267 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -3037,14 +3276,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3037 UUID friendTransactionID = UUID.Random(); 3276 UUID friendTransactionID = UUID.Random();
3038 3277
3039 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3278 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3040 3279
3041 GridInstantMessage msg = new GridInstantMessage(); 3280 GridInstantMessage msg = new GridInstantMessage();
3042 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3281 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3043 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3282 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3044 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3283 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3045// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3284// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3046// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3285// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3047 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 3286 DateTime dt = DateTime.UtcNow;
3287
3288 // Ticks from UtcNow, but make it look like local. Evil, huh?
3289 dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3290
3291 try
3292 {
3293 // Convert that to the PST timezone
3294 TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3295 dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3296 }
3297 catch
3298 {
3299 // No logging here, as it could be VERY spammy
3300 }
3301
3302 // And make it look local again to fool the unix time util
3303 dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3304
3305 msg.timestamp = (uint)Util.ToUnixTime(dt);
3306
3048 //if (client != null) 3307 //if (client != null)
3049 //{ 3308 //{
3050 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3309 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3058,13 +3317,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3058 msg.message = message.Substring(0, 1024); 3317 msg.message = message.Substring(0, 1024);
3059 else 3318 else
3060 msg.message = message; 3319 msg.message = message;
3061 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3320 msg.dialog = (byte)19; // MessageFromObject
3062 msg.fromGroup = false;// fromGroup; 3321 msg.fromGroup = false;// fromGroup;
3063 msg.offline = (byte)0; //offline; 3322 msg.offline = (byte)0; //offline;
3064 msg.ParentEstateID = 0; //ParentEstateID; 3323 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3065 msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); 3324 msg.Position = new Vector3(m_host.AbsolutePosition);
3066 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3325 msg.RegionID = World.RegionInfo.RegionID.Guid;
3067 msg.binaryBucket = new byte[0];// binaryBucket; 3326 msg.binaryBucket = Util.StringToBytes256(m_host.OwnerID.ToString());
3068 3327
3069 if (m_TransferModule != null) 3328 if (m_TransferModule != null)
3070 { 3329 {
@@ -3084,7 +3343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3084 } 3343 }
3085 3344
3086 emailModule.SendEmail(m_host.UUID, address, subject, message); 3345 emailModule.SendEmail(m_host.UUID, address, subject, message);
3087 ScriptSleep(20000); 3346 ScriptSleep(15000);
3088 } 3347 }
3089 3348
3090 public void llGetNextEmail(string address, string subject) 3349 public void llGetNextEmail(string address, string subject)
@@ -3186,13 +3445,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3186 m_host.AddScriptLPS(1); 3445 m_host.AddScriptLPS(1);
3187 } 3446 }
3188 3447
3189 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3190 {
3191 m_host.AddScriptLPS(1);
3192 Quaternion rot = new Quaternion((float)target.x, (float)target.y, (float)target.z, (float)target.s);
3193 m_host.RotLookAt(rot, (float)strength, (float)damping);
3194 }
3195
3196 public LSL_Integer llStringLength(string str) 3448 public LSL_Integer llStringLength(string str)
3197 { 3449 {
3198 m_host.AddScriptLPS(1); 3450 m_host.AddScriptLPS(1);
@@ -3216,14 +3468,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3216 3468
3217 TaskInventoryItem item; 3469 TaskInventoryItem item;
3218 3470
3219 lock (m_host.TaskInventory) 3471 m_host.TaskInventory.LockItemsForRead(true);
3472 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3220 { 3473 {
3221 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3474 m_host.TaskInventory.LockItemsForRead(false);
3222 return; 3475 return;
3223 else
3224 item = m_host.TaskInventory[InventorySelf()];
3225 } 3476 }
3226 3477 else
3478 {
3479 item = m_host.TaskInventory[InventorySelf()];
3480 }
3481 m_host.TaskInventory.LockItemsForRead(false);
3227 if (item.PermsGranter == UUID.Zero) 3482 if (item.PermsGranter == UUID.Zero)
3228 return; 3483 return;
3229 3484
@@ -3253,13 +3508,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3253 3508
3254 TaskInventoryItem item; 3509 TaskInventoryItem item;
3255 3510
3256 lock (m_host.TaskInventory) 3511 m_host.TaskInventory.LockItemsForRead(true);
3512 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3257 { 3513 {
3258 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3514 m_host.TaskInventory.LockItemsForRead(false);
3259 return; 3515 return;
3260 else 3516 }
3261 item = m_host.TaskInventory[InventorySelf()]; 3517 else
3518 {
3519 item = m_host.TaskInventory[InventorySelf()];
3262 } 3520 }
3521 m_host.TaskInventory.LockItemsForRead(false);
3522
3263 3523
3264 if (item.PermsGranter == UUID.Zero) 3524 if (item.PermsGranter == UUID.Zero)
3265 return; 3525 return;
@@ -3330,10 +3590,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3330 3590
3331 TaskInventoryItem item; 3591 TaskInventoryItem item;
3332 3592
3333 lock (m_host.TaskInventory) 3593
3594 m_host.TaskInventory.LockItemsForRead(true);
3595 if (!m_host.TaskInventory.ContainsKey(invItemID))
3596 {
3597 m_host.TaskInventory.LockItemsForRead(false);
3598 return;
3599 }
3600 else
3334 { 3601 {
3335 item = m_host.TaskInventory[invItemID]; 3602 item = m_host.TaskInventory[invItemID];
3336 } 3603 }
3604 m_host.TaskInventory.LockItemsForRead(false);
3337 3605
3338 if (agentID == UUID.Zero || perm == 0) // Releasing permissions 3606 if (agentID == UUID.Zero || perm == 0) // Releasing permissions
3339 { 3607 {
@@ -3365,11 +3633,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3365 3633
3366 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3634 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3367 { 3635 {
3368 lock (m_host.TaskInventory) 3636 m_host.TaskInventory.LockItemsForWrite(true);
3369 { 3637 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3370 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3638 m_host.TaskInventory[invItemID].PermsMask = perm;
3371 m_host.TaskInventory[invItemID].PermsMask = perm; 3639 m_host.TaskInventory.LockItemsForWrite(false);
3372 }
3373 3640
3374 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3641 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3375 "run_time_permissions", new Object[] { 3642 "run_time_permissions", new Object[] {
@@ -3389,11 +3656,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3389 3656
3390 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3657 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3391 { 3658 {
3392 lock (m_host.TaskInventory) 3659 m_host.TaskInventory.LockItemsForWrite(true);
3393 { 3660 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3394 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3661 m_host.TaskInventory[invItemID].PermsMask = perm;
3395 m_host.TaskInventory[invItemID].PermsMask = perm; 3662 m_host.TaskInventory.LockItemsForWrite(false);
3396 }
3397 3663
3398 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3664 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3399 "run_time_permissions", new Object[] { 3665 "run_time_permissions", new Object[] {
@@ -3414,11 +3680,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3414 3680
3415 if (!m_waitingForScriptAnswer) 3681 if (!m_waitingForScriptAnswer)
3416 { 3682 {
3417 lock (m_host.TaskInventory) 3683 m_host.TaskInventory.LockItemsForWrite(true);
3418 { 3684 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3419 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3685 m_host.TaskInventory[invItemID].PermsMask = 0;
3420 m_host.TaskInventory[invItemID].PermsMask = 0; 3686 m_host.TaskInventory.LockItemsForWrite(false);
3421 }
3422 3687
3423 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3688 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3424 m_waitingForScriptAnswer=true; 3689 m_waitingForScriptAnswer=true;
@@ -3453,10 +3718,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3453 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3718 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3454 llReleaseControls(); 3719 llReleaseControls();
3455 3720
3456 lock (m_host.TaskInventory) 3721
3457 { 3722 m_host.TaskInventory.LockItemsForWrite(true);
3458 m_host.TaskInventory[invItemID].PermsMask = answer; 3723 m_host.TaskInventory[invItemID].PermsMask = answer;
3459 } 3724 m_host.TaskInventory.LockItemsForWrite(false);
3725
3460 3726
3461 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3727 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3462 "run_time_permissions", new Object[] { 3728 "run_time_permissions", new Object[] {
@@ -3468,16 +3734,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3468 { 3734 {
3469 m_host.AddScriptLPS(1); 3735 m_host.AddScriptLPS(1);
3470 3736
3471 lock (m_host.TaskInventory) 3737 m_host.TaskInventory.LockItemsForRead(true);
3738
3739 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3472 { 3740 {
3473 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3741 if (item.Type == 10 && item.ItemID == m_itemID)
3474 { 3742 {
3475 if (item.Type == 10 && item.ItemID == m_itemID) 3743 m_host.TaskInventory.LockItemsForRead(false);
3476 { 3744 return item.PermsGranter.ToString();
3477 return item.PermsGranter.ToString();
3478 }
3479 } 3745 }
3480 } 3746 }
3747 m_host.TaskInventory.LockItemsForRead(false);
3481 3748
3482 return UUID.Zero.ToString(); 3749 return UUID.Zero.ToString();
3483 } 3750 }
@@ -3486,19 +3753,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3486 { 3753 {
3487 m_host.AddScriptLPS(1); 3754 m_host.AddScriptLPS(1);
3488 3755
3489 lock (m_host.TaskInventory) 3756 m_host.TaskInventory.LockItemsForRead(true);
3757
3758 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3490 { 3759 {
3491 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3760 if (item.Type == 10 && item.ItemID == m_itemID)
3492 { 3761 {
3493 if (item.Type == 10 && item.ItemID == m_itemID) 3762 int perms = item.PermsMask;
3494 { 3763 if (m_automaticLinkPermission)
3495 int perms = item.PermsMask; 3764 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
3496 if (m_automaticLinkPermission) 3765 m_host.TaskInventory.LockItemsForRead(false);
3497 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 3766 return perms;
3498 return perms;
3499 }
3500 } 3767 }
3501 } 3768 }
3769 m_host.TaskInventory.LockItemsForRead(false);
3502 3770
3503 return 0; 3771 return 0;
3504 } 3772 }
@@ -3520,9 +3788,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3520 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 3788 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3521 { 3789 {
3522 List<SceneObjectPart> parts = GetLinkParts(linknumber); 3790 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3523 3791 if (parts.Count > 0)
3524 foreach (SceneObjectPart part in parts) 3792 {
3525 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); 3793 try
3794 {
3795 parts[0].ParentGroup.areUpdatesSuspended = true;
3796 foreach (SceneObjectPart part in parts)
3797 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
3798 }
3799 finally
3800 {
3801 parts[0].ParentGroup.areUpdatesSuspended = false;
3802 }
3803 }
3526 } 3804 }
3527 3805
3528 public void llCreateLink(string target, int parent) 3806 public void llCreateLink(string target, int parent)
@@ -3535,11 +3813,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3535 return; 3813 return;
3536 3814
3537 TaskInventoryItem item; 3815 TaskInventoryItem item;
3538 lock (m_host.TaskInventory) 3816 m_host.TaskInventory.LockItemsForRead(true);
3539 { 3817 item = m_host.TaskInventory[invItemID];
3540 item = m_host.TaskInventory[invItemID]; 3818 m_host.TaskInventory.LockItemsForRead(false);
3541 } 3819
3542
3543 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3820 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3544 && !m_automaticLinkPermission) 3821 && !m_automaticLinkPermission)
3545 { 3822 {
@@ -3560,7 +3837,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3560 3837
3561 if (targetPart != null) 3838 if (targetPart != null)
3562 { 3839 {
3563 if (parent != 0) { 3840 if (parent != 0)
3841 {
3564 parentPrim = m_host.ParentGroup; 3842 parentPrim = m_host.ParentGroup;
3565 childPrim = targetPart.ParentGroup; 3843 childPrim = targetPart.ParentGroup;
3566 } 3844 }
@@ -3592,16 +3870,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3592 m_host.AddScriptLPS(1); 3870 m_host.AddScriptLPS(1);
3593 UUID invItemID = InventorySelf(); 3871 UUID invItemID = InventorySelf();
3594 3872
3595 lock (m_host.TaskInventory) 3873 m_host.TaskInventory.LockItemsForRead(true);
3596 {
3597 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3874 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3598 && !m_automaticLinkPermission) 3875 && !m_automaticLinkPermission)
3599 { 3876 {
3600 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 3877 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
3878 m_host.TaskInventory.LockItemsForRead(false);
3601 return; 3879 return;
3602 } 3880 }
3603 } 3881 m_host.TaskInventory.LockItemsForRead(false);
3604 3882
3605 if (linknum < ScriptBaseClass.LINK_THIS) 3883 if (linknum < ScriptBaseClass.LINK_THIS)
3606 return; 3884 return;
3607 3885
@@ -3640,10 +3918,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3640 // Restructuring Multiple Prims. 3918 // Restructuring Multiple Prims.
3641 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); 3919 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
3642 parts.Remove(parentPrim.RootPart); 3920 parts.Remove(parentPrim.RootPart);
3643 foreach (SceneObjectPart part in parts) 3921 if (parts.Count > 0)
3644 { 3922 {
3645 parentPrim.DelinkFromGroup(part.LocalId, true); 3923 try
3924 {
3925 parts[0].ParentGroup.areUpdatesSuspended = true;
3926 foreach (SceneObjectPart part in parts)
3927 {
3928 parentPrim.DelinkFromGroup(part.LocalId, true);
3929 }
3930 }
3931 finally
3932 {
3933 parts[0].ParentGroup.areUpdatesSuspended = false;
3934 }
3646 } 3935 }
3936
3647 parentPrim.HasGroupChanged = true; 3937 parentPrim.HasGroupChanged = true;
3648 parentPrim.ScheduleGroupForFullUpdate(); 3938 parentPrim.ScheduleGroupForFullUpdate();
3649 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 3939 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3652,11 +3942,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3652 { 3942 {
3653 SceneObjectPart newRoot = parts[0]; 3943 SceneObjectPart newRoot = parts[0];
3654 parts.Remove(newRoot); 3944 parts.Remove(newRoot);
3655 foreach (SceneObjectPart part in parts) 3945
3946 try
3656 { 3947 {
3657 part.UpdateFlag = 0; 3948 parts[0].ParentGroup.areUpdatesSuspended = true;
3658 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 3949 foreach (SceneObjectPart part in parts)
3950 {
3951 part.UpdateFlag = 0;
3952 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
3953 }
3659 } 3954 }
3955 finally
3956 {
3957 parts[0].ParentGroup.areUpdatesSuspended = false;
3958 }
3959
3960
3660 newRoot.ParentGroup.HasGroupChanged = true; 3961 newRoot.ParentGroup.HasGroupChanged = true;
3661 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 3962 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3662 } 3963 }
@@ -3702,6 +4003,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3702 } 4003 }
3703 else 4004 else
3704 { 4005 {
4006 if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1))
4007 {
4008 linknum -= (m_host.ParentGroup.PrimCount) + 1;
4009
4010 if (linknum < 0)
4011 return UUID.Zero.ToString();
4012
4013 List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
4014 if (avatars.Count > linknum)
4015 {
4016 return avatars[linknum].UUID.ToString();
4017 }
4018 }
3705 return UUID.Zero.ToString(); 4019 return UUID.Zero.ToString();
3706 } 4020 }
3707 } 4021 }
@@ -3778,17 +4092,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3778 m_host.AddScriptLPS(1); 4092 m_host.AddScriptLPS(1);
3779 int count = 0; 4093 int count = 0;
3780 4094
3781 lock (m_host.TaskInventory) 4095 m_host.TaskInventory.LockItemsForRead(true);
4096 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3782 { 4097 {
3783 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4098 if (inv.Value.Type == type || type == -1)
3784 { 4099 {
3785 if (inv.Value.Type == type || type == -1) 4100 count = count + 1;
3786 {
3787 count = count + 1;
3788 }
3789 } 4101 }
3790 } 4102 }
3791 4103
4104 m_host.TaskInventory.LockItemsForRead(false);
3792 return count; 4105 return count;
3793 } 4106 }
3794 4107
@@ -3797,16 +4110,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3797 m_host.AddScriptLPS(1); 4110 m_host.AddScriptLPS(1);
3798 ArrayList keys = new ArrayList(); 4111 ArrayList keys = new ArrayList();
3799 4112
3800 lock (m_host.TaskInventory) 4113 m_host.TaskInventory.LockItemsForRead(true);
4114 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3801 { 4115 {
3802 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4116 if (inv.Value.Type == type || type == -1)
3803 { 4117 {
3804 if (inv.Value.Type == type || type == -1) 4118 keys.Add(inv.Value.Name);
3805 {
3806 keys.Add(inv.Value.Name);
3807 }
3808 } 4119 }
3809 } 4120 }
4121 m_host.TaskInventory.LockItemsForRead(false);
3810 4122
3811 if (keys.Count == 0) 4123 if (keys.Count == 0)
3812 { 4124 {
@@ -3843,20 +4155,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3843 } 4155 }
3844 4156
3845 // move the first object found with this inventory name 4157 // move the first object found with this inventory name
3846 lock (m_host.TaskInventory) 4158 m_host.TaskInventory.LockItemsForRead(true);
4159 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3847 { 4160 {
3848 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4161 if (inv.Value.Name == inventory)
3849 { 4162 {
3850 if (inv.Value.Name == inventory) 4163 found = true;
3851 { 4164 objId = inv.Key;
3852 found = true; 4165 assetType = inv.Value.Type;
3853 objId = inv.Key; 4166 objName = inv.Value.Name;
3854 assetType = inv.Value.Type; 4167 break;
3855 objName = inv.Value.Name;
3856 break;
3857 }
3858 } 4168 }
3859 } 4169 }
4170 m_host.TaskInventory.LockItemsForRead(false);
3860 4171
3861 if (!found) 4172 if (!found)
3862 { 4173 {
@@ -3864,9 +4175,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3864 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4175 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
3865 } 4176 }
3866 4177
3867 // check if destination is an avatar 4178 // check if destination is an object
3868 if (World.GetScenePresence(destId) != null) 4179 if (World.GetSceneObjectPart(destId) != null)
3869 { 4180 {
4181 // destination is an object
4182 World.MoveTaskInventoryItem(destId, m_host, objId);
4183 }
4184 else
4185 {
4186 ScenePresence presence = World.GetScenePresence(destId);
4187
4188 if (presence == null)
4189 {
4190 UserAccount account =
4191 World.UserAccountService.GetUserAccount(
4192 World.RegionInfo.ScopeID,
4193 destId);
4194
4195 if (account == null)
4196 {
4197 llSay(0, "Can't find destination "+destId.ToString());
4198 return;
4199 }
4200 }
4201
3870 // destination is an avatar 4202 // destination is an avatar
3871 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4203 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
3872 4204
@@ -3890,31 +4222,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3890 4222
3891 if (m_TransferModule != null) 4223 if (m_TransferModule != null)
3892 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4224 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4225
4226 //This delay should only occur when giving inventory to avatars.
4227 ScriptSleep(3000);
3893 } 4228 }
3894 else
3895 {
3896 // destination is an object
3897 World.MoveTaskInventoryItem(destId, m_host, objId);
3898 }
3899 ScriptSleep(3000);
3900 } 4229 }
3901 4230
4231 [DebuggerNonUserCode]
3902 public void llRemoveInventory(string name) 4232 public void llRemoveInventory(string name)
3903 { 4233 {
3904 m_host.AddScriptLPS(1); 4234 m_host.AddScriptLPS(1);
3905 4235
3906 lock (m_host.TaskInventory) 4236 List<TaskInventoryItem> inv;
4237 try
3907 { 4238 {
3908 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4239 m_host.TaskInventory.LockItemsForRead(true);
4240 inv = new List<TaskInventoryItem>(m_host.TaskInventory.Values);
4241 }
4242 finally
4243 {
4244 m_host.TaskInventory.LockItemsForRead(false);
4245 }
4246 foreach (TaskInventoryItem item in inv)
4247 {
4248 if (item.Name == name)
3909 { 4249 {
3910 if (item.Name == name) 4250 if (item.ItemID == m_itemID)
3911 { 4251 throw new ScriptDeleteException();
3912 if (item.ItemID == m_itemID) 4252 else
3913 throw new ScriptDeleteException(); 4253 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3914 else 4254 return;
3915 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3916 return;
3917 }
3918 } 4255 }
3919 } 4256 }
3920 } 4257 }
@@ -3980,6 +4317,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3980 ce.time = Util.EnvironmentTickCount(); 4317 ce.time = Util.EnvironmentTickCount();
3981 ce.account = account; 4318 ce.account = account;
3982 ce.pinfo = pinfo; 4319 ce.pinfo = pinfo;
4320 m_userInfoCache[uuid] = ce;
3983 } 4321 }
3984 else 4322 else
3985 { 4323 {
@@ -4055,6 +4393,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4055 { 4393 {
4056 m_host.AddScriptLPS(1); 4394 m_host.AddScriptLPS(1);
4057 4395
4396 //Clone is thread safe
4058 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 4397 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
4059 4398
4060 foreach (TaskInventoryItem item in itemDictionary.Values) 4399 foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -4108,6 +4447,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4108 ScenePresence presence = World.GetScenePresence(agentId); 4447 ScenePresence presence = World.GetScenePresence(agentId);
4109 if (presence != null) 4448 if (presence != null)
4110 { 4449 {
4450 // agent must not be a god
4451 if (presence.GodLevel >= 200) return;
4452
4111 // agent must be over the owners land 4453 // agent must be over the owners land
4112 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4454 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4113 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 4455 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
@@ -4130,7 +4472,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4130 UUID av = new UUID(); 4472 UUID av = new UUID();
4131 if (!UUID.TryParse(agent,out av)) 4473 if (!UUID.TryParse(agent,out av))
4132 { 4474 {
4133 LSLError("First parameter to llDialog needs to be a key"); 4475 //LSLError("First parameter to llDialog needs to be a key");
4134 return; 4476 return;
4135 } 4477 }
4136 4478
@@ -4167,17 +4509,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4167 UUID soundId = UUID.Zero; 4509 UUID soundId = UUID.Zero;
4168 if (!UUID.TryParse(impact_sound, out soundId)) 4510 if (!UUID.TryParse(impact_sound, out soundId))
4169 { 4511 {
4170 lock (m_host.TaskInventory) 4512 m_host.TaskInventory.LockItemsForRead(true);
4513 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4171 { 4514 {
4172 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4515 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
4173 { 4516 {
4174 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound) 4517 soundId = item.AssetID;
4175 { 4518 break;
4176 soundId = item.AssetID;
4177 break;
4178 }
4179 } 4519 }
4180 } 4520 }
4521 m_host.TaskInventory.LockItemsForRead(false);
4181 } 4522 }
4182 m_host.CollisionSound = soundId; 4523 m_host.CollisionSound = soundId;
4183 m_host.CollisionSoundVolume = (float)impact_volume; 4524 m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4223,6 +4564,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4223 UUID partItemID; 4564 UUID partItemID;
4224 foreach (SceneObjectPart part in parts) 4565 foreach (SceneObjectPart part in parts)
4225 { 4566 {
4567 //Clone is thread safe
4226 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 4568 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
4227 4569
4228 foreach (TaskInventoryItem item in itemsDictionary.Values) 4570 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4437,17 +4779,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4437 4779
4438 m_host.AddScriptLPS(1); 4780 m_host.AddScriptLPS(1);
4439 4781
4440 lock (m_host.TaskInventory) 4782 m_host.TaskInventory.LockItemsForRead(true);
4783 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4441 { 4784 {
4442 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4785 if (item.Type == 10 && item.ItemID == m_itemID)
4443 { 4786 {
4444 if (item.Type == 10 && item.ItemID == m_itemID) 4787 result = item.Name!=null?item.Name:String.Empty;
4445 { 4788 break;
4446 result = item.Name != null ? item.Name : String.Empty;
4447 break;
4448 }
4449 } 4789 }
4450 } 4790 }
4791 m_host.TaskInventory.LockItemsForRead(false);
4451 4792
4452 return result; 4793 return result;
4453 } 4794 }
@@ -4600,23 +4941,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4600 { 4941 {
4601 m_host.AddScriptLPS(1); 4942 m_host.AddScriptLPS(1);
4602 4943
4603 lock (m_host.TaskInventory) 4944 m_host.TaskInventory.LockItemsForRead(true);
4945 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
4604 { 4946 {
4605 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4947 if (inv.Value.Name == name)
4606 { 4948 {
4607 if (inv.Value.Name == name) 4949 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
4608 { 4950 {
4609 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 4951 m_host.TaskInventory.LockItemsForRead(false);
4610 { 4952 return inv.Value.AssetID.ToString();
4611 return inv.Value.AssetID.ToString(); 4953 }
4612 } 4954 else
4613 else 4955 {
4614 { 4956 m_host.TaskInventory.LockItemsForRead(false);
4615 return UUID.Zero.ToString(); 4957 return UUID.Zero.ToString();
4616 }
4617 } 4958 }
4618 } 4959 }
4619 } 4960 }
4961 m_host.TaskInventory.LockItemsForRead(false);
4620 4962
4621 return UUID.Zero.ToString(); 4963 return UUID.Zero.ToString();
4622 } 4964 }
@@ -4769,14 +5111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4769 { 5111 {
4770 m_host.AddScriptLPS(1); 5112 m_host.AddScriptLPS(1);
4771 5113
4772 if (src == null) 5114 return src.Length;
4773 {
4774 return 0;
4775 }
4776 else
4777 {
4778 return src.Length;
4779 }
4780 } 5115 }
4781 5116
4782 public LSL_Integer llList2Integer(LSL_List src, int index) 5117 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -4822,7 +5157,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4822 else if (src.Data[index] is LSL_Float) 5157 else if (src.Data[index] is LSL_Float)
4823 return Convert.ToDouble(((LSL_Float) src.Data[index]).value); 5158 return Convert.ToDouble(((LSL_Float) src.Data[index]).value);
4824 else if (src.Data[index] is LSL_String) 5159 else if (src.Data[index] is LSL_String)
4825 return Convert.ToDouble(((LSL_String) src.Data[index]).m_string); 5160 {
5161 string str = ((LSL_String) src.Data[index]).m_string;
5162 Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)");
5163 if (m != Match.Empty)
5164 {
5165 str = m.Value;
5166 double d = 0.0;
5167 if (!Double.TryParse(str, out d))
5168 return 0.0;
5169
5170 return d;
5171 }
5172 return 0.0;
5173 }
4826 return Convert.ToDouble(src.Data[index]); 5174 return Convert.ToDouble(src.Data[index]);
4827 } 5175 }
4828 catch (FormatException) 5176 catch (FormatException)
@@ -5095,7 +5443,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5095 } 5443 }
5096 } 5444 }
5097 } 5445 }
5098 else { 5446 else
5447 {
5099 object[] array = new object[src.Length]; 5448 object[] array = new object[src.Length];
5100 Array.Copy(src.Data, 0, array, 0, src.Length); 5449 Array.Copy(src.Data, 0, array, 0, src.Length);
5101 result = new LSL_List(array); 5450 result = new LSL_List(array);
@@ -5507,7 +5856,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5507 public void llSetSoundQueueing(int queue) 5856 public void llSetSoundQueueing(int queue)
5508 { 5857 {
5509 m_host.AddScriptLPS(1); 5858 m_host.AddScriptLPS(1);
5510 NotImplemented("llSetSoundQueueing");
5511 } 5859 }
5512 5860
5513 public void llSetSoundRadius(double radius) 5861 public void llSetSoundRadius(double radius)
@@ -5552,10 +5900,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5552 m_host.AddScriptLPS(1); 5900 m_host.AddScriptLPS(1);
5553 5901
5554 List<SceneObjectPart> parts = GetLinkParts(linknumber); 5902 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5555 5903 if (parts.Count > 0)
5556 foreach (var part in parts)
5557 { 5904 {
5558 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); 5905 try
5906 {
5907 parts[0].ParentGroup.areUpdatesSuspended = true;
5908 foreach (var part in parts)
5909 {
5910 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
5911 }
5912 }
5913 finally
5914 {
5915 parts[0].ParentGroup.areUpdatesSuspended = false;
5916 }
5559 } 5917 }
5560 } 5918 }
5561 5919
@@ -5609,6 +5967,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5609 ScriptSleep(5000); 5967 ScriptSleep(5000);
5610 } 5968 }
5611 5969
5970 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
5971 {
5972 return ParseString2List(str, separators, in_spacers, false);
5973 }
5974
5612 public LSL_Integer llOverMyLand(string id) 5975 public LSL_Integer llOverMyLand(string id)
5613 { 5976 {
5614 m_host.AddScriptLPS(1); 5977 m_host.AddScriptLPS(1);
@@ -5809,7 +6172,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5809 return m_host.ParentGroup.RootPart.AttachmentPoint; 6172 return m_host.ParentGroup.RootPart.AttachmentPoint;
5810 } 6173 }
5811 6174
5812 public LSL_Integer llGetFreeMemory() 6175 public virtual LSL_Integer llGetFreeMemory()
5813 { 6176 {
5814 m_host.AddScriptLPS(1); 6177 m_host.AddScriptLPS(1);
5815 // Make scripts designed for LSO happy 6178 // Make scripts designed for LSO happy
@@ -5926,7 +6289,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5926 SetParticleSystem(m_host, rules); 6289 SetParticleSystem(m_host, rules);
5927 } 6290 }
5928 6291
5929 private void SetParticleSystem(SceneObjectPart part, LSL_List rules) { 6292 private void SetParticleSystem(SceneObjectPart part, LSL_List rules)
6293 {
5930 6294
5931 6295
5932 if (rules.Length == 0) 6296 if (rules.Length == 0)
@@ -6120,14 +6484,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6120 6484
6121 protected UUID GetTaskInventoryItem(string name) 6485 protected UUID GetTaskInventoryItem(string name)
6122 { 6486 {
6123 lock (m_host.TaskInventory) 6487 m_host.TaskInventory.LockItemsForRead(true);
6488 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6124 { 6489 {
6125 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6490 if (inv.Value.Name == name)
6126 { 6491 {
6127 if (inv.Value.Name == name) 6492 m_host.TaskInventory.LockItemsForRead(false);
6128 return inv.Key; 6493 return inv.Key;
6129 } 6494 }
6130 } 6495 }
6496 m_host.TaskInventory.LockItemsForRead(false);
6131 6497
6132 return UUID.Zero; 6498 return UUID.Zero;
6133 } 6499 }
@@ -6377,13 +6743,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6377 UUID av = new UUID(); 6743 UUID av = new UUID();
6378 if (!UUID.TryParse(avatar,out av)) 6744 if (!UUID.TryParse(avatar,out av))
6379 { 6745 {
6380 LSLError("First parameter to llDialog needs to be a key"); 6746 //LSLError("First parameter to llDialog needs to be a key");
6381 return; 6747 return;
6382 } 6748 }
6383 if (buttons.Length < 1) 6749 if (buttons.Length < 1)
6384 { 6750 {
6385 LSLError("No less than 1 button can be shown"); 6751 buttons.Add("OK");
6386 return;
6387 } 6752 }
6388 if (buttons.Length > 12) 6753 if (buttons.Length > 12)
6389 { 6754 {
@@ -6400,7 +6765,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6400 } 6765 }
6401 if (buttons.Data[i].ToString().Length > 24) 6766 if (buttons.Data[i].ToString().Length > 24)
6402 { 6767 {
6403 LSLError("button label cannot be longer than 24 characters"); 6768 llWhisper(ScriptBaseClass.DEBUG_CHANNEL, "button label cannot be longer than 24 characters");
6404 return; 6769 return;
6405 } 6770 }
6406 buts[i] = buttons.Data[i].ToString(); 6771 buts[i] = buttons.Data[i].ToString();
@@ -6464,22 +6829,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6464 } 6829 }
6465 6830
6466 // copy the first script found with this inventory name 6831 // copy the first script found with this inventory name
6467 lock (m_host.TaskInventory) 6832 m_host.TaskInventory.LockItemsForRead(true);
6833 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6468 { 6834 {
6469 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6835 if (inv.Value.Name == name)
6470 { 6836 {
6471 if (inv.Value.Name == name) 6837 // make sure the object is a script
6838 if (10 == inv.Value.Type)
6472 { 6839 {
6473 // make sure the object is a script 6840 found = true;
6474 if (10 == inv.Value.Type) 6841 srcId = inv.Key;
6475 { 6842 break;
6476 found = true;
6477 srcId = inv.Key;
6478 break;
6479 }
6480 } 6843 }
6481 } 6844 }
6482 } 6845 }
6846 m_host.TaskInventory.LockItemsForRead(false);
6483 6847
6484 if (!found) 6848 if (!found)
6485 { 6849 {
@@ -6563,6 +6927,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6563 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist) 6927 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist)
6564 { 6928 {
6565 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 6929 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6930 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6931 return shapeBlock;
6566 6932
6567 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 6933 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6568 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 6934 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6638,6 +7004,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6638 7004
6639 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge) 7005 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge)
6640 { 7006 {
7007 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7008 return;
7009
6641 ObjectShapePacket.ObjectDataBlock shapeBlock; 7010 ObjectShapePacket.ObjectDataBlock shapeBlock;
6642 7011
6643 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7012 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6687,6 +7056,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6687 7056
6688 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge) 7057 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge)
6689 { 7058 {
7059 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7060 return;
7061
6690 ObjectShapePacket.ObjectDataBlock shapeBlock; 7062 ObjectShapePacket.ObjectDataBlock shapeBlock;
6691 7063
6692 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7064 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6729,6 +7101,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6729 7101
6730 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) 7102 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)
6731 { 7103 {
7104 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7105 return;
7106
6732 ObjectShapePacket.ObjectDataBlock shapeBlock; 7107 ObjectShapePacket.ObjectDataBlock shapeBlock;
6733 7108
6734 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 7109 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6855,6 +7230,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6855 7230
6856 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type) 7231 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type)
6857 { 7232 {
7233 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7234 return;
7235
6858 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7236 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6859 UUID sculptId; 7237 UUID sculptId;
6860 7238
@@ -6870,13 +7248,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6870 shapeBlock.PathScaleX = 100; 7248 shapeBlock.PathScaleX = 100;
6871 shapeBlock.PathScaleY = 150; 7249 shapeBlock.PathScaleY = 150;
6872 7250
6873 if (type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER && 7251 if ((type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER) == 0 &&
6874 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE && 7252 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE) == 0 &&
6875 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE && 7253 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE) == 0 &&
6876 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) 7254 (type & (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) == 0)
6877 { 7255 {
6878 // default 7256 // default
6879 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7257 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
6880 } 7258 }
6881 7259
6882 // retain pathcurve 7260 // retain pathcurve
@@ -6895,30 +7273,82 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6895 ScriptSleep(200); 7273 ScriptSleep(200);
6896 } 7274 }
6897 7275
6898 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) 7276 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
6899 { 7277 {
6900 m_host.AddScriptLPS(1); 7278 m_host.AddScriptLPS(1);
6901 7279
6902 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7280 List<SceneObjectPart> parts = GetLinkParts(linknumber);
7281 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7282 if (parts.Count>0)
7283 {
7284 try
7285 {
7286 parts[0].ParentGroup.areUpdatesSuspended = true;
7287 foreach (SceneObjectPart part in parts)
7288 SetPrimParams(part, rules);
7289 }
7290 finally
7291 {
7292 parts[0].ParentGroup.areUpdatesSuspended = false;
7293 }
7294 }
7295 if (avatars.Count > 0)
7296 {
7297 foreach (ScenePresence avatar in avatars)
7298 SetPrimParams(avatar, rules);
7299 }
7300 }
6903 7301
6904 foreach (SceneObjectPart part in parts) 7302 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
6905 SetPrimParams(part, rules); 7303 {
6906 7304 llSetLinkPrimitiveParamsFast(linknumber, rules);
6907 ScriptSleep(200); 7305 ScriptSleep(200);
6908 } 7306 }
6909 7307
6910 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7308 protected void SetPrimParams(ScenePresence av, LSL_List rules)
6911 { 7309 {
6912 m_host.AddScriptLPS(1); 7310 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
7311 //We only support PRIM_POSITION and PRIM_ROTATION
6913 7312
6914 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7313 int idx = 0;
6915 7314
6916 foreach (SceneObjectPart part in parts) 7315 while (idx < rules.Length)
6917 SetPrimParams(part, rules); 7316 {
7317 int code = rules.GetLSLIntegerItem(idx++);
7318
7319 int remain = rules.Length - idx;
7320
7321
7322
7323 switch (code)
7324 {
7325 case (int)ScriptBaseClass.PRIM_POSITION:
7326 if (remain < 1)
7327 return;
7328 LSL_Vector v;
7329 v = rules.GetVector3Item(idx++);
7330 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
7331 av.SendAvatarDataToAllAgents();
7332
7333 break;
7334
7335 case (int)ScriptBaseClass.PRIM_ROTATION:
7336 if (remain < 1)
7337 return;
7338 LSL_Rotation r;
7339 r = rules.GetQuaternionItem(idx++);
7340 av.OffsetRotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
7341 av.SendAvatarDataToAllAgents();
7342 break;
7343 }
7344 }
6918 } 7345 }
6919 7346
6920 protected void SetPrimParams(SceneObjectPart part, LSL_List rules) 7347 protected void SetPrimParams(SceneObjectPart part, LSL_List rules)
6921 { 7348 {
7349 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7350 return;
7351
6922 int idx = 0; 7352 int idx = 0;
6923 7353
6924 while (idx < rules.Length) 7354 while (idx < rules.Length)
@@ -7453,13 +7883,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7453 public LSL_Integer llGetNumberOfPrims() 7883 public LSL_Integer llGetNumberOfPrims()
7454 { 7884 {
7455 m_host.AddScriptLPS(1); 7885 m_host.AddScriptLPS(1);
7456 int avatarCount = 0; 7886 int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
7457 World.ForEachScenePresence(delegate(ScenePresence presence) 7887
7458 {
7459 if (!presence.IsChildAgent && presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID))
7460 avatarCount++;
7461 });
7462
7463 return m_host.ParentGroup.PrimCount + avatarCount; 7888 return m_host.ParentGroup.PrimCount + avatarCount;
7464 } 7889 }
7465 7890
@@ -7475,55 +7900,98 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7475 m_host.AddScriptLPS(1); 7900 m_host.AddScriptLPS(1);
7476 UUID objID = UUID.Zero; 7901 UUID objID = UUID.Zero;
7477 LSL_List result = new LSL_List(); 7902 LSL_List result = new LSL_List();
7903
7904 // If the ID is not valid, return null result
7478 if (!UUID.TryParse(obj, out objID)) 7905 if (!UUID.TryParse(obj, out objID))
7479 { 7906 {
7480 result.Add(new LSL_Vector()); 7907 result.Add(new LSL_Vector());
7481 result.Add(new LSL_Vector()); 7908 result.Add(new LSL_Vector());
7482 return result; 7909 return result;
7483 } 7910 }
7911
7912 // Check if this is an attached prim. If so, replace
7913 // the UUID with the avatar UUID and report it's bounding box
7914 SceneObjectPart part = World.GetSceneObjectPart(objID);
7915 if (part != null && part.ParentGroup.IsAttachment)
7916 objID = part.ParentGroup.RootPart.AttachedAvatar;
7917
7918 // Find out if this is an avatar ID. If so, return it's box
7484 ScenePresence presence = World.GetScenePresence(objID); 7919 ScenePresence presence = World.GetScenePresence(objID);
7485 if (presence != null) 7920 if (presence != null)
7486 { 7921 {
7487 if (presence.ParentID == 0) // not sat on an object 7922 // As per LSL Wiki, there is no difference between sitting
7923 // and standing avatar since server 1.36
7924 LSL_Vector lower;
7925 LSL_Vector upper;
7926 if (presence.Animator.Animations.DefaultAnimation.AnimID
7927 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
7488 { 7928 {
7489 LSL_Vector lower; 7929 // This is for ground sitting avatars
7490 LSL_Vector upper; 7930 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7491 if (presence.Animator.Animations.DefaultAnimation.AnimID 7931 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7492 == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 7932 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7493 {
7494 // This is for ground sitting avatars
7495 float height = presence.Appearance.AvatarHeight / 2.66666667f;
7496 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
7497 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
7498 }
7499 else
7500 {
7501 // This is for standing/flying avatars
7502 float height = presence.Appearance.AvatarHeight / 2.0f;
7503 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7504 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7505 }
7506 result.Add(lower);
7507 result.Add(upper);
7508 return result;
7509 } 7933 }
7510 else 7934 else
7511 { 7935 {
7512 // sitting on an object so we need the bounding box of that 7936 // This is for standing/flying avatars
7513 // which should include the avatar so set the UUID to the 7937 float height = presence.Appearance.AvatarHeight / 2.0f;
7514 // UUID of the object the avatar is sat on and allow it to fall through 7938 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
7515 // to processing an object 7939 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
7516 SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
7517 objID = p.UUID;
7518 } 7940 }
7941
7942 // Adjust to the documented error offsets (see LSL Wiki)
7943 lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
7944 upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
7945
7946 if (lower.x > upper.x)
7947 lower.x = upper.x;
7948 if (lower.y > upper.y)
7949 lower.y = upper.y;
7950 if (lower.z > upper.z)
7951 lower.z = upper.z;
7952
7953 result.Add(lower);
7954 result.Add(upper);
7955 return result;
7519 } 7956 }
7520 SceneObjectPart part = World.GetSceneObjectPart(objID); 7957
7958 part = World.GetSceneObjectPart(objID);
7521 // Currently only works for single prims without a sitting avatar 7959 // Currently only works for single prims without a sitting avatar
7522 if (part != null) 7960 if (part != null)
7523 { 7961 {
7524 Vector3 halfSize = part.Scale / 2.0f; 7962 float minX;
7525 LSL_Vector lower = new LSL_Vector(halfSize.X * -1.0f, halfSize.Y * -1.0f, halfSize.Z * -1.0f); 7963 float maxX;
7526 LSL_Vector upper = new LSL_Vector(halfSize.X, halfSize.Y, halfSize.Z); 7964 float minY;
7965 float maxY;
7966 float minZ;
7967 float maxZ;
7968
7969 // This BBox is in sim coordinates, with the offset being
7970 // a contained point.
7971 Vector3[] offsets = World.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
7972 out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
7973
7974 minX -= offsets[0].X;
7975 maxX -= offsets[0].X;
7976 minY -= offsets[0].Y;
7977 maxY -= offsets[0].Y;
7978 minZ -= offsets[0].Z;
7979 maxZ -= offsets[0].Z;
7980
7981 LSL_Vector lower;
7982 LSL_Vector upper;
7983
7984 // Adjust to the documented error offsets (see LSL Wiki)
7985 lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
7986 upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
7987
7988 if (lower.x > upper.x)
7989 lower.x = upper.x;
7990 if (lower.y > upper.y)
7991 lower.y = upper.y;
7992 if (lower.z > upper.z)
7993 lower.z = upper.z;
7994
7527 result.Add(lower); 7995 result.Add(lower);
7528 result.Add(upper); 7996 result.Add(upper);
7529 return result; 7997 return result;
@@ -7603,13 +8071,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7603 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X, 8071 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
7604 part.AbsolutePosition.Y, 8072 part.AbsolutePosition.Y,
7605 part.AbsolutePosition.Z); 8073 part.AbsolutePosition.Z);
7606 // For some reason, the part.AbsolutePosition.* values do not change if the
7607 // linkset is rotated; they always reflect the child prim's world position
7608 // as though the linkset is unrotated. This is incompatible behavior with SL's
7609 // implementation, so will break scripts imported from there (not to mention it
7610 // makes it more difficult to determine a child prim's actual inworld position).
7611 if (part.ParentID != 0)
7612 v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition();
7613 res.Add(v); 8074 res.Add(v);
7614 break; 8075 break;
7615 8076
@@ -7770,56 +8231,92 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7770 case (int)ScriptBaseClass.PRIM_BUMP_SHINY: 8231 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
7771 if (remain < 1) 8232 if (remain < 1)
7772 return res; 8233 return res;
7773 8234 face = (int)rules.GetLSLIntegerItem(idx++);
7774 face=(int)rules.GetLSLIntegerItem(idx++);
7775 8235
7776 tex = part.Shape.Textures; 8236 tex = part.Shape.Textures;
8237 int shiny;
7777 if (face == ScriptBaseClass.ALL_SIDES) 8238 if (face == ScriptBaseClass.ALL_SIDES)
7778 { 8239 {
7779 for (face = 0; face < GetNumberOfSides(part); face++) 8240 for (face = 0; face < GetNumberOfSides(part); face++)
7780 { 8241 {
7781 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8242 Shininess shinyness = tex.GetFace((uint)face).Shiny;
7782 // Convert Shininess to PRIM_SHINY_* 8243 if (shinyness == Shininess.High)
7783 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 8244 {
7784 // PRIM_BUMP_* 8245 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
7785 res.Add(new LSL_Integer((int)texface.Bump)); 8246 }
8247 else if (shinyness == Shininess.Medium)
8248 {
8249 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8250 }
8251 else if (shinyness == Shininess.Low)
8252 {
8253 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8254 }
8255 else
8256 {
8257 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8258 }
8259 res.Add(new LSL_Integer(shiny));
8260 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
7786 } 8261 }
7787 } 8262 }
7788 else 8263 else
7789 { 8264 {
7790 if (face >= 0 && face < GetNumberOfSides(part)) 8265 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8266 if (shinyness == Shininess.High)
7791 { 8267 {
7792 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8268 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
7793 // Convert Shininess to PRIM_SHINY_*
7794 res.Add(new LSL_Integer((uint)texface.Shiny >> 6));
7795 // PRIM_BUMP_*
7796 res.Add(new LSL_Integer((int)texface.Bump));
7797 } 8269 }
8270 else if (shinyness == Shininess.Medium)
8271 {
8272 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
8273 }
8274 else if (shinyness == Shininess.Low)
8275 {
8276 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
8277 }
8278 else
8279 {
8280 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
8281 }
8282 res.Add(new LSL_Integer(shiny));
8283 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
7798 } 8284 }
7799 break; 8285 break;
7800 8286
7801 case (int)ScriptBaseClass.PRIM_FULLBRIGHT: 8287 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
7802 if (remain < 1) 8288 if (remain < 1)
7803 return res; 8289 return res;
7804 8290 face = (int)rules.GetLSLIntegerItem(idx++);
7805 face=(int)rules.GetLSLIntegerItem(idx++);
7806 8291
7807 tex = part.Shape.Textures; 8292 tex = part.Shape.Textures;
8293 int fullbright;
7808 if (face == ScriptBaseClass.ALL_SIDES) 8294 if (face == ScriptBaseClass.ALL_SIDES)
7809 { 8295 {
7810 for (face = 0; face < GetNumberOfSides(part); face++) 8296 for (face = 0; face < GetNumberOfSides(part); face++)
7811 { 8297 {
7812 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8298 if (tex.GetFace((uint)face).Fullbright == true)
7813 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 8299 {
8300 fullbright = ScriptBaseClass.TRUE;
8301 }
8302 else
8303 {
8304 fullbright = ScriptBaseClass.FALSE;
8305 }
8306 res.Add(new LSL_Integer(fullbright));
7814 } 8307 }
7815 } 8308 }
7816 else 8309 else
7817 { 8310 {
7818 if (face >= 0 && face < GetNumberOfSides(part)) 8311 if (tex.GetFace((uint)face).Fullbright == true)
7819 { 8312 {
7820 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8313 fullbright = ScriptBaseClass.TRUE;
7821 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0));
7822 } 8314 }
8315 else
8316 {
8317 fullbright = ScriptBaseClass.FALSE;
8318 }
8319 res.Add(new LSL_Integer(fullbright));
7823 } 8320 }
7824 break; 8321 break;
7825 8322
@@ -7841,27 +8338,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7841 break; 8338 break;
7842 8339
7843 case (int)ScriptBaseClass.PRIM_TEXGEN: 8340 case (int)ScriptBaseClass.PRIM_TEXGEN:
8341 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
7844 if (remain < 1) 8342 if (remain < 1)
7845 return res; 8343 return res;
7846 8344 face = (int)rules.GetLSLIntegerItem(idx++);
7847 face=(int)rules.GetLSLIntegerItem(idx++);
7848 8345
7849 tex = part.Shape.Textures; 8346 tex = part.Shape.Textures;
7850 if (face == ScriptBaseClass.ALL_SIDES) 8347 if (face == ScriptBaseClass.ALL_SIDES)
7851 { 8348 {
7852 for (face = 0; face < GetNumberOfSides(part); face++) 8349 for (face = 0; face < GetNumberOfSides(part); face++)
7853 { 8350 {
7854 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8351 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
7855 // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc. 8352 {
7856 res.Add(new LSL_Integer((uint)texgen >> 1)); 8353 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
8354 }
8355 else
8356 {
8357 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8358 }
7857 } 8359 }
7858 } 8360 }
7859 else 8361 else
7860 { 8362 {
7861 if (face >= 0 && face < GetNumberOfSides(part)) 8363 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
7862 { 8364 {
7863 MappingType texgen = tex.GetFace((uint)face).TexMapType; 8365 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
7864 res.Add(new LSL_Integer((uint)texgen >> 1)); 8366 }
8367 else
8368 {
8369 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
7865 } 8370 }
7866 } 8371 }
7867 break; 8372 break;
@@ -7884,28 +8389,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7884 case (int)ScriptBaseClass.PRIM_GLOW: 8389 case (int)ScriptBaseClass.PRIM_GLOW:
7885 if (remain < 1) 8390 if (remain < 1)
7886 return res; 8391 return res;
7887 8392 face = (int)rules.GetLSLIntegerItem(idx++);
7888 face=(int)rules.GetLSLIntegerItem(idx++);
7889 8393
7890 tex = part.Shape.Textures; 8394 tex = part.Shape.Textures;
8395 float primglow;
7891 if (face == ScriptBaseClass.ALL_SIDES) 8396 if (face == ScriptBaseClass.ALL_SIDES)
7892 { 8397 {
7893 for (face = 0; face < GetNumberOfSides(part); face++) 8398 for (face = 0; face < GetNumberOfSides(part); face++)
7894 { 8399 {
7895 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 8400 primglow = tex.GetFace((uint)face).Glow;
7896 res.Add(new LSL_Float(texface.Glow)); 8401 res.Add(new LSL_Float(primglow));
7897 } 8402 }
7898 } 8403 }
7899 else 8404 else
7900 { 8405 {
7901 if (face >= 0 && face < GetNumberOfSides(part)) 8406 primglow = tex.GetFace((uint)face).Glow;
7902 { 8407 res.Add(new LSL_Float(primglow));
7903 Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
7904 res.Add(new LSL_Float(texface.Glow));
7905 }
7906 } 8408 }
7907 break; 8409 break;
7908
7909 case (int)ScriptBaseClass.PRIM_TEXT: 8410 case (int)ScriptBaseClass.PRIM_TEXT:
7910 Color4 textColor = part.GetTextColor(); 8411 Color4 textColor = part.GetTextColor();
7911 res.Add(part.Text); 8412 res.Add(part.Text);
@@ -8454,8 +8955,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8454 // The function returns an ordered list 8955 // The function returns an ordered list
8455 // representing the tokens found in the supplied 8956 // representing the tokens found in the supplied
8456 // sources string. If two successive tokenizers 8957 // sources string. If two successive tokenizers
8457 // are encountered, then a NULL entry is added 8958 // are encountered, then a null-string entry is
8458 // to the list. 8959 // added to the list.
8459 // 8960 //
8460 // It is a precondition that the source and 8961 // It is a precondition that the source and
8461 // toekizer lisst are non-null. If they are null, 8962 // toekizer lisst are non-null. If they are null,
@@ -8463,7 +8964,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8463 // while their lengths are being determined. 8964 // while their lengths are being determined.
8464 // 8965 //
8465 // A small amount of working memoryis required 8966 // A small amount of working memoryis required
8466 // of approximately 8*#tokenizers. 8967 // of approximately 8*#tokenizers + 8*srcstrlen.
8467 // 8968 //
8468 // There are many ways in which this function 8969 // There are many ways in which this function
8469 // can be implemented, this implementation is 8970 // can be implemented, this implementation is
@@ -8479,155 +8980,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8479 // and eliminates redundant tokenizers as soon 8980 // and eliminates redundant tokenizers as soon
8480 // as is possible. 8981 // as is possible.
8481 // 8982 //
8482 // The implementation tries to avoid any copying 8983 // The implementation tries to minimize temporary
8483 // of arrays or other objects. 8984 // garbage generation.
8484 // </remarks> 8985 // </remarks>
8485 8986
8486 private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) 8987 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8487 { 8988 {
8488 int beginning = 0; 8989 return ParseString2List(src, separators, spacers, true);
8489 int srclen = src.Length; 8990 }
8490 int seplen = separators.Length;
8491 object[] separray = separators.Data;
8492 int spclen = spacers.Length;
8493 object[] spcarray = spacers.Data;
8494 int mlen = seplen+spclen;
8495
8496 int[] offset = new int[mlen+1];
8497 bool[] active = new bool[mlen];
8498
8499 int best;
8500 int j;
8501
8502 // Initial capacity reduces resize cost
8503 8991
8504 LSL_List tokens = new LSL_List(); 8992 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
8993 {
8994 int srclen = src.Length;
8995 int seplen = separators.Length;
8996 object[] separray = separators.Data;
8997 int spclen = spacers.Length;
8998 object[] spcarray = spacers.Data;
8999 int dellen = 0;
9000 string[] delarray = new string[seplen+spclen];
8505 9001
8506 // All entries are initially valid 9002 int outlen = 0;
9003 string[] outarray = new string[srclen*2+1];
8507 9004
8508 for (int i = 0; i < mlen; i++) 9005 int i, j;
8509 active[i] = true; 9006 string d;
8510 9007
8511 offset[mlen] = srclen; 9008 m_host.AddScriptLPS(1);
8512 9009
8513 while (beginning < srclen) 9010 /*
9011 * Convert separator and spacer lists to C# strings.
9012 * Also filter out null strings so we don't hang.
9013 */
9014 for (i = 0; i < seplen; i ++)
8514 { 9015 {
9016 d = separray[i].ToString();
9017 if (d.Length > 0)
9018 {
9019 delarray[dellen++] = d;
9020 }
9021 }
9022 seplen = dellen;
8515 9023
8516 best = mlen; // as bad as it gets 9024 for (i = 0; i < spclen; i ++)
9025 {
9026 d = spcarray[i].ToString();
9027 if (d.Length > 0)
9028 {
9029 delarray[dellen++] = d;
9030 }
9031 }
8517 9032
8518 // Scan for separators 9033 /*
9034 * Scan through source string from beginning to end.
9035 */
9036 for (i = 0;;)
9037 {
8519 9038
8520 for (j = 0; j < seplen; j++) 9039 /*
9040 * Find earliest delimeter in src starting at i (if any).
9041 */
9042 int earliestDel = -1;
9043 int earliestSrc = srclen;
9044 string earliestStr = null;
9045 for (j = 0; j < dellen; j ++)
8521 { 9046 {
8522 if (separray[j].ToString() == String.Empty) 9047 d = delarray[j];
8523 active[j] = false; 9048 if (d != null)
8524
8525 if (active[j])
8526 { 9049 {
8527 // scan all of the markers 9050 int index = src.IndexOf(d, i);
8528 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) 9051 if (index < 0)
8529 { 9052 {
8530 // not present at all 9053 delarray[j] = null; // delim nowhere in src, don't check it anymore
8531 active[j] = false;
8532 } 9054 }
8533 else 9055 else if (index < earliestSrc)
8534 { 9056 {
8535 // present and correct 9057 earliestSrc = index; // where delimeter starts in source string
8536 if (offset[j] < offset[best]) 9058 earliestDel = j; // where delimeter is in delarray[]
8537 { 9059 earliestStr = d; // the delimeter string from delarray[]
8538 // closest so far 9060 if (index == i) break; // can't do any better than found at beg of string
8539 best = j;
8540 if (offset[best] == beginning)
8541 break;
8542 }
8543 } 9061 }
8544 } 9062 }
8545 } 9063 }
8546 9064
8547 // Scan for spacers 9065 /*
8548 9066 * Output source string starting at i through start of earliest delimeter.
8549 if (offset[best] != beginning) 9067 */
9068 if (keepNulls || (earliestSrc > i))
8550 { 9069 {
8551 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 9070 outarray[outlen++] = src.Substring(i, earliestSrc - i);
8552 {
8553 if (spcarray[j-seplen].ToString() == String.Empty)
8554 active[j] = false;
8555
8556 if (active[j])
8557 {
8558 // scan all of the markers
8559 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
8560 {
8561 // not present at all
8562 active[j] = false;
8563 }
8564 else
8565 {
8566 // present and correct
8567 if (offset[j] < offset[best])
8568 {
8569 // closest so far
8570 best = j;
8571 }
8572 }
8573 }
8574 }
8575 } 9071 }
8576 9072
8577 // This is the normal exit from the scanning loop 9073 /*
9074 * If no delimeter found at or after i, we're done scanning.
9075 */
9076 if (earliestDel < 0) break;
8578 9077
8579 if (best == mlen) 9078 /*
9079 * If delimeter was a spacer, output the spacer.
9080 */
9081 if (earliestDel >= seplen)
8580 { 9082 {
8581 // no markers were found on this pass 9083 outarray[outlen++] = earliestStr;
8582 // so we're pretty much done
8583 if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
8584 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
8585 break;
8586 } 9084 }
8587 9085
8588 // Otherwise we just add the newly delimited token 9086 /*
8589 // and recalculate where the search should continue. 9087 * Look at rest of src string following delimeter.
8590 if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) 9088 */
8591 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 9089 i = earliestSrc + earliestStr.Length;
8592
8593 if (best < seplen)
8594 {
8595 beginning = offset[best] + (separray[best].ToString()).Length;
8596 }
8597 else
8598 {
8599 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
8600 string str = spcarray[best - seplen].ToString();
8601 if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
8602 tokens.Add(new LSL_String(str));
8603 }
8604 } 9090 }
8605 9091
8606 // This an awkward an not very intuitive boundary case. If the 9092 /*
8607 // last substring is a tokenizer, then there is an implied trailing 9093 * Make up an exact-sized output array suitable for an LSL_List object.
8608 // null list entry. Hopefully the single comparison will not be too 9094 */
8609 // arduous. Alternatively the 'break' could be replced with a return 9095 object[] outlist = new object[outlen];
8610 // but that's shabby programming. 9096 for (i = 0; i < outlen; i ++)
8611
8612 if ((beginning == srclen) && (keepNulls))
8613 { 9097 {
8614 if (srclen != 0) 9098 outlist[i] = new LSL_String(outarray[i]);
8615 tokens.Add(new LSL_String(""));
8616 } 9099 }
8617 9100 return new LSL_List(outlist);
8618 return tokens;
8619 }
8620
8621 public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
8622 {
8623 m_host.AddScriptLPS(1);
8624 return this.ParseString(src, separators, spacers, false);
8625 }
8626
8627 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
8628 {
8629 m_host.AddScriptLPS(1);
8630 return this.ParseString(src, separators, spacers, true);
8631 } 9101 }
8632 9102
8633 public LSL_Integer llGetObjectPermMask(int mask) 9103 public LSL_Integer llGetObjectPermMask(int mask)
@@ -8704,28 +9174,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8704 { 9174 {
8705 m_host.AddScriptLPS(1); 9175 m_host.AddScriptLPS(1);
8706 9176
8707 lock (m_host.TaskInventory) 9177 m_host.TaskInventory.LockItemsForRead(true);
9178 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8708 { 9179 {
8709 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9180 if (inv.Value.Name == item)
8710 { 9181 {
8711 if (inv.Value.Name == item) 9182 m_host.TaskInventory.LockItemsForRead(false);
9183 switch (mask)
8712 { 9184 {
8713 switch (mask) 9185 case 0:
8714 { 9186 return (int)inv.Value.BasePermissions;
8715 case 0: 9187 case 1:
8716 return (int)inv.Value.BasePermissions; 9188 return (int)inv.Value.CurrentPermissions;
8717 case 1: 9189 case 2:
8718 return (int)inv.Value.CurrentPermissions; 9190 return (int)inv.Value.GroupPermissions;
8719 case 2: 9191 case 3:
8720 return (int)inv.Value.GroupPermissions; 9192 return (int)inv.Value.EveryonePermissions;
8721 case 3: 9193 case 4:
8722 return (int)inv.Value.EveryonePermissions; 9194 return (int)inv.Value.NextPermissions;
8723 case 4:
8724 return (int)inv.Value.NextPermissions;
8725 }
8726 } 9195 }
8727 } 9196 }
8728 } 9197 }
9198 m_host.TaskInventory.LockItemsForRead(false);
8729 9199
8730 return -1; 9200 return -1;
8731 } 9201 }
@@ -8772,16 +9242,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8772 { 9242 {
8773 m_host.AddScriptLPS(1); 9243 m_host.AddScriptLPS(1);
8774 9244
8775 lock (m_host.TaskInventory) 9245 m_host.TaskInventory.LockItemsForRead(true);
9246 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8776 { 9247 {
8777 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9248 if (inv.Value.Name == item)
8778 { 9249 {
8779 if (inv.Value.Name == item) 9250 m_host.TaskInventory.LockItemsForRead(false);
8780 { 9251 return inv.Value.CreatorID.ToString();
8781 return inv.Value.CreatorID.ToString();
8782 }
8783 } 9252 }
8784 } 9253 }
9254 m_host.TaskInventory.LockItemsForRead(false);
8785 9255
8786 llSay(0, "No item name '" + item + "'"); 9256 llSay(0, "No item name '" + item + "'");
8787 9257
@@ -9046,17 +9516,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9046 int width = 0; 9516 int width = 0;
9047 int height = 0; 9517 int height = 0;
9048 9518
9049 ParcelMediaCommandEnum? commandToSend = null; 9519 uint commandToSend = 0;
9050 float time = 0.0f; // default is from start 9520 float time = 0.0f; // default is from start
9051 9521
9052 ScenePresence presence = null; 9522 ScenePresence presence = null;
9053 9523
9054 for (int i = 0; i < commandList.Data.Length; i++) 9524 for (int i = 0; i < commandList.Data.Length; i++)
9055 { 9525 {
9056 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 9526 uint command = (uint)(commandList.GetLSLIntegerItem(i));
9057 switch (command) 9527 switch (command)
9058 { 9528 {
9059 case ParcelMediaCommandEnum.Agent: 9529 case (uint)ParcelMediaCommandEnum.Agent:
9060 // we send only to one agent 9530 // we send only to one agent
9061 if ((i + 1) < commandList.Length) 9531 if ((i + 1) < commandList.Length)
9062 { 9532 {
@@ -9073,25 +9543,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9073 } 9543 }
9074 break; 9544 break;
9075 9545
9076 case ParcelMediaCommandEnum.Loop: 9546 case (uint)ParcelMediaCommandEnum.Loop:
9077 loop = 1; 9547 loop = 1;
9078 commandToSend = command; 9548 commandToSend = command;
9079 update = true; //need to send the media update packet to set looping 9549 update = true; //need to send the media update packet to set looping
9080 break; 9550 break;
9081 9551
9082 case ParcelMediaCommandEnum.Play: 9552 case (uint)ParcelMediaCommandEnum.Play:
9083 loop = 0; 9553 loop = 0;
9084 commandToSend = command; 9554 commandToSend = command;
9085 update = true; //need to send the media update packet to make sure it doesn't loop 9555 update = true; //need to send the media update packet to make sure it doesn't loop
9086 break; 9556 break;
9087 9557
9088 case ParcelMediaCommandEnum.Pause: 9558 case (uint)ParcelMediaCommandEnum.Pause:
9089 case ParcelMediaCommandEnum.Stop: 9559 case (uint)ParcelMediaCommandEnum.Stop:
9090 case ParcelMediaCommandEnum.Unload: 9560 case (uint)ParcelMediaCommandEnum.Unload:
9091 commandToSend = command; 9561 commandToSend = command;
9092 break; 9562 break;
9093 9563
9094 case ParcelMediaCommandEnum.Url: 9564 case (uint)ParcelMediaCommandEnum.Url:
9095 if ((i + 1) < commandList.Length) 9565 if ((i + 1) < commandList.Length)
9096 { 9566 {
9097 if (commandList.Data[i + 1] is LSL_String) 9567 if (commandList.Data[i + 1] is LSL_String)
@@ -9104,7 +9574,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9104 } 9574 }
9105 break; 9575 break;
9106 9576
9107 case ParcelMediaCommandEnum.Texture: 9577 case (uint)ParcelMediaCommandEnum.Texture:
9108 if ((i + 1) < commandList.Length) 9578 if ((i + 1) < commandList.Length)
9109 { 9579 {
9110 if (commandList.Data[i + 1] is LSL_String) 9580 if (commandList.Data[i + 1] is LSL_String)
@@ -9117,7 +9587,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9117 } 9587 }
9118 break; 9588 break;
9119 9589
9120 case ParcelMediaCommandEnum.Time: 9590 case (uint)ParcelMediaCommandEnum.Time:
9121 if ((i + 1) < commandList.Length) 9591 if ((i + 1) < commandList.Length)
9122 { 9592 {
9123 if (commandList.Data[i + 1] is LSL_Float) 9593 if (commandList.Data[i + 1] is LSL_Float)
@@ -9129,7 +9599,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9129 } 9599 }
9130 break; 9600 break;
9131 9601
9132 case ParcelMediaCommandEnum.AutoAlign: 9602 case (uint)ParcelMediaCommandEnum.AutoAlign:
9133 if ((i + 1) < commandList.Length) 9603 if ((i + 1) < commandList.Length)
9134 { 9604 {
9135 if (commandList.Data[i + 1] is LSL_Integer) 9605 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9143,7 +9613,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9143 } 9613 }
9144 break; 9614 break;
9145 9615
9146 case ParcelMediaCommandEnum.Type: 9616 case (uint)ParcelMediaCommandEnum.Type:
9147 if ((i + 1) < commandList.Length) 9617 if ((i + 1) < commandList.Length)
9148 { 9618 {
9149 if (commandList.Data[i + 1] is LSL_String) 9619 if (commandList.Data[i + 1] is LSL_String)
@@ -9156,7 +9626,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9156 } 9626 }
9157 break; 9627 break;
9158 9628
9159 case ParcelMediaCommandEnum.Desc: 9629 case (uint)ParcelMediaCommandEnum.Desc:
9160 if ((i + 1) < commandList.Length) 9630 if ((i + 1) < commandList.Length)
9161 { 9631 {
9162 if (commandList.Data[i + 1] is LSL_String) 9632 if (commandList.Data[i + 1] is LSL_String)
@@ -9169,7 +9639,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9169 } 9639 }
9170 break; 9640 break;
9171 9641
9172 case ParcelMediaCommandEnum.Size: 9642 case (uint)ParcelMediaCommandEnum.Size:
9173 if ((i + 2) < commandList.Length) 9643 if ((i + 2) < commandList.Length)
9174 { 9644 {
9175 if (commandList.Data[i + 1] is LSL_Integer) 9645 if (commandList.Data[i + 1] is LSL_Integer)
@@ -9239,7 +9709,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9239 } 9709 }
9240 } 9710 }
9241 9711
9242 if (commandToSend != null) 9712 if (commandToSend != 0)
9243 { 9713 {
9244 // the commandList contained a start/stop/... command, too 9714 // the commandList contained a start/stop/... command, too
9245 if (presence == null) 9715 if (presence == null)
@@ -9276,7 +9746,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9276 9746
9277 if (aList.Data[i] != null) 9747 if (aList.Data[i] != null)
9278 { 9748 {
9279 switch ((ParcelMediaCommandEnum) aList.Data[i]) 9749 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
9280 { 9750 {
9281 case ParcelMediaCommandEnum.Url: 9751 case ParcelMediaCommandEnum.Url:
9282 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); 9752 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL));
@@ -9319,16 +9789,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9319 { 9789 {
9320 m_host.AddScriptLPS(1); 9790 m_host.AddScriptLPS(1);
9321 9791
9322 lock (m_host.TaskInventory) 9792 m_host.TaskInventory.LockItemsForRead(true);
9793 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
9323 { 9794 {
9324 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9795 if (inv.Value.Name == name)
9325 { 9796 {
9326 if (inv.Value.Name == name) 9797 m_host.TaskInventory.LockItemsForRead(false);
9327 { 9798 return inv.Value.Type;
9328 return inv.Value.Type;
9329 }
9330 } 9799 }
9331 } 9800 }
9801 m_host.TaskInventory.LockItemsForRead(false);
9332 9802
9333 return -1; 9803 return -1;
9334 } 9804 }
@@ -9339,15 +9809,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9339 9809
9340 if (quick_pay_buttons.Data.Length < 4) 9810 if (quick_pay_buttons.Data.Length < 4)
9341 { 9811 {
9342 LSLError("List must have at least 4 elements"); 9812 int x;
9343 return; 9813 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
9814 {
9815 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
9816 }
9344 } 9817 }
9345 m_host.ParentGroup.RootPart.PayPrice[0]=price; 9818 int[] nPrice = new int[5];
9346 9819 nPrice[0] = price;
9347 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 9820 nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
9348 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 9821 nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
9349 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 9822 nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
9350 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 9823 nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
9824 m_host.ParentGroup.RootPart.PayPrice = nPrice;
9351 m_host.ParentGroup.HasGroupChanged = true; 9825 m_host.ParentGroup.HasGroupChanged = true;
9352 } 9826 }
9353 9827
@@ -9359,17 +9833,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9359 if (invItemID == UUID.Zero) 9833 if (invItemID == UUID.Zero)
9360 return new LSL_Vector(); 9834 return new LSL_Vector();
9361 9835
9362 lock (m_host.TaskInventory) 9836 m_host.TaskInventory.LockItemsForRead(true);
9837 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9363 { 9838 {
9364 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9839 m_host.TaskInventory.LockItemsForRead(false);
9365 return new LSL_Vector(); 9840 return new LSL_Vector();
9841 }
9366 9842
9367 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 9843 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9368 { 9844 {
9369 ShoutError("No permissions to track the camera"); 9845 ShoutError("No permissions to track the camera");
9370 return new LSL_Vector(); 9846 m_host.TaskInventory.LockItemsForRead(false);
9371 } 9847 return new LSL_Vector();
9372 } 9848 }
9849 m_host.TaskInventory.LockItemsForRead(false);
9373 9850
9374 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 9851 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9375 if (presence != null) 9852 if (presence != null)
@@ -9387,17 +9864,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9387 if (invItemID == UUID.Zero) 9864 if (invItemID == UUID.Zero)
9388 return new LSL_Rotation(); 9865 return new LSL_Rotation();
9389 9866
9390 lock (m_host.TaskInventory) 9867 m_host.TaskInventory.LockItemsForRead(true);
9868 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
9391 { 9869 {
9392 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9870 m_host.TaskInventory.LockItemsForRead(false);
9393 return new LSL_Rotation(); 9871 return new LSL_Rotation();
9394
9395 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9396 {
9397 ShoutError("No permissions to track the camera");
9398 return new LSL_Rotation();
9399 }
9400 } 9872 }
9873 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
9874 {
9875 ShoutError("No permissions to track the camera");
9876 m_host.TaskInventory.LockItemsForRead(false);
9877 return new LSL_Rotation();
9878 }
9879 m_host.TaskInventory.LockItemsForRead(false);
9401 9880
9402 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 9881 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
9403 if (presence != null) 9882 if (presence != null)
@@ -9459,8 +9938,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9459 { 9938 {
9460 m_host.AddScriptLPS(1); 9939 m_host.AddScriptLPS(1);
9461 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0); 9940 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0);
9462 if (detectedParams == null) return; // only works on the first detected avatar 9941 if (detectedParams == null)
9463 9942 {
9943 if (m_host.IsAttachment == true)
9944 {
9945 detectedParams = new DetectParams();
9946 detectedParams.Key = m_host.OwnerID;
9947 }
9948 else
9949 {
9950 return;
9951 }
9952 }
9953
9464 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 9954 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
9465 if (avatar != null) 9955 if (avatar != null)
9466 { 9956 {
@@ -9468,6 +9958,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9468 new Vector3((float)pos.x, (float)pos.y, (float)pos.z), 9958 new Vector3((float)pos.x, (float)pos.y, (float)pos.z),
9469 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z)); 9959 new Vector3((float)lookAt.x, (float)lookAt.y, (float)lookAt.z));
9470 } 9960 }
9961
9471 ScriptSleep(1000); 9962 ScriptSleep(1000);
9472 } 9963 }
9473 9964
@@ -9560,14 +10051,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9560 if (objectID == UUID.Zero) return; 10051 if (objectID == UUID.Zero) return;
9561 10052
9562 UUID agentID; 10053 UUID agentID;
9563 lock (m_host.TaskInventory) 10054 m_host.TaskInventory.LockItemsForRead(true);
9564 { 10055 // we need the permission first, to know which avatar we want to set the camera for
9565 // we need the permission first, to know which avatar we want to set the camera for 10056 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9566 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9567 10057
9568 if (agentID == UUID.Zero) return; 10058 if (agentID == UUID.Zero)
9569 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 10059 {
10060 m_host.TaskInventory.LockItemsForRead(false);
10061 return;
9570 } 10062 }
10063 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10064 {
10065 m_host.TaskInventory.LockItemsForRead(false);
10066 return;
10067 }
10068 m_host.TaskInventory.LockItemsForRead(false);
9571 10069
9572 ScenePresence presence = World.GetScenePresence(agentID); 10070 ScenePresence presence = World.GetScenePresence(agentID);
9573 10071
@@ -9576,12 +10074,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9576 10074
9577 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 10075 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
9578 object[] data = rules.Data; 10076 object[] data = rules.Data;
9579 for (int i = 0; i < data.Length; ++i) { 10077 for (int i = 0; i < data.Length; ++i)
10078 {
9580 int type = Convert.ToInt32(data[i++].ToString()); 10079 int type = Convert.ToInt32(data[i++].ToString());
9581 if (i >= data.Length) break; // odd number of entries => ignore the last 10080 if (i >= data.Length) break; // odd number of entries => ignore the last
9582 10081
9583 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 10082 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
9584 switch (type) { 10083 switch (type)
10084 {
9585 case ScriptBaseClass.CAMERA_FOCUS: 10085 case ScriptBaseClass.CAMERA_FOCUS:
9586 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 10086 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
9587 case ScriptBaseClass.CAMERA_POSITION: 10087 case ScriptBaseClass.CAMERA_POSITION:
@@ -9617,12 +10117,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9617 10117
9618 // we need the permission first, to know which avatar we want to clear the camera for 10118 // we need the permission first, to know which avatar we want to clear the camera for
9619 UUID agentID; 10119 UUID agentID;
9620 lock (m_host.TaskInventory) 10120 m_host.TaskInventory.LockItemsForRead(true);
10121 agentID = m_host.TaskInventory[invItemID].PermsGranter;
10122 if (agentID == UUID.Zero)
9621 { 10123 {
9622 agentID = m_host.TaskInventory[invItemID].PermsGranter; 10124 m_host.TaskInventory.LockItemsForRead(false);
9623 if (agentID == UUID.Zero) return; 10125 return;
9624 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
9625 } 10126 }
10127 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
10128 {
10129 m_host.TaskInventory.LockItemsForRead(false);
10130 return;
10131 }
10132 m_host.TaskInventory.LockItemsForRead(false);
9626 10133
9627 ScenePresence presence = World.GetScenePresence(agentID); 10134 ScenePresence presence = World.GetScenePresence(agentID);
9628 10135
@@ -9689,19 +10196,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9689 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 10196 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
9690 { 10197 {
9691 m_host.AddScriptLPS(1); 10198 m_host.AddScriptLPS(1);
9692 string ret = String.Empty; 10199
9693 string src1 = llBase64ToString(str1); 10200 if (str1 == String.Empty)
9694 string src2 = llBase64ToString(str2); 10201 return String.Empty;
9695 int c = 0; 10202 if (str2 == String.Empty)
9696 for (int i = 0; i < src1.Length; i++) 10203 return str1;
10204
10205 int len = str2.Length;
10206 if ((len % 4) != 0) // LL is EVIL!!!!
10207 {
10208 while (str2.EndsWith("="))
10209 str2 = str2.Substring(0, str2.Length - 1);
10210
10211 len = str2.Length;
10212 int mod = len % 4;
10213
10214 if (mod == 1)
10215 str2 = str2.Substring(0, str2.Length - 1);
10216 else if (mod == 2)
10217 str2 += "==";
10218 else if (mod == 3)
10219 str2 += "=";
10220 }
10221
10222 byte[] data1;
10223 byte[] data2;
10224 try
10225 {
10226 data1 = Convert.FromBase64String(str1);
10227 data2 = Convert.FromBase64String(str2);
10228 }
10229 catch (Exception)
9697 { 10230 {
9698 ret += (char) (src1[i] ^ src2[c]); 10231 return new LSL_String(String.Empty);
10232 }
9699 10233
9700 c++; 10234 byte[] d2 = new Byte[data1.Length];
9701 if (c >= src2.Length) 10235 int pos = 0;
9702 c = 0; 10236
10237 if (data1.Length <= data2.Length)
10238 {
10239 Array.Copy(data2, 0, d2, 0, data1.Length);
9703 } 10240 }
9704 return llStringToBase64(ret); 10241 else
10242 {
10243 while (pos < data1.Length)
10244 {
10245 len = data1.Length - pos;
10246 if (len > data2.Length)
10247 len = data2.Length;
10248
10249 Array.Copy(data2, 0, d2, pos, len);
10250 pos += len;
10251 }
10252 }
10253
10254 for (pos = 0 ; pos < data1.Length ; pos++ )
10255 data1[pos] ^= d2[pos];
10256
10257 return Convert.ToBase64String(data1);
9705 } 10258 }
9706 10259
9707 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 10260 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -9760,12 +10313,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9760 Regex r = new Regex(authregex); 10313 Regex r = new Regex(authregex);
9761 int[] gnums = r.GetGroupNumbers(); 10314 int[] gnums = r.GetGroupNumbers();
9762 Match m = r.Match(url); 10315 Match m = r.Match(url);
9763 if (m.Success) { 10316 if (m.Success)
9764 for (int i = 1; i < gnums.Length; i++) { 10317 {
10318 for (int i = 1; i < gnums.Length; i++)
10319 {
9765 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 10320 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
9766 //CaptureCollection cc = g.Captures; 10321 //CaptureCollection cc = g.Captures;
9767 } 10322 }
9768 if (m.Groups.Count == 5) { 10323 if (m.Groups.Count == 5)
10324 {
9769 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 10325 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
9770 url = m.Groups[1].ToString() + m.Groups[4].ToString(); 10326 url = m.Groups[1].ToString() + m.Groups[4].ToString();
9771 } 10327 }
@@ -10082,15 +10638,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10082 10638
10083 internal UUID ScriptByName(string name) 10639 internal UUID ScriptByName(string name)
10084 { 10640 {
10085 lock (m_host.TaskInventory) 10641 m_host.TaskInventory.LockItemsForRead(true);
10642
10643 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
10086 { 10644 {
10087 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 10645 if (item.Type == 10 && item.Name == name)
10088 { 10646 {
10089 if (item.Type == 10 && item.Name == name) 10647 m_host.TaskInventory.LockItemsForRead(false);
10090 return item.ItemID; 10648 return item.ItemID;
10091 } 10649 }
10092 } 10650 }
10093 10651
10652 m_host.TaskInventory.LockItemsForRead(false);
10653
10094 return UUID.Zero; 10654 return UUID.Zero;
10095 } 10655 }
10096 10656
@@ -10131,6 +10691,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10131 { 10691 {
10132 m_host.AddScriptLPS(1); 10692 m_host.AddScriptLPS(1);
10133 10693
10694 //Clone is thread safe
10134 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10695 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10135 10696
10136 UUID assetID = UUID.Zero; 10697 UUID assetID = UUID.Zero;
@@ -10193,6 +10754,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10193 { 10754 {
10194 m_host.AddScriptLPS(1); 10755 m_host.AddScriptLPS(1);
10195 10756
10757 //Clone is thread safe
10196 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 10758 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
10197 10759
10198 UUID assetID = UUID.Zero; 10760 UUID assetID = UUID.Zero;
@@ -10272,6 +10834,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10272 10834
10273 return GetLinkPrimitiveParams(obj, rules); 10835 return GetLinkPrimitiveParams(obj, rules);
10274 } 10836 }
10837
10838 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
10839 {
10840 List<SceneObjectPart> parts = GetLinkParts(link);
10841 if (parts.Count < 1)
10842 return 0;
10843
10844 return GetNumberOfSides(parts[0]);
10845 }
10275 } 10846 }
10276 10847
10277 public class NotecardCache 10848 public class NotecardCache
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index bca08fb..3f0393d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -129,6 +129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
129 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; 129 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
130 internal float m_ScriptDelayFactor = 1.0f; 130 internal float m_ScriptDelayFactor = 1.0f;
131 internal float m_ScriptDistanceFactor = 1.0f; 131 internal float m_ScriptDistanceFactor = 1.0f;
132 internal bool m_debuggerSafe = false;
132 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); 133 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
133 134
134 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) 135 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
@@ -137,6 +138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
137 m_host = host; 138 m_host = host;
138 m_localID = localID; 139 m_localID = localID;
139 m_itemID = itemID; 140 m_itemID = itemID;
141 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
140 142
141 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) 143 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
142 m_OSFunctionsEnabled = true; 144 m_OSFunctionsEnabled = true;
@@ -195,7 +197,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
195 197
196 internal void OSSLError(string msg) 198 internal void OSSLError(string msg)
197 { 199 {
198 throw new Exception("OSSL Runtime Error: " + msg); 200 if (m_debuggerSafe)
201 {
202 OSSLShoutError(msg);
203 }
204 else
205 {
206 throw new Exception("OSSL Runtime Error: " + msg);
207 }
199 } 208 }
200 209
201 private void InitLSL() 210 private void InitLSL()
@@ -835,18 +844,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
835 if (target != null) 844 if (target != null)
836 { 845 {
837 UUID animID=UUID.Zero; 846 UUID animID=UUID.Zero;
838 lock (m_host.TaskInventory) 847 m_host.TaskInventory.LockItemsForRead(true);
848 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
839 { 849 {
840 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 850 if (inv.Value.Name == animation)
841 { 851 {
842 if (inv.Value.Name == animation) 852 if (inv.Value.Type == (int)AssetType.Animation)
843 { 853 animID = inv.Value.AssetID;
844 if (inv.Value.Type == (int)AssetType.Animation) 854 continue;
845 animID = inv.Value.AssetID;
846 continue;
847 }
848 } 855 }
849 } 856 }
857 m_host.TaskInventory.LockItemsForRead(false);
850 if (animID == UUID.Zero) 858 if (animID == UUID.Zero)
851 target.Animator.AddAnimation(animation, m_host.UUID); 859 target.Animator.AddAnimation(animation, m_host.UUID);
852 else 860 else
@@ -868,18 +876,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
868 if (target != null) 876 if (target != null)
869 { 877 {
870 UUID animID=UUID.Zero; 878 UUID animID=UUID.Zero;
871 lock (m_host.TaskInventory) 879 m_host.TaskInventory.LockItemsForRead(true);
880 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
872 { 881 {
873 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 882 if (inv.Value.Name == animation)
874 { 883 {
875 if (inv.Value.Name == animation) 884 if (inv.Value.Type == (int)AssetType.Animation)
876 { 885 animID = inv.Value.AssetID;
877 if (inv.Value.Type == (int)AssetType.Animation) 886 continue;
878 animID = inv.Value.AssetID;
879 continue;
880 }
881 } 887 }
882 } 888 }
889 m_host.TaskInventory.LockItemsForRead(false);
883 890
884 if (animID == UUID.Zero) 891 if (animID == UUID.Zero)
885 target.Animator.RemoveAnimation(animation); 892 target.Animator.RemoveAnimation(animation);
@@ -1772,6 +1779,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1772 1779
1773 if (!UUID.TryParse(name, out assetID)) 1780 if (!UUID.TryParse(name, out assetID))
1774 { 1781 {
1782 m_host.TaskInventory.LockItemsForRead(true);
1775 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1783 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1776 { 1784 {
1777 if (item.Type == 7 && item.Name == name) 1785 if (item.Type == 7 && item.Name == name)
@@ -1779,6 +1787,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1779 assetID = item.AssetID; 1787 assetID = item.AssetID;
1780 } 1788 }
1781 } 1789 }
1790 m_host.TaskInventory.LockItemsForRead(false);
1782 } 1791 }
1783 1792
1784 if (assetID == UUID.Zero) 1793 if (assetID == UUID.Zero)
@@ -1825,6 +1834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1825 1834
1826 if (!UUID.TryParse(name, out assetID)) 1835 if (!UUID.TryParse(name, out assetID))
1827 { 1836 {
1837 m_host.TaskInventory.LockItemsForRead(true);
1828 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1838 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1829 { 1839 {
1830 if (item.Type == 7 && item.Name == name) 1840 if (item.Type == 7 && item.Name == name)
@@ -1832,6 +1842,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1832 assetID = item.AssetID; 1842 assetID = item.AssetID;
1833 } 1843 }
1834 } 1844 }
1845 m_host.TaskInventory.LockItemsForRead(false);
1835 } 1846 }
1836 1847
1837 if (assetID == UUID.Zero) 1848 if (assetID == UUID.Zero)
@@ -1882,6 +1893,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1882 1893
1883 if (!UUID.TryParse(name, out assetID)) 1894 if (!UUID.TryParse(name, out assetID))
1884 { 1895 {
1896 m_host.TaskInventory.LockItemsForRead(true);
1885 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1897 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1886 { 1898 {
1887 if (item.Type == 7 && item.Name == name) 1899 if (item.Type == 7 && item.Name == name)
@@ -1889,6 +1901,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1889 assetID = item.AssetID; 1901 assetID = item.AssetID;
1890 } 1902 }
1891 } 1903 }
1904 m_host.TaskInventory.LockItemsForRead(false);
1892 } 1905 }
1893 1906
1894 if (assetID == UUID.Zero) 1907 if (assetID == UUID.Zero)
@@ -2368,9 +2381,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2368 { 2381 {
2369 if (avatar.IsChildAgent == false) 2382 if (avatar.IsChildAgent == false)
2370 { 2383 {
2371 result.Add(avatar.UUID); 2384 result.Add(new LSL_Key(avatar.UUID.ToString()));
2372 result.Add(avatar.AbsolutePosition); 2385 result.Add(new LSL_Vector(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z));
2373 result.Add(avatar.Name); 2386 result.Add(new LSL_String(avatar.Name));
2374 } 2387 }
2375 } 2388 }
2376 }); 2389 });
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index fefbb35..c4f90d2 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
@@ -301,7 +301,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
301 float dy; 301 float dy;
302 float dz; 302 float dz;
303 303
304 Quaternion q = SensePoint.RotationOffset; 304// Quaternion q = SensePoint.RotationOffset;
305 Quaternion q = SensePoint.GetWorldRotation(); // non-attached prim Sensor *always* uses World rotation!
305 if (SensePoint.ParentGroup.RootPart.IsAttachment) 306 if (SensePoint.ParentGroup.RootPart.IsAttachment)
306 { 307 {
307 // In attachments, the sensor cone always orients with the 308 // In attachments, the sensor cone always orients with the
@@ -309,6 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
309 // in mouselook. 310 // in mouselook.
310 311
311 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar); 312 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
313 fromRegionPos = avatar.AbsolutePosition;
312 q = avatar.Rotation; 314 q = avatar.Rotation;
313 } 315 }
314 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 316 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
@@ -422,6 +424,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
422 SceneObjectPart SensePoint = ts.host; 424 SceneObjectPart SensePoint = ts.host;
423 Vector3 fromRegionPos = SensePoint.AbsolutePosition; 425 Vector3 fromRegionPos = SensePoint.AbsolutePosition;
424 Quaternion q = SensePoint.RotationOffset; 426 Quaternion q = SensePoint.RotationOffset;
427 if (SensePoint.ParentGroup.RootPart.IsAttachment)
428 {
429 // In attachments, the sensor cone always orients with the
430 // avatar rotation. This may include a nonzero elevation if
431 // in mouselook.
432
433 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
434 fromRegionPos = avatar.AbsolutePosition;
435 q = avatar.Rotation;
436 }
425 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 437 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); 438 LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
427 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir); 439 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index eeb59d9..2fd33fe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -109,25 +109,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
109 if (Timers.Count == 0) 109 if (Timers.Count == 0)
110 return; 110 return;
111 111
112 Dictionary<string, TimerClass>.ValueCollection tvals;
112 lock (TimerListLock) 113 lock (TimerListLock)
113 { 114 {
114 // Go through all timers 115 // Go through all timers
115 Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values; 116 tvals = Timers.Values;
116 foreach (TimerClass ts in tvals) 117 }
118
119 foreach (TimerClass ts in tvals)
120 {
121 // Time has passed?
122 if (ts.next < DateTime.Now.Ticks)
117 { 123 {
118 // Time has passed? 124 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
119 if (ts.next < DateTime.Now.Ticks) 125 // Add it to queue
120 { 126 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
121 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 127 new EventParams("timer", new Object[0],
122 // Add it to queue 128 new DetectParams[0]));
123 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 129 // set next interval
124 new EventParams("timer", new Object[0], 130
125 new DetectParams[0])); 131 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
126 // set next interval 132 ts.next = DateTime.Now.Ticks + ts.interval;
127
128 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
129 ts.next = DateTime.Now.Ticks + ts.interval;
130 }
131 } 133 }
132 } 134 }
133 } 135 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 561e3b3..bae7d4b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -398,6 +398,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
398 LSL_Vector llWind(LSL_Vector offset); 398 LSL_Vector llWind(LSL_Vector offset);
399 LSL_String llXorBase64Strings(string str1, string str2); 399 LSL_String llXorBase64Strings(string str1, string str2);
400 LSL_String llXorBase64StringsCorrect(string str1, string str2); 400 LSL_String llXorBase64StringsCorrect(string str1, string str2);
401 LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
401 402
402 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 403 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
403 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 404 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 63007c6..c08ad3b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
83 // Avatar Info Commands 83 // Avatar Info Commands
84 string osGetAgentIP(string agent); 84 string osGetAgentIP(string agent);
85 LSL_List osGetAgents(); 85 LSL_List osGetAgents();
86 86
87 // Teleport commands 87 // Teleport commands
88 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 88 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
89 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 89 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 9615315..943d7a2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Reflection; 31using System.Reflection;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using OpenSim.Region.ScriptEngine.Shared; 33using OpenSim.Region.ScriptEngine.Shared;
@@ -132,6 +133,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
132 return (eventFlags); 133 return (eventFlags);
133 } 134 }
134 135
136 [DebuggerNonUserCode]
135 public void ExecuteEvent(string state, string FunctionName, object[] args) 137 public void ExecuteEvent(string state, string FunctionName, object[] args)
136 { 138 {
137 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory. 139 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index b3c4d95..93d544b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -279,6 +279,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
279 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART 279 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
280 public const int CHANGED_MEDIA = 2048; 280 public const int CHANGED_MEDIA = 2048;
281 public const int CHANGED_ANIMATION = 16384; 281 public const int CHANGED_ANIMATION = 16384;
282 public const int CHANGED_POSITION = 32768;
282 public const int TYPE_INVALID = 0; 283 public const int TYPE_INVALID = 0;
283 public const int TYPE_INTEGER = 1; 284 public const int TYPE_INTEGER = 1;
284 public const int TYPE_FLOAT = 2; 285 public const int TYPE_FLOAT = 2;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 451163f..7c26824 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Diagnostics; //for [DebuggerNonUserCode]
29using System.Runtime.Remoting.Lifetime; 30using System.Runtime.Remoting.Lifetime;
30using System.Threading; 31using System.Threading;
31using System.Reflection; 32using System.Reflection;
@@ -309,6 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
309 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); 310 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
310 } 311 }
311 312
313 [DebuggerNonUserCode]
312 public void llDie() 314 public void llDie()
313 { 315 {
314 m_LSL_Functions.llDie(); 316 m_LSL_Functions.llDie();
@@ -1847,5 +1849,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1847 { 1849 {
1848 return m_LSL_Functions.llClearPrimMedia(face); 1850 return m_LSL_Functions.llClearPrimMedia(face);
1849 } 1851 }
1852
1853 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
1854 {
1855 return m_LSL_Functions.llGetLinkNumberOfSides(link);
1856 }
1850 } 1857 }
1851} 1858}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index 143b497..2e27f16 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -72,9 +72,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
72 { 72 {
73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); 73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
74 } 74 }
75
75 public void lsClearWindlightScene() 76 public void lsClearWindlightScene()
76 { 77 {
77 m_LS_Functions.lsClearWindlightScene(); 78 m_LS_Functions.lsClearWindlightScene();
78 } 79 }
80
81 public LSL_List cmGetWindlightScene(LSL_List rules)
82 {
83 return m_LS_Functions.lsGetWindlightScene(rules);
84 }
85
86 public int cmSetWindlightScene(LSL_List rules)
87 {
88 return m_LS_Functions.lsSetWindlightScene(rules);
89 }
90
91 public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
92 {
93 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
94 }
95
96 public void cmClearWindlightScene()
97 {
98 m_LS_Functions.lsClearWindlightScene();
99 }
79 } 100 }
80} 101}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index edbbc2a..b138da3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -33,6 +33,7 @@ using System.Threading;
33using System.Reflection; 33using System.Reflection;
34using System.Collections; 34using System.Collections;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.Diagnostics; //for [DebuggerNonUserCode]
36using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared; 38using OpenSim.Region.ScriptEngine.Shared;
38using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; 39using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
@@ -90,6 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
90 return (int)m_Executor.GetStateEventFlags(state); 91 return (int)m_Executor.GetStateEventFlags(state);
91 } 92 }
92 93
94 [DebuggerNonUserCode]
93 public void ExecuteEvent(string state, string FunctionName, object[] args) 95 public void ExecuteEvent(string state, string FunctionName, object[] args)
94 { 96 {
95 m_Executor.ExecuteEvent(state, FunctionName, args); 97 m_Executor.ExecuteEvent(state, FunctionName, args);
generated by cgit v1.1 at 2024-12-30 16:02:01 +0000