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.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs117
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3517
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs157
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs46
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs71
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs60
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs2
17 files changed, 2912 insertions, 1200 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 998f40b..1e19032 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -28,9 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using System.Threading; 31using System.Threading;
33using log4net;
34using OpenMetaverse; 32using OpenMetaverse;
35using OpenSim.Framework; 33using OpenSim.Framework;
36using OpenSim.Framework.Monitoring; 34using OpenSim.Framework.Monitoring;
@@ -39,6 +37,8 @@ using OpenSim.Region.ScriptEngine.Interfaces;
39using OpenSim.Region.ScriptEngine.Shared; 37using OpenSim.Region.ScriptEngine.Shared;
40using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 38using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
41using Timer=OpenSim.Region.ScriptEngine.Shared.Api.Plugins.Timer; 39using Timer=OpenSim.Region.ScriptEngine.Shared.Api.Plugins.Timer;
40using System.Reflection;
41using log4net;
42 42
43namespace OpenSim.Region.ScriptEngine.Shared.Api 43namespace OpenSim.Region.ScriptEngine.Shared.Api
44{ 44{
@@ -269,6 +269,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
269 /// <param name="itemID"></param> 269 /// <param name="itemID"></param>
270 public static void RemoveScript(IScriptEngine engine, uint localID, UUID itemID) 270 public static void RemoveScript(IScriptEngine engine, uint localID, UUID itemID)
271 { 271 {
272 // Remove a specific script
272// m_log.DebugFormat("[ASYNC COMMAND MANAGER]: Removing facilities for script {0}", itemID); 273// m_log.DebugFormat("[ASYNC COMMAND MANAGER]: Removing facilities for script {0}", itemID);
273 274
274 lock (staticLock) 275 lock (staticLock)
@@ -282,7 +283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
282 // Remove from: HttpRequest 283 // Remove from: HttpRequest
283 IHttpRequestModule iHttpReq = engine.World.RequestModuleInterface<IHttpRequestModule>(); 284 IHttpRequestModule iHttpReq = engine.World.RequestModuleInterface<IHttpRequestModule>();
284 if (iHttpReq != null) 285 if (iHttpReq != null)
285 iHttpReq.StopHttpRequestsForScript(itemID); 286 iHttpReq.StopHttpRequest(localID, itemID);
286 287
287 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>(); 288 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
288 if (comms != null) 289 if (comms != null)
@@ -364,6 +365,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
364 } 365 }
365 } 366 }
366 367
368 public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
369 {
370 // Remove a specific script
371
372 // Remove dataserver events
373 m_Dataserver[engine].RemoveEvents(localID, itemID);
374
375 IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
376 if (comms != null)
377 comms.DeleteListener(itemID);
378
379 IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
380 if (xmlrpc != null)
381 {
382 xmlrpc.DeleteChannels(itemID);
383 xmlrpc.CancelSRDRequests(itemID);
384 }
385
386 // Remove Sensors
387 m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
388
389 }
390
367 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) 391 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
368 { 392 {
369 List<Object> data = new List<Object>(); 393 List<Object> data = new List<Object>();
@@ -439,4 +463,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
439 } 463 }
440 } 464 }
441 } 465 }
442} \ No newline at end of file 466}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
new file mode 100644
index 0000000..fce8ff8
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -0,0 +1,117 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Threading;
30using System.Reflection;
31using System.Collections;
32using System.Collections.Generic;
33using System.Runtime.Remoting.Lifetime;
34using OpenMetaverse;
35using Nini.Config;
36using OpenSim;
37using OpenSim.Framework;
38using OpenSim.Region.CoreModules.World.LightShare;
39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.ScriptEngine.Shared;
42using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
43using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
44using OpenSim.Region.ScriptEngine.Interfaces;
45using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
46using OpenSim.Services.Interfaces;
47
48using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
49using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
50using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
51using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
52using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
53using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
54using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
55
56namespace OpenSim.Region.ScriptEngine.Shared.Api
57{
58 [Serializable]
59 public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi
60 {
61 internal IScriptEngine m_ScriptEngine;
62 internal SceneObjectPart m_host;
63 internal TaskInventoryItem m_item;
64 internal bool m_CMFunctionsEnabled = false;
65
66 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
67 {
68 m_ScriptEngine = ScriptEngine;
69 m_host = host;
70 m_item = item;
71
72 if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
73 m_CMFunctionsEnabled = true;
74 }
75
76 public override Object InitializeLifetimeService()
77 {
78 ILease lease = (ILease)base.InitializeLifetimeService();
79
80 if (lease.CurrentState == LeaseState.Initial)
81 {
82 lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
83 // lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
84 // lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
85 }
86 return lease;
87 }
88
89 public Scene World
90 {
91 get { return m_ScriptEngine.World; }
92 }
93
94 public string cmDetectedCountry(int number)
95 {
96 m_host.AddScriptLPS(1);
97 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
98 if (detectedParams == null)
99 return String.Empty;
100 return detectedParams.Country;
101 }
102
103 public string cmGetAgentCountry(LSL_Key key)
104 {
105 if (!World.Permissions.IsGod(m_host.OwnerID))
106 return String.Empty;
107
108 UUID uuid;
109
110 if (!UUID.TryParse(key, out uuid))
111 return String.Empty;
112
113 UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
114 return account.UserCountry;
115 }
116 }
117}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e54b697..cfec630 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -24,14 +24,16 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Diagnostics; //for [DebuggerNonUserCode]
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
34using System.Text.RegularExpressions; 35using System.Text.RegularExpressions;
36using System.Timers;
35using Nini.Config; 37using Nini.Config;
36using log4net; 38using log4net;
37using OpenMetaverse; 39using OpenMetaverse;
@@ -44,6 +46,7 @@ using OpenSim.Region.CoreModules.World.Land;
44using OpenSim.Region.CoreModules.World.Terrain; 46using OpenSim.Region.CoreModules.World.Terrain;
45using OpenSim.Region.Framework.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.Region.Framework.Scenes.Serialization;
47using OpenSim.Region.Framework.Scenes.Animation; 50using OpenSim.Region.Framework.Scenes.Animation;
48using OpenSim.Region.Framework.Scenes.Scripting; 51using OpenSim.Region.Framework.Scenes.Scripting;
49using OpenSim.Region.Physics.Manager; 52using OpenSim.Region.Physics.Manager;
@@ -67,6 +70,7 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
67using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; 70using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
68using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; 71using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
69using System.Reflection; 72using System.Reflection;
73using Timer = System.Timers.Timer;
70using System.Linq; 74using System.Linq;
71using PermissionMask = OpenSim.Framework.PermissionMask; 75using PermissionMask = OpenSim.Framework.PermissionMask;
72 76
@@ -115,11 +119,38 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
115 protected int m_notecardLineReadCharsMax = 255; 119 protected int m_notecardLineReadCharsMax = 255;
116 protected int m_scriptConsoleChannel = 0; 120 protected int m_scriptConsoleChannel = 0;
117 protected bool m_scriptConsoleChannelEnabled = false; 121 protected bool m_scriptConsoleChannelEnabled = false;
122 protected bool m_debuggerSafe = false;
118 protected IUrlModule m_UrlModule = null; 123 protected IUrlModule m_UrlModule = null;
119 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>(); 124 protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
120 protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp. 125 new Dictionary<UUID, UserInfoCacheEntry>();
126 protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp.
121 protected ISoundModule m_SoundModule = null; 127 protected ISoundModule m_SoundModule = null;
122 128
129// protected Timer m_ShoutSayTimer;
130 protected int m_SayShoutCount = 0;
131 DateTime m_lastSayShoutCheck;
132
133 private Dictionary<string, string> MovementAnimationsForLSL =
134 new Dictionary<string, string> {
135 {"FLY", "Flying"},
136 {"FLYSLOW", "FlyingSlow"},
137 {"HOVER_UP", "Hovering Up"},
138 {"HOVER_DOWN", "Hovering Down"},
139 {"HOVER", "Hovering"},
140 {"LAND", "Landing"},
141 {"FALLDOWN", "Falling Down"},
142 {"PREJUMP", "PreJumping"},
143 {"JUMP", "Jumping"},
144 {"STANDUP", "Standing Up"},
145 {"SOFT_LAND", "Soft Landing"},
146 {"STAND", "Standing"},
147 {"CROUCHWALK", "CrouchWalking"},
148 {"RUN", "Running"},
149 {"WALK", "Walking"},
150 {"CROUCH", "Crouching"},
151 {"TURNLEFT", "Turning Left"},
152 {"TURNRIGHT", "Turning Right"}
153 };
123 //An array of HTTP/1.1 headers that are not allowed to be used 154 //An array of HTTP/1.1 headers that are not allowed to be used
124 //as custom headers by llHTTPRequest. 155 //as custom headers by llHTTPRequest.
125 private string[] HttpStandardHeaders = 156 private string[] HttpStandardHeaders =
@@ -140,9 +171,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
140 public void Initialize( 171 public void Initialize(
141 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle) 172 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
142 { 173 {
174 m_lastSayShoutCheck = DateTime.UtcNow;
175
143 m_ScriptEngine = scriptEngine; 176 m_ScriptEngine = scriptEngine;
144 m_host = host; 177 m_host = host;
145 m_item = item; 178 m_item = item;
179 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
146 m_coopSleepHandle = coopSleepHandle; 180 m_coopSleepHandle = coopSleepHandle;
147 181
148 LoadConfig(); 182 LoadConfig();
@@ -231,6 +265,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
231 get { return m_ScriptEngine.World; } 265 get { return m_ScriptEngine.World; }
232 } 266 }
233 267
268 [DebuggerNonUserCode]
234 public void state(string newState) 269 public void state(string newState)
235 { 270 {
236 m_ScriptEngine.SetState(m_item.ItemID, newState); 271 m_ScriptEngine.SetState(m_item.ItemID, newState);
@@ -240,6 +275,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
240 /// Reset the named script. The script must be present 275 /// Reset the named script. The script must be present
241 /// in the same prim. 276 /// in the same prim.
242 /// </summary> 277 /// </summary>
278 [DebuggerNonUserCode]
243 public void llResetScript() 279 public void llResetScript()
244 { 280 {
245 m_host.AddScriptLPS(1); 281 m_host.AddScriptLPS(1);
@@ -302,6 +338,57 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
302 } 338 }
303 } 339 }
304 340
341 public List<ScenePresence> GetLinkAvatars(int linkType)
342 {
343 List<ScenePresence> ret = new List<ScenePresence>();
344 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
345 return ret;
346
347 List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars();
348
349 switch (linkType)
350 {
351 case ScriptBaseClass.LINK_SET:
352 return avs;
353
354 case ScriptBaseClass.LINK_ROOT:
355 return ret;
356
357 case ScriptBaseClass.LINK_ALL_OTHERS:
358 return avs;
359
360 case ScriptBaseClass.LINK_ALL_CHILDREN:
361 return avs;
362
363 case ScriptBaseClass.LINK_THIS:
364 return ret;
365
366 default:
367 if (linkType < 0)
368 return ret;
369
370 int partCount = m_host.ParentGroup.GetPartCount();
371
372 if (linkType <= partCount)
373 {
374 return ret;
375 }
376 else
377 {
378 linkType = linkType - partCount;
379 if (linkType > avs.Count)
380 {
381 return ret;
382 }
383 else
384 {
385 ret.Add(avs[linkType-1]);
386 return ret;
387 }
388 }
389 }
390 }
391
305 /// <summary> 392 /// <summary>
306 /// Get a given link entity from a linkset (linked objects and any sitting avatars). 393 /// Get a given link entity from a linkset (linked objects and any sitting avatars).
307 /// </summary> 394 /// </summary>
@@ -384,6 +471,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
384 public static List<SceneObjectPart> GetLinkParts(SceneObjectPart part, int linkType) 471 public static List<SceneObjectPart> GetLinkParts(SceneObjectPart part, int linkType)
385 { 472 {
386 List<SceneObjectPart> ret = new List<SceneObjectPart>(); 473 List<SceneObjectPart> ret = new List<SceneObjectPart>();
474 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
475 return ret;
387 ret.Add(part); 476 ret.Add(part);
388 477
389 switch (linkType) 478 switch (linkType)
@@ -537,31 +626,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
537 626
538 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke 627 //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
539 628
540 /// <summary> 629 // Utility function for llRot2Euler
541 /// Convert an LSL rotation to a Euler vector. 630
542 /// </summary> 631 // normalize an angle between -PI and PI (-180 to +180 degrees)
543 /// <remarks> 632 protected double NormalizeAngle(double angle)
544 /// Using algorithm based off http://www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToEuler/quat_2_euler_paper_ver2-1.pdf
545 /// to avoid issues with singularity and rounding with Y rotation of +/- PI/2
546 /// </remarks>
547 /// <param name="r"></param>
548 /// <returns></returns>
549 public LSL_Vector llRot2Euler(LSL_Rotation r)
550 { 633 {
551 m_host.AddScriptLPS(1); 634 if (angle > -Math.PI && angle < Math.PI)
635 return angle;
552 636
553 LSL_Vector v = new LSL_Vector(0.0, 0.0, 1.0) * r; // Z axis unit vector unaffected by Z rotation component of r. 637 int numPis = (int)(Math.PI / angle);
554 double m = LSL_Vector.Mag(v); // Just in case v isn't normalized, need magnitude for Asin() operation later. 638 double remainder = angle - Math.PI * numPis;
555 if (m == 0.0) return new LSL_Vector(); 639 if (numPis % 2 == 1)
556 double x = Math.Atan2(-v.y, v.z); 640 return Math.PI - angle;
557 double sin = v.x / m; 641 return remainder;
558 if (sin < -0.999999 || sin > 0.999999) x = 0.0; // Force X rotation to 0 at the singularities. 642 }
559 double y = Math.Asin(sin);
560 // Rotate X axis unit vector by r and unwind the X and Y rotations leaving only the Z rotation
561 v = new LSL_Vector(1.0, 0.0, 0.0) * ((r * new LSL_Rotation(Math.Sin(-x / 2.0), 0.0, 0.0, Math.Cos(-x / 2.0))) * new LSL_Rotation(0.0, Math.Sin(-y / 2.0), 0.0, Math.Cos(-y / 2.0)));
562 double z = Math.Atan2(v.y, v.x);
563 643
564 return new LSL_Vector(x, y, z); 644 public LSL_Vector llRot2Euler(LSL_Rotation q1)
645 {
646 m_host.AddScriptLPS(1);
647 LSL_Vector eul = new LSL_Vector();
648
649 double sqw = q1.s*q1.s;
650 double sqx = q1.x*q1.x;
651 double sqy = q1.z*q1.z;
652 double sqz = q1.y*q1.y;
653 double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
654 double test = q1.x*q1.z + q1.y*q1.s;
655 if (test > 0.4999*unit) { // singularity at north pole
656 eul.z = 2 * Math.Atan2(q1.x,q1.s);
657 eul.y = Math.PI/2;
658 eul.x = 0;
659 return eul;
660 }
661 if (test < -0.4999*unit) { // singularity at south pole
662 eul.z = -2 * Math.Atan2(q1.x,q1.s);
663 eul.y = -Math.PI/2;
664 eul.x = 0;
665 return eul;
666 }
667 eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw);
668 eul.y = Math.Asin(2*test/unit);
669 eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw);
670 return eul;
565 } 671 }
566 672
567 /* From wiki: 673 /* From wiki:
@@ -614,18 +720,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
614 m_host.AddScriptLPS(1); 720 m_host.AddScriptLPS(1);
615 721
616 double x,y,z,s; 722 double x,y,z,s;
617 723 v.x *= 0.5;
618 double c1 = Math.Cos(v.x * 0.5); 724 v.y *= 0.5;
619 double c2 = Math.Cos(v.y * 0.5); 725 v.z *= 0.5;
620 double c3 = Math.Cos(v.z * 0.5); 726 double c1 = Math.Cos(v.x);
621 double s1 = Math.Sin(v.x * 0.5); 727 double c2 = Math.Cos(v.y);
622 double s2 = Math.Sin(v.y * 0.5); 728 double c1c2 = c1 * c2;
623 double s3 = Math.Sin(v.z * 0.5); 729 double s1 = Math.Sin(v.x);
624 730 double s2 = Math.Sin(v.y);
625 x = s1 * c2 * c3 + c1 * s2 * s3; 731 double s1s2 = s1 * s2;
626 y = c1 * s2 * c3 - s1 * c2 * s3; 732 double c1s2 = c1 * s2;
627 z = s1 * s2 * c3 + c1 * c2 * s3; 733 double s1c2 = s1 * c2;
628 s = c1 * c2 * c3 - s1 * s2 * s3; 734 double c3 = Math.Cos(v.z);
735 double s3 = Math.Sin(v.z);
736
737 x = s1c2 * c3 + c1s2 * s3;
738 y = c1s2 * c3 - s1c2 * s3;
739 z = s1s2 * c3 + c1c2 * s3;
740 s = c1c2 * c3 - s1s2 * s3;
629 741
630 return new LSL_Rotation(x, y, z, s); 742 return new LSL_Rotation(x, y, z, s);
631 } 743 }
@@ -763,77 +875,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
763 { 875 {
764 //A and B should both be normalized 876 //A and B should both be normalized
765 m_host.AddScriptLPS(1); 877 m_host.AddScriptLPS(1);
766 LSL_Rotation rotBetween; 878 /* This method is more accurate than the SL one, and thus causes problems
767 // Check for zero vectors. If either is zero, return zero rotation. Otherwise, 879 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
768 // continue calculation. 880
769 if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f)) 881 double dotProduct = LSL_Vector.Dot(a, b);
770 { 882 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
771 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 883 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
772 } 884 double angle = Math.Acos(dotProduct / magProduct);
773 else 885 LSL_Vector axis = LSL_Vector.Norm(crossProduct);
774 { 886 double s = Math.Sin(angle / 2);
775 a = LSL_Vector.Norm(a); 887
776 b = LSL_Vector.Norm(b); 888 double x = axis.x * s;
777 double dotProduct = LSL_Vector.Dot(a, b); 889 double y = axis.y * s;
778 // There are two degenerate cases possible. These are for vectors 180 or 890 double z = axis.z * s;
779 // 0 degrees apart. These have to be detected and handled individually. 891 double w = Math.Cos(angle / 2);
780 // 892
781 // Check for vectors 180 degrees apart. 893 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
782 // A dot product of -1 would mean the angle between vectors is 180 degrees. 894 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
783 if (dotProduct < -0.9999999f) 895
784 { 896 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
785 // First assume X axis is orthogonal to the vectors. 897 */
786 LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f); 898
787 orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a)); 899 // This method mimics the 180 errors found in SL
788 // Check for near zero vector. A very small non-zero number here will create 900 // See www.euclideanspace.com... angleBetween
789 // a rotation in an undesired direction. 901 LSL_Vector vec_a = a;
790 if (LSL_Vector.Mag(orthoVector) > 0.0001) 902 LSL_Vector vec_b = b;
791 { 903
792 rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f); 904 // Eliminate zero length
793 } 905 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
794 // If the magnitude of the vector was near zero, then assume the X axis is not 906 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
795 // orthogonal and use the Z axis instead. 907 if (vec_a_mag < 0.00001 ||
796 else 908 vec_b_mag < 0.00001)
797 { 909 {
798 // Set 180 z rotation. 910 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
799 rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f); 911 }
800 } 912
801 } 913 // Normalize
802 // Check for parallel vectors. 914 vec_a = llVecNorm(vec_a);
803 // A dot product of 1 would mean the angle between vectors is 0 degrees. 915 vec_b = llVecNorm(vec_b);
804 else if (dotProduct > 0.9999999f) 916
805 { 917 // Calculate axis and rotation angle
806 // Set zero rotation. 918 LSL_Vector axis = vec_a % vec_b;
807 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 919 LSL_Float cos_theta = vec_a * vec_b;
808 } 920
809 else 921 // Check if parallel
810 { 922 if (cos_theta > 0.99999)
811 // All special checks have been performed so get the axis of rotation. 923 {
812 LSL_Vector crossProduct = LSL_Vector.Cross(a, b); 924 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
813 // Quarternion s value is the length of the unit vector + dot product. 925 }
814 double qs = 1.0 + dotProduct; 926
815 rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs); 927 // Check if anti-parallel
816 // Normalize the rotation. 928 else if (cos_theta < -0.99999)
817 double mag = LSL_Rotation.Mag(rotBetween); 929 {
818 // We shouldn't have to worry about a divide by zero here. The qs value will be 930 LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
819 // non-zero because we already know if we're here, then the dotProduct is not -1 so 931 if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
820 // qs will not be zero. Also, we've already handled the input vectors being zero so the 932 return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
821 // crossProduct vector should also not be zero. 933 }
822 rotBetween.x = rotBetween.x / mag; 934 else // other rotation
823 rotBetween.y = rotBetween.y / mag; 935 {
824 rotBetween.z = rotBetween.z / mag; 936 LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
825 rotBetween.s = rotBetween.s / mag; 937 axis = llVecNorm(axis);
826 // Check for undefined values and set zero rotation if any found. This code might not actually be required 938 double x, y, z, s, t;
827 // any longer since zero vectors are checked for at the top. 939 s = Math.Cos(theta);
828 if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s)) 940 t = Math.Sin(theta);
829 { 941 x = axis.x * t;
830 rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 942 y = axis.y * t;
831 } 943 z = axis.z * t;
832 } 944 return new LSL_Rotation(x,y,z,s);
833 } 945 }
834 return rotBetween; 946 }
835 } 947
836
837 public void llWhisper(int channelID, string text) 948 public void llWhisper(int channelID, string text)
838 { 949 {
839 m_host.AddScriptLPS(1); 950 m_host.AddScriptLPS(1);
@@ -849,10 +960,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
849 wComm.DeliverMessage(ChatTypeEnum.Whisper, channelID, m_host.Name, m_host.UUID, text); 960 wComm.DeliverMessage(ChatTypeEnum.Whisper, channelID, m_host.Name, m_host.UUID, text);
850 } 961 }
851 962
963 private void CheckSayShoutTime()
964 {
965 DateTime now = DateTime.UtcNow;
966 if ((now - m_lastSayShoutCheck).Ticks > 10000000) // 1sec
967 {
968 m_lastSayShoutCheck = now;
969 m_SayShoutCount = 0;
970 }
971 else
972 m_SayShoutCount++;
973 }
974
852 public void llSay(int channelID, string text) 975 public void llSay(int channelID, string text)
853 { 976 {
854 m_host.AddScriptLPS(1); 977 m_host.AddScriptLPS(1);
855 978
979 if (channelID == 0)
980// m_SayShoutCount++;
981 CheckSayShoutTime();
982
983 if (m_SayShoutCount >= 11)
984 ScriptSleep(2000);
985
856 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel)) 986 if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel))
857 { 987 {
858 Console.WriteLine(text); 988 Console.WriteLine(text);
@@ -875,6 +1005,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
875 { 1005 {
876 m_host.AddScriptLPS(1); 1006 m_host.AddScriptLPS(1);
877 1007
1008 if (channelID == 0)
1009// m_SayShoutCount++;
1010 CheckSayShoutTime();
1011
1012 if (m_SayShoutCount >= 11)
1013 ScriptSleep(2000);
1014
878 if (text.Length > 1023) 1015 if (text.Length > 1023)
879 text = text.Substring(0, 1023); 1016 text = text.Substring(0, 1023);
880 1017
@@ -906,22 +1043,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
906 1043
907 public void llRegionSayTo(string target, int channel, string msg) 1044 public void llRegionSayTo(string target, int channel, string msg)
908 { 1045 {
1046 string error = String.Empty;
1047
909 if (msg.Length > 1023) 1048 if (msg.Length > 1023)
910 msg = msg.Substring(0, 1023); 1049 msg = msg.Substring(0, 1023);
911 1050
912 m_host.AddScriptLPS(1); 1051 m_host.AddScriptLPS(1);
913 1052
914 if (channel == ScriptBaseClass.DEBUG_CHANNEL)
915 {
916 return;
917 }
918
919 UUID TargetID; 1053 UUID TargetID;
920 UUID.TryParse(target, out TargetID); 1054 UUID.TryParse(target, out TargetID);
921 1055
922 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 1056 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
923 if (wComm != null) 1057 if (wComm != null)
924 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg); 1058 if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error))
1059 LSLError(error);
925 } 1060 }
926 1061
927 public LSL_Integer llListen(int channelID, string name, string ID, string msg) 1062 public LSL_Integer llListen(int channelID, string name, string ID, string msg)
@@ -1177,10 +1312,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1177 return detectedParams.TouchUV; 1312 return detectedParams.TouchUV;
1178 } 1313 }
1179 1314
1315 [DebuggerNonUserCode]
1180 public virtual void llDie() 1316 public virtual void llDie()
1181 { 1317 {
1182 m_host.AddScriptLPS(1); 1318 m_host.AddScriptLPS(1);
1183 throw new SelfDeleteException(); 1319 if (!m_host.ParentGroup.IsAttachment) throw new SelfDeleteException();
1184 } 1320 }
1185 1321
1186 public LSL_Float llGround(LSL_Vector offset) 1322 public LSL_Float llGround(LSL_Vector offset)
@@ -1251,6 +1387,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1251 1387
1252 public void llSetStatus(int status, int value) 1388 public void llSetStatus(int status, int value)
1253 { 1389 {
1390 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
1391 return;
1254 m_host.AddScriptLPS(1); 1392 m_host.AddScriptLPS(1);
1255 1393
1256 int statusrotationaxis = 0; 1394 int statusrotationaxis = 0;
@@ -1274,6 +1412,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1274 if (!allow) 1412 if (!allow)
1275 return; 1413 return;
1276 1414
1415 if (m_host.ParentGroup.RootPart.PhysActor != null &&
1416 m_host.ParentGroup.RootPart.PhysActor.IsPhysical)
1417 return;
1418
1277 m_host.ScriptSetPhysicsStatus(true); 1419 m_host.ScriptSetPhysicsStatus(true);
1278 } 1420 }
1279 else 1421 else
@@ -1474,12 +1616,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1474 { 1616 {
1475 m_host.AddScriptLPS(1); 1617 m_host.AddScriptLPS(1);
1476 1618
1619 SetColor(m_host, color, face);
1620 }
1621
1622 protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
1623 {
1624 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1625 return;
1626
1627 Primitive.TextureEntry tex = part.Shape.Textures;
1628 Color4 texcolor;
1629 if (face >= 0 && face < GetNumberOfSides(part))
1630 {
1631 texcolor = tex.CreateFace((uint)face).RGBA;
1632 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1633 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1634 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1635 tex.FaceTextures[face].RGBA = texcolor;
1636 part.UpdateTextureEntry(tex.GetBytes());
1637 return;
1638 }
1639 else if (face == ScriptBaseClass.ALL_SIDES)
1640 {
1641 for (uint i = 0; i < GetNumberOfSides(part); i++)
1642 {
1643 if (tex.FaceTextures[i] != null)
1644 {
1645 texcolor = tex.FaceTextures[i].RGBA;
1646 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1647 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1648 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1649 tex.FaceTextures[i].RGBA = texcolor;
1650 }
1651 texcolor = tex.DefaultTexture.RGBA;
1652 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1653 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1654 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1655 tex.DefaultTexture.RGBA = texcolor;
1656 }
1657 part.UpdateTextureEntry(tex.GetBytes());
1658 return;
1659 }
1660
1477 if (face == ScriptBaseClass.ALL_SIDES) 1661 if (face == ScriptBaseClass.ALL_SIDES)
1478 face = SceneObjectPart.ALL_SIDES; 1662 face = SceneObjectPart.ALL_SIDES;
1479 1663
1480 m_host.SetFaceColorAlpha(face, color, null); 1664 m_host.SetFaceColorAlpha(face, color, null);
1481 } 1665 }
1482 1666
1667 /*
1483 public void llSetContentType(LSL_Key id, LSL_Integer type) 1668 public void llSetContentType(LSL_Key id, LSL_Integer type)
1484 { 1669 {
1485 m_host.AddScriptLPS(1); 1670 m_host.AddScriptLPS(1);
@@ -1546,9 +1731,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1546 break; 1731 break;
1547 } 1732 }
1548 } 1733 }
1734 */
1549 1735
1550 public void SetTexGen(SceneObjectPart part, int face,int style) 1736 public void SetTexGen(SceneObjectPart part, int face,int style)
1551 { 1737 {
1738 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1739 return;
1740
1552 Primitive.TextureEntry tex = part.Shape.Textures; 1741 Primitive.TextureEntry tex = part.Shape.Textures;
1553 MappingType textype; 1742 MappingType textype;
1554 textype = MappingType.Default; 1743 textype = MappingType.Default;
@@ -1579,6 +1768,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1579 1768
1580 public void SetGlow(SceneObjectPart part, int face, float glow) 1769 public void SetGlow(SceneObjectPart part, int face, float glow)
1581 { 1770 {
1771 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1772 return;
1773
1582 Primitive.TextureEntry tex = part.Shape.Textures; 1774 Primitive.TextureEntry tex = part.Shape.Textures;
1583 if (face >= 0 && face < GetNumberOfSides(part)) 1775 if (face >= 0 && face < GetNumberOfSides(part))
1584 { 1776 {
@@ -1604,6 +1796,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1604 1796
1605 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1797 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1606 { 1798 {
1799 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1800 return;
1607 1801
1608 Shininess sval = new Shininess(); 1802 Shininess sval = new Shininess();
1609 1803
@@ -1654,6 +1848,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1654 1848
1655 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1849 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1656 { 1850 {
1851 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1852 return;
1853
1657 Primitive.TextureEntry tex = part.Shape.Textures; 1854 Primitive.TextureEntry tex = part.Shape.Textures;
1658 if (face >= 0 && face < GetNumberOfSides(part)) 1855 if (face >= 0 && face < GetNumberOfSides(part))
1659 { 1856 {
@@ -1714,13 +1911,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1714 m_host.AddScriptLPS(1); 1911 m_host.AddScriptLPS(1);
1715 1912
1716 List<SceneObjectPart> parts = GetLinkParts(linknumber); 1913 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1717 1914 if (parts.Count > 0)
1718 foreach (SceneObjectPart part in parts) 1915 {
1719 SetAlpha(part, alpha, face); 1916 try
1917 {
1918 foreach (SceneObjectPart part in parts)
1919 SetAlpha(part, alpha, face);
1920 }
1921 finally
1922 {
1923 }
1924 }
1720 } 1925 }
1721 1926
1722 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1927 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1723 { 1928 {
1929 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1930 return;
1931
1724 Primitive.TextureEntry tex = part.Shape.Textures; 1932 Primitive.TextureEntry tex = part.Shape.Textures;
1725 Color4 texcolor; 1933 Color4 texcolor;
1726 if (face >= 0 && face < GetNumberOfSides(part)) 1934 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1773,7 +1981,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1773 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1981 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1774 float wind, float tension, LSL_Vector Force) 1982 float wind, float tension, LSL_Vector Force)
1775 { 1983 {
1776 if (part == null) 1984 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1777 return; 1985 return;
1778 1986
1779 if (flexi) 1987 if (flexi)
@@ -1814,7 +2022,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1814 /// <param name="falloff"></param> 2022 /// <param name="falloff"></param>
1815 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 2023 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1816 { 2024 {
1817 if (part == null) 2025 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1818 return; 2026 return;
1819 2027
1820 if (light) 2028 if (light)
@@ -1847,11 +2055,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1847 Primitive.TextureEntry tex = part.Shape.Textures; 2055 Primitive.TextureEntry tex = part.Shape.Textures;
1848 Color4 texcolor; 2056 Color4 texcolor;
1849 LSL_Vector rgb = new LSL_Vector(); 2057 LSL_Vector rgb = new LSL_Vector();
2058 int nsides = GetNumberOfSides(part);
2059
1850 if (face == ScriptBaseClass.ALL_SIDES) 2060 if (face == ScriptBaseClass.ALL_SIDES)
1851 { 2061 {
1852 int i; 2062 int i;
1853 2063 for (i = 0; i < nsides; i++)
1854 for (i = 0 ; i < GetNumberOfSides(part); i++)
1855 { 2064 {
1856 texcolor = tex.GetFace((uint)i).RGBA; 2065 texcolor = tex.GetFace((uint)i).RGBA;
1857 rgb.x += texcolor.R; 2066 rgb.x += texcolor.R;
@@ -1859,14 +2068,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1859 rgb.z += texcolor.B; 2068 rgb.z += texcolor.B;
1860 } 2069 }
1861 2070
1862 rgb.x /= (float)GetNumberOfSides(part); 2071 float invnsides = 1.0f / (float)nsides;
1863 rgb.y /= (float)GetNumberOfSides(part); 2072
1864 rgb.z /= (float)GetNumberOfSides(part); 2073 rgb.x *= invnsides;
2074 rgb.y *= invnsides;
2075 rgb.z *= invnsides;
1865 2076
1866 return rgb; 2077 return rgb;
1867 } 2078 }
1868 2079 if (face >= 0 && face < nsides)
1869 if (face >= 0 && face < GetNumberOfSides(part))
1870 { 2080 {
1871 texcolor = tex.GetFace((uint)face).RGBA; 2081 texcolor = tex.GetFace((uint)face).RGBA;
1872 rgb.x = texcolor.R; 2082 rgb.x = texcolor.R;
@@ -1893,15 +2103,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1893 m_host.AddScriptLPS(1); 2103 m_host.AddScriptLPS(1);
1894 2104
1895 List<SceneObjectPart> parts = GetLinkParts(linknumber); 2105 List<SceneObjectPart> parts = GetLinkParts(linknumber);
1896 2106 if (parts.Count > 0)
1897 foreach (SceneObjectPart part in parts) 2107 {
1898 SetTexture(part, texture, face); 2108 try
1899 2109 {
2110 foreach (SceneObjectPart part in parts)
2111 SetTexture(part, texture, face);
2112 }
2113 finally
2114 {
2115 }
2116 }
1900 ScriptSleep(200); 2117 ScriptSleep(200);
1901 } 2118 }
1902 2119
1903 protected void SetTexture(SceneObjectPart part, string texture, int face) 2120 protected void SetTexture(SceneObjectPart part, string texture, int face)
1904 { 2121 {
2122 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2123 return;
2124
1905 UUID textureID = new UUID(); 2125 UUID textureID = new UUID();
1906 2126
1907 textureID = ScriptUtils.GetAssetIdFromItemName(m_host, texture, (int)AssetType.Texture); 2127 textureID = ScriptUtils.GetAssetIdFromItemName(m_host, texture, (int)AssetType.Texture);
@@ -1946,6 +2166,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1946 2166
1947 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 2167 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1948 { 2168 {
2169 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2170 return;
2171
1949 Primitive.TextureEntry tex = part.Shape.Textures; 2172 Primitive.TextureEntry tex = part.Shape.Textures;
1950 if (face >= 0 && face < GetNumberOfSides(part)) 2173 if (face >= 0 && face < GetNumberOfSides(part))
1951 { 2174 {
@@ -1982,6 +2205,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1982 2205
1983 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 2206 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1984 { 2207 {
2208 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2209 return;
2210
1985 Primitive.TextureEntry tex = part.Shape.Textures; 2211 Primitive.TextureEntry tex = part.Shape.Textures;
1986 if (face >= 0 && face < GetNumberOfSides(part)) 2212 if (face >= 0 && face < GetNumberOfSides(part))
1987 { 2213 {
@@ -2018,6 +2244,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2018 2244
2019 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 2245 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
2020 { 2246 {
2247 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2248 return;
2249
2021 Primitive.TextureEntry tex = part.Shape.Textures; 2250 Primitive.TextureEntry tex = part.Shape.Textures;
2022 if (face >= 0 && face < GetNumberOfSides(part)) 2251 if (face >= 0 && face < GetNumberOfSides(part))
2023 { 2252 {
@@ -2159,7 +2388,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2159 return end; 2388 return end;
2160 } 2389 }
2161 2390
2162 protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos) 2391 protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos, bool adjust)
2163 { 2392 {
2164 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) 2393 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2165 return fromPos; 2394 return fromPos;
@@ -2175,9 +2404,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2175 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0) 2404 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
2176 targetPos.z = ground; 2405 targetPos.z = ground;
2177 } 2406 }
2178 LSL_Vector real_vec = SetPosAdjust(fromPos, targetPos); 2407 if (adjust)
2408 return SetPosAdjust(fromPos, targetPos);
2179 2409
2180 return real_vec; 2410 return targetPos;
2181 } 2411 }
2182 2412
2183 /// <summary> 2413 /// <summary>
@@ -2188,27 +2418,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2188 /// <param name="adjust">if TRUE, will cap the distance to 10m.</param> 2418 /// <param name="adjust">if TRUE, will cap the distance to 10m.</param>
2189 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos, bool adjust) 2419 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos, bool adjust)
2190 { 2420 {
2191 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2421 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2422 return;
2423
2192 LSL_Vector currentPos = GetPartLocalPos(part); 2424 LSL_Vector currentPos = GetPartLocalPos(part);
2425 LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos, adjust);
2193 2426
2194 float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y);
2195 bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true);
2196 2427
2197 if (part.ParentGroup.RootPart == part) 2428 if (part.ParentGroup.RootPart == part)
2198 { 2429 {
2199 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
2200 targetPos.z = ground;
2201 SceneObjectGroup parent = part.ParentGroup; 2430 SceneObjectGroup parent = part.ParentGroup;
2202 parent.UpdateGroupPosition(!adjust ? targetPos : 2431 if (!World.Permissions.CanObjectEntry(parent.UUID, false, (Vector3)toPos))
2203 SetPosAdjust(currentPos, targetPos)); 2432 return;
2433 Util.FireAndForget(delegate(object x) {
2434 parent.UpdateGroupPosition((Vector3)toPos);
2435 });
2204 } 2436 }
2205 else 2437 else
2206 { 2438 {
2207 part.OffsetPosition = !adjust ? targetPos : 2439 part.OffsetPosition = (Vector3)toPos;
2208 SetPosAdjust(currentPos, targetPos); 2440// SceneObjectGroup parent = part.ParentGroup;
2209 SceneObjectGroup parent = part.ParentGroup; 2441// parent.HasGroupChanged = true;
2210 parent.HasGroupChanged = true; 2442// parent.ScheduleGroupForTerseUpdate();
2211 parent.ScheduleGroupForTerseUpdate(); 2443 part.ScheduleTerseUpdate();
2212 } 2444 }
2213 } 2445 }
2214 2446
@@ -2237,13 +2469,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2237 else 2469 else
2238 { 2470 {
2239 if (part.ParentGroup.IsAttachment) 2471 if (part.ParentGroup.IsAttachment)
2240 {
2241 pos = part.AttachedPos; 2472 pos = part.AttachedPos;
2242 }
2243 else 2473 else
2244 {
2245 pos = part.AbsolutePosition; 2474 pos = part.AbsolutePosition;
2246 }
2247 } 2475 }
2248 2476
2249// m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos); 2477// m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos);
@@ -2255,8 +2483,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2255 { 2483 {
2256 m_host.AddScriptLPS(1); 2484 m_host.AddScriptLPS(1);
2257 2485
2486
2487 // Teravus: if (m_host.ParentID == 0) is bug code because the ParentID for the Avatar will cause this to be nonzero for root prim attachments
2488 // which is then treated like a child prim rotation and it's offset gets cumulatively multiplied against.
2489 // to fix the scripted rotations we also have to check to see if the root part localid is the same as the host's localid.
2490 // RootPart != null should shortcircuit
2491
2258 // try to let this work as in SL... 2492 // try to let this work as in SL...
2259 if (m_host.ParentID == 0) 2493 if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart))
2260 { 2494 {
2261 // special case: If we are root, rotate complete SOG to new rotation 2495 // special case: If we are root, rotate complete SOG to new rotation
2262 SetRot(m_host, rot); 2496 SetRot(m_host, rot);
@@ -2283,25 +2517,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2283 2517
2284 protected void SetRot(SceneObjectPart part, Quaternion rot) 2518 protected void SetRot(SceneObjectPart part, Quaternion rot)
2285 { 2519 {
2286 part.UpdateRotation(rot); 2520 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2287 // Update rotation does not move the object in the physics scene if it's a linkset. 2521 return;
2288 2522
2289//KF: Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type 2523 bool isroot = (part == part.ParentGroup.RootPart);
2290// part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; 2524 bool isphys;
2291 2525
2292 // So, after thinking about this for a bit, the issue with the part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition line
2293 // is it isn't compatible with vehicles because it causes the vehicle body to have to be broken down and rebuilt
2294 // It's perfectly okay when the object is not an active physical body though.
2295 // So, part.ParentGroup.ResetChildPrimPhysicsPositions(); does the thing that Kitto is warning against
2296 // but only if the object is not physial and active. This is important for rotating doors.
2297 // without the absoluteposition = absoluteposition happening, the doors do not move in the physics
2298 // scene
2299 PhysicsActor pa = part.PhysActor; 2526 PhysicsActor pa = part.PhysActor;
2300 2527
2301 if (pa != null && !pa.IsPhysical) 2528 // keep using physactor ideia of isphysical
2529 // it should be SOP ideia of that
2530 // not much of a issue with ubitODE
2531 if (pa != null && pa.IsPhysical)
2532 isphys = true;
2533 else
2534 isphys = false;
2535
2536 // SL doesn't let scripts rotate root of physical linksets
2537 if (isroot && isphys)
2538 return;
2539
2540 part.UpdateRotation(rot);
2541
2542 // Update rotation does not move the object in the physics engine if it's a non physical linkset
2543 // so do a nasty update of parts positions if is a root part rotation
2544 if (isroot && pa != null) // with if above implies non physical root part
2302 { 2545 {
2303 part.ParentGroup.ResetChildPrimPhysicsPositions(); 2546 part.ParentGroup.ResetChildPrimPhysicsPositions();
2304 } 2547 }
2548 else // fix sitting avatars. This is only needed bc of how we link avas to child parts, not root part
2549 {
2550 List<ScenePresence> sittingavas = part.ParentGroup.GetLinkedAvatars();
2551 if (sittingavas.Count > 0)
2552 {
2553 foreach (ScenePresence av in sittingavas)
2554 {
2555 if (isroot || part.LocalId == av.ParentID)
2556 av.SendTerseUpdateToAllClients();
2557 }
2558 }
2559 }
2305 } 2560 }
2306 2561
2307 /// <summary> 2562 /// <summary>
@@ -2318,6 +2573,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2318 2573
2319 m_host.AddScriptLPS(1); 2574 m_host.AddScriptLPS(1);
2320 Quaternion q = m_host.GetWorldRotation(); 2575 Quaternion q = m_host.GetWorldRotation();
2576
2577 if (m_host.ParentGroup != null && m_host.ParentGroup.AttachmentPoint != 0)
2578 {
2579 ScenePresence avatar = World.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
2580 if (avatar != null)
2581 {
2582 if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
2583 q = avatar.CameraRotation * q; // Mouselook
2584 else
2585 q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
2586 }
2587 }
2588
2321 return new LSL_Rotation(q.X, q.Y, q.Z, q.W); 2589 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2322 } 2590 }
2323 2591
@@ -2345,14 +2613,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2345 return new LSL_Rotation(q); 2613 return new LSL_Rotation(q);
2346 } 2614 }
2347 2615
2348 return new LSL_Rotation(part.GetWorldRotation()); 2616 q = part.GetWorldRotation();
2617 if (part.ParentGroup.AttachmentPoint != 0)
2618 {
2619 ScenePresence avatar = World.GetScenePresence(part.ParentGroup.AttachedAvatar);
2620 if (avatar != null)
2621 {
2622 if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
2623 q = avatar.CameraRotation * q; // Mouselook
2624 else
2625 q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
2626 }
2627 }
2628
2629 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
2349 } 2630 }
2350 2631
2351 public LSL_Rotation llGetLocalRot() 2632 public LSL_Rotation llGetLocalRot()
2352 { 2633 {
2353 m_host.AddScriptLPS(1); 2634 return GetPartLocalRot(m_host);
2635 }
2354 2636
2355 return new LSL_Rotation(m_host.RotationOffset); 2637 private LSL_Rotation GetPartLocalRot(SceneObjectPart part)
2638 {
2639 m_host.AddScriptLPS(1);
2640 Quaternion rot = part.RotationOffset;
2641 return new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W);
2356 } 2642 }
2357 2643
2358 public void llSetForce(LSL_Vector force, int local) 2644 public void llSetForce(LSL_Vector force, int local)
@@ -2382,32 +2668,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2382 return force; 2668 return force;
2383 } 2669 }
2384 2670
2385 public void llSetVelocity(LSL_Vector velocity, int local)
2386 {
2387 m_host.AddScriptLPS(1);
2388
2389 if (!m_host.ParentGroup.IsDeleted)
2390 {
2391 if (local != 0)
2392 velocity *= llGetRot();
2393
2394 m_host.ParentGroup.RootPart.Velocity = velocity;
2395 }
2396 }
2397
2398 public void llSetAngularVelocity(LSL_Vector angularVelocity, int local)
2399 {
2400 m_host.AddScriptLPS(1);
2401
2402 if (!m_host.ParentGroup.IsDeleted)
2403 {
2404 if (local != 0)
2405 angularVelocity *= llGetRot();
2406
2407 m_host.ParentGroup.RootPart.AngularVelocity = angularVelocity;
2408 }
2409 }
2410
2411 public LSL_Integer llTarget(LSL_Vector position, double range) 2671 public LSL_Integer llTarget(LSL_Vector position, double range)
2412 { 2672 {
2413 m_host.AddScriptLPS(1); 2673 m_host.AddScriptLPS(1);
@@ -2458,16 +2718,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2458 m_host.ApplyImpulse(v, local != 0); 2718 m_host.ApplyImpulse(v, local != 0);
2459 } 2719 }
2460 2720
2721
2461 public void llApplyRotationalImpulse(LSL_Vector force, int local) 2722 public void llApplyRotationalImpulse(LSL_Vector force, int local)
2462 { 2723 {
2463 m_host.AddScriptLPS(1); 2724 m_host.AddScriptLPS(1);
2464 m_host.ApplyAngularImpulse(force, local != 0); 2725 m_host.ParentGroup.RootPart.ApplyAngularImpulse(force, local != 0);
2465 } 2726 }
2466 2727
2467 public void llSetTorque(LSL_Vector torque, int local) 2728 public void llSetTorque(LSL_Vector torque, int local)
2468 { 2729 {
2469 m_host.AddScriptLPS(1); 2730 m_host.AddScriptLPS(1);
2470 m_host.SetAngularImpulse(torque, local != 0); 2731 m_host.ParentGroup.RootPart.SetAngularImpulse(torque, local != 0);
2471 } 2732 }
2472 2733
2473 public LSL_Vector llGetTorque() 2734 public LSL_Vector llGetTorque()
@@ -2484,20 +2745,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2484 llSetTorque(torque, local); 2745 llSetTorque(torque, local);
2485 } 2746 }
2486 2747
2748 public void llSetVelocity(LSL_Vector vel, int local)
2749 {
2750 m_host.AddScriptLPS(1);
2751 m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0);
2752 }
2753
2487 public LSL_Vector llGetVel() 2754 public LSL_Vector llGetVel()
2488 { 2755 {
2489 m_host.AddScriptLPS(1); 2756 m_host.AddScriptLPS(1);
2490 2757
2491 Vector3 vel; 2758 Vector3 vel = Vector3.Zero;
2492 2759
2493 if (m_host.ParentGroup.IsAttachment) 2760 if (m_host.ParentGroup.IsAttachment)
2494 { 2761 {
2495 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar); 2762 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
2496 vel = avatar.Velocity; 2763 if (avatar != null)
2764 vel = avatar.Velocity;
2497 } 2765 }
2498 else 2766 else
2499 { 2767 {
2500 vel = m_host.Velocity; 2768 vel = m_host.ParentGroup.RootPart.Velocity;
2501 } 2769 }
2502 2770
2503 return new LSL_Vector(vel); 2771 return new LSL_Vector(vel);
@@ -2510,11 +2778,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2510 return new LSL_Vector(m_host.Acceleration); 2778 return new LSL_Vector(m_host.Acceleration);
2511 } 2779 }
2512 2780
2513 public LSL_Vector llGetOmega() 2781 public void llSetAngularVelocity(LSL_Vector avel, int local)
2514 { 2782 {
2515 m_host.AddScriptLPS(1); 2783 m_host.AddScriptLPS(1);
2784 m_host.SetAngularVelocity(new Vector3((float)avel.x, (float)avel.y, (float)avel.z), local != 0);
2785 }
2516 2786
2517 return new LSL_Vector(m_host.AngularVelocity); 2787 public LSL_Vector llGetOmega()
2788 {
2789 m_host.AddScriptLPS(1);
2790 Vector3 avel = m_host.AngularVelocity;
2791 return new LSL_Vector(avel.X, avel.Y, avel.Z);
2518 } 2792 }
2519 2793
2520 public LSL_Float llGetTimeOfDay() 2794 public LSL_Float llGetTimeOfDay()
@@ -2875,7 +3149,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2875 return src.ToLower(); 3149 return src.ToLower();
2876 } 3150 }
2877 3151
2878 public void llGiveMoney(string destination, int amount) 3152 public LSL_Integer llGiveMoney(string destination, int amount)
2879 { 3153 {
2880 Util.FireAndForget(x => 3154 Util.FireAndForget(x =>
2881 { 3155 {
@@ -2906,9 +3180,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2906 return; 3180 return;
2907 } 3181 }
2908 3182
3183 string reason;
2909 money.ObjectGiveMoney( 3184 money.ObjectGiveMoney(
2910 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); 3185 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero, out reason);
2911 }); 3186 });
3187
3188 return 0;
2912 } 3189 }
2913 3190
2914 public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) 3191 public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
@@ -3004,6 +3281,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3004 } 3281 }
3005 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) 3282 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
3006 } 3283 }
3284 return;
3007 }); 3285 });
3008 3286
3009 //ScriptSleep((int)((groupmass * velmag) / 10)); 3287 //ScriptSleep((int)((groupmass * velmag) / 10));
@@ -3018,35 +3296,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3018 public void llLookAt(LSL_Vector target, double strength, double damping) 3296 public void llLookAt(LSL_Vector target, double strength, double damping)
3019 { 3297 {
3020 m_host.AddScriptLPS(1); 3298 m_host.AddScriptLPS(1);
3021 // Determine where we are looking from
3022 LSL_Vector from = llGetPos();
3023
3024 // Work out the normalised vector from the source to the target
3025 LSL_Vector delta = llVecNorm(target - from);
3026 LSL_Vector angle = new LSL_Vector(0,0,0);
3027 3299
3028 // Calculate the yaw 3300 // Get the normalized vector to the target
3029 // subtracting PI_BY_TWO is required to compensate for the odd SL co-ordinate system 3301 LSL_Vector d1 = llVecNorm(target - llGetPos());
3030 angle.x = llAtan2(delta.z, delta.y) - ScriptBaseClass.PI_BY_TWO;
3031 3302
3032 // Calculate pitch 3303 // Get the bearing (yaw)
3033 angle.y = llAtan2(delta.x, llSqrt((delta.y * delta.y) + (delta.z * delta.z))); 3304 LSL_Vector a1 = new LSL_Vector(0,0,0);
3305 a1.z = llAtan2(d1.y, d1.x);
3034 3306
3035 // we need to convert from a vector describing 3307 // Get the elevation (pitch)
3036 // the angles of rotation in radians into rotation value 3308 LSL_Vector a2 = new LSL_Vector(0,0,0);
3037 LSL_Rotation rot = llEuler2Rot(angle); 3309 a2.y= -llAtan2(d1.z, llSqrt((d1.x * d1.x) + (d1.y * d1.y)));
3038 3310
3039 // Per discussion with Melanie, for non-physical objects llLookAt appears to simply 3311 LSL_Rotation r1 = llEuler2Rot(a1);
3040 // set the rotation of the object, copy that behavior 3312 LSL_Rotation r2 = llEuler2Rot(a2);
3041 PhysicsActor pa = m_host.PhysActor; 3313 LSL_Rotation r3 = new LSL_Rotation(0.000000, 0.707107, 0.000000, 0.707107);
3042 3314
3043 if (strength == 0 || pa == null || !pa.IsPhysical) 3315 if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
3044 { 3316 {
3045 llSetRot(rot); 3317 // Do nothing if either value is 0 (this has been checked in SL)
3318 if (strength <= 0.0 || damping <= 0.0)
3319 return;
3320
3321 llSetRot(r3 * r2 * r1);
3046 } 3322 }
3047 else 3323 else
3048 { 3324 {
3049 m_host.StartLookAt(rot, (float)strength, (float)damping); 3325 if (strength == 0)
3326 {
3327 llSetRot(r3 * r2 * r1);
3328 return;
3329 }
3330
3331 m_host.StartLookAt((Quaternion)(r3 * r2 * r1), (float)strength, (float)damping);
3050 } 3332 }
3051 } 3333 }
3052 3334
@@ -3093,17 +3375,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3093 } 3375 }
3094 else 3376 else
3095 { 3377 {
3096 if (m_host.IsRoot) 3378 // new SL always returns object mass
3097 { 3379// if (m_host.IsRoot)
3380// {
3098 return m_host.ParentGroup.GetMass(); 3381 return m_host.ParentGroup.GetMass();
3099 } 3382// }
3100 else 3383// else
3101 { 3384// {
3102 return m_host.GetMass(); 3385// return m_host.GetMass();
3103 } 3386// }
3104 } 3387 }
3105 } 3388 }
3106 3389
3390
3391 public LSL_Float llGetMassMKS()
3392 {
3393 return 100f * llGetMass();
3394 }
3395
3107 public void llCollisionFilter(string name, string id, int accept) 3396 public void llCollisionFilter(string name, string id, int accept)
3108 { 3397 {
3109 m_host.AddScriptLPS(1); 3398 m_host.AddScriptLPS(1);
@@ -3151,8 +3440,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3151 { 3440 {
3152 // Unregister controls from Presence 3441 // Unregister controls from Presence
3153 presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID); 3442 presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID);
3154 // Remove Take Control permission.
3155 m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
3156 } 3443 }
3157 } 3444 }
3158 } 3445 }
@@ -3180,7 +3467,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3180 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; 3467 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
3181 3468
3182 if (attachmentsModule != null) 3469 if (attachmentsModule != null)
3183 return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, true); 3470 return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, false, true);
3184 else 3471 else
3185 return false; 3472 return false;
3186 } 3473 }
@@ -3210,9 +3497,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3210 { 3497 {
3211 m_host.AddScriptLPS(1); 3498 m_host.AddScriptLPS(1);
3212 3499
3213// if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
3214// return;
3215
3216 if (m_item.PermsGranter != m_host.OwnerID) 3500 if (m_item.PermsGranter != m_host.OwnerID)
3217 return; 3501 return;
3218 3502
@@ -3255,6 +3539,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3255 3539
3256 public void llInstantMessage(string user, string message) 3540 public void llInstantMessage(string user, string message)
3257 { 3541 {
3542 UUID result;
3543 if (!UUID.TryParse(user, out result) || result == UUID.Zero)
3544 {
3545 ShoutError("An invalid key was passed to llInstantMessage");
3546 ScriptSleep(2000);
3547 return;
3548 }
3549
3550
3258 m_host.AddScriptLPS(1); 3551 m_host.AddScriptLPS(1);
3259 3552
3260 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3553 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -3269,14 +3562,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3269 UUID friendTransactionID = UUID.Random(); 3562 UUID friendTransactionID = UUID.Random();
3270 3563
3271 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3564 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3272 3565
3273 GridInstantMessage msg = new GridInstantMessage(); 3566 GridInstantMessage msg = new GridInstantMessage();
3274 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3567 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
3275 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3568 msg.toAgentID = new Guid(user); // toAgentID.Guid;
3276 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 3569 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
3277// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 3570// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
3278// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 3571// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
3279 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 3572// DateTime dt = DateTime.UtcNow;
3573//
3574// // Ticks from UtcNow, but make it look like local. Evil, huh?
3575// dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
3576//
3577// try
3578// {
3579// // Convert that to the PST timezone
3580// TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
3581// dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
3582// }
3583// catch
3584// {
3585// // No logging here, as it could be VERY spammy
3586// }
3587//
3588// // And make it look local again to fool the unix time util
3589// dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
3590
3591 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
3592
3280 //if (client != null) 3593 //if (client != null)
3281 //{ 3594 //{
3282 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; 3595 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3290,10 +3603,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3290 msg.message = message.Substring(0, 1024); 3603 msg.message = message.Substring(0, 1024);
3291 else 3604 else
3292 msg.message = message; 3605 msg.message = message;
3293 msg.dialog = (byte)19; // messgage from script ??? // dialog; 3606 msg.dialog = (byte)19; // MessageFromObject
3294 msg.fromGroup = false;// fromGroup; 3607 msg.fromGroup = false;// fromGroup;
3295 msg.offline = (byte)0; //offline; 3608 msg.offline = (byte)0; //offline;
3296 msg.ParentEstateID = 0; //ParentEstateID; 3609 msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
3297 msg.Position = new Vector3(m_host.AbsolutePosition); 3610 msg.Position = new Vector3(m_host.AbsolutePosition);
3298 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3611 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
3299 3612
@@ -3571,7 +3884,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3571 implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 3884 implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
3572 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 3885 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
3573 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 3886 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
3887 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
3574 ScriptBaseClass.PERMISSION_ATTACH; 3888 ScriptBaseClass.PERMISSION_ATTACH;
3889
3575 } 3890 }
3576 else 3891 else
3577 { 3892 {
@@ -3588,15 +3903,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3588 if (World.GetExtraSetting("auto_grant_attach_perms") == "true") 3903 if (World.GetExtraSetting("auto_grant_attach_perms") == "true")
3589 implicitPerms = ScriptBaseClass.PERMISSION_ATTACH; 3904 implicitPerms = ScriptBaseClass.PERMISSION_ATTACH;
3590 } 3905 }
3906 if (World.GetExtraSetting("auto_grant_all_perms") == "true")
3907 {
3908 implicitPerms = perm;
3909 }
3591 } 3910 }
3592 3911
3593 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3912 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3594 { 3913 {
3595 lock (m_host.TaskInventory) 3914 m_host.TaskInventory.LockItemsForWrite(true);
3596 { 3915 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
3597 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; 3916 m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
3598 m_host.TaskInventory[m_item.ItemID].PermsMask = perm; 3917 m_host.TaskInventory.LockItemsForWrite(false);
3599 }
3600 3918
3601 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( 3919 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
3602 "run_time_permissions", new Object[] { 3920 "run_time_permissions", new Object[] {
@@ -3639,11 +3957,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3639 3957
3640 if (!m_waitingForScriptAnswer) 3958 if (!m_waitingForScriptAnswer)
3641 { 3959 {
3642 lock (m_host.TaskInventory) 3960 m_host.TaskInventory.LockItemsForWrite(true);
3643 { 3961 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
3644 m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; 3962 m_host.TaskInventory[m_item.ItemID].PermsMask = 0;
3645 m_host.TaskInventory[m_item.ItemID].PermsMask = 0; 3963 m_host.TaskInventory.LockItemsForWrite(false);
3646 }
3647 3964
3648 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3965 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3649 m_waitingForScriptAnswer=true; 3966 m_waitingForScriptAnswer=true;
@@ -3672,14 +3989,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3672 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3989 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3673 llReleaseControls(); 3990 llReleaseControls();
3674 3991
3675 lock (m_host.TaskInventory) 3992 m_host.TaskInventory.LockItemsForWrite(true);
3676 { 3993 m_host.TaskInventory[m_item.ItemID].PermsMask = answer;
3677 m_host.TaskInventory[m_item.ItemID].PermsMask = answer; 3994 m_host.TaskInventory.LockItemsForWrite(false);
3678 } 3995
3679 3996 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
3680 m_ScriptEngine.PostScriptEvent( 3997 "run_time_permissions", new Object[] {
3681 m_item.ItemID, 3998 new LSL_Integer(answer) },
3682 new EventParams("run_time_permissions", new Object[] { new LSL_Integer(answer) }, new DetectParams[0])); 3999 new DetectParams[0]));
3683 } 4000 }
3684 4001
3685 public LSL_String llGetPermissionsKey() 4002 public LSL_String llGetPermissionsKey()
@@ -3718,14 +4035,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3718 public void llSetLinkColor(int linknumber, LSL_Vector color, int face) 4035 public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
3719 { 4036 {
3720 List<SceneObjectPart> parts = GetLinkParts(linknumber); 4037 List<SceneObjectPart> parts = GetLinkParts(linknumber);
3721 4038 if (parts.Count > 0)
3722 foreach (SceneObjectPart part in parts) 4039 {
3723 part.SetFaceColorAlpha(face, color, null); 4040 try
4041 {
4042 foreach (SceneObjectPart part in parts)
4043 part.SetFaceColorAlpha(face, color, null);
4044 }
4045 finally
4046 {
4047 }
4048 }
3724 } 4049 }
3725 4050
3726 public void llCreateLink(string target, int parent) 4051 public void llCreateLink(string target, int parent)
3727 { 4052 {
3728 m_host.AddScriptLPS(1); 4053 m_host.AddScriptLPS(1);
4054
3729 UUID targetID; 4055 UUID targetID;
3730 4056
3731 if (!UUID.TryParse(target, out targetID)) 4057 if (!UUID.TryParse(target, out targetID))
@@ -3831,10 +4157,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3831 // Restructuring Multiple Prims. 4157 // Restructuring Multiple Prims.
3832 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); 4158 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
3833 parts.Remove(parentPrim.RootPart); 4159 parts.Remove(parentPrim.RootPart);
3834 foreach (SceneObjectPart part in parts) 4160 if (parts.Count > 0)
3835 { 4161 {
3836 parentPrim.DelinkFromGroup(part.LocalId, true); 4162 try
4163 {
4164 foreach (SceneObjectPart part in parts)
4165 {
4166 parentPrim.DelinkFromGroup(part.LocalId, true);
4167 }
4168 }
4169 finally
4170 {
4171 }
3837 } 4172 }
4173
3838 parentPrim.HasGroupChanged = true; 4174 parentPrim.HasGroupChanged = true;
3839 parentPrim.ScheduleGroupForFullUpdate(); 4175 parentPrim.ScheduleGroupForFullUpdate();
3840 parentPrim.TriggerScriptChangedEvent(Changed.LINK); 4176 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3843,12 +4179,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3843 { 4179 {
3844 SceneObjectPart newRoot = parts[0]; 4180 SceneObjectPart newRoot = parts[0];
3845 parts.Remove(newRoot); 4181 parts.Remove(newRoot);
3846 foreach (SceneObjectPart part in parts) 4182
4183 try
3847 { 4184 {
3848 // Required for linking 4185 foreach (SceneObjectPart part in parts)
3849 part.ClearUpdateSchedule(); 4186 {
3850 newRoot.ParentGroup.LinkToGroup(part.ParentGroup); 4187 part.ClearUpdateSchedule();
4188 newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
4189 }
3851 } 4190 }
4191 finally
4192 {
4193 }
4194
4195
3852 newRoot.ParentGroup.HasGroupChanged = true; 4196 newRoot.ParentGroup.HasGroupChanged = true;
3853 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 4197 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
3854 } 4198 }
@@ -3868,6 +4212,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3868 public void llBreakAllLinks() 4212 public void llBreakAllLinks()
3869 { 4213 {
3870 m_host.AddScriptLPS(1); 4214 m_host.AddScriptLPS(1);
4215
4216 TaskInventoryItem item = m_item;
4217
4218 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
4219 && !m_automaticLinkPermission)
4220 {
4221 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
4222 return;
4223 }
4224
3871 SceneObjectGroup parentPrim = m_host.ParentGroup; 4225 SceneObjectGroup parentPrim = m_host.ParentGroup;
3872 if (parentPrim.AttachmentPoint != 0) 4226 if (parentPrim.AttachmentPoint != 0)
3873 return; // Fail silently if attached 4227 return; // Fail silently if attached
@@ -3887,13 +4241,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3887 public LSL_String llGetLinkKey(int linknum) 4241 public LSL_String llGetLinkKey(int linknum)
3888 { 4242 {
3889 m_host.AddScriptLPS(1); 4243 m_host.AddScriptLPS(1);
4244 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
4245 if (part != null)
4246 {
4247 return part.UUID.ToString();
4248 }
4249 else
4250 {
4251 if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1))
4252 {
4253 linknum -= (m_host.ParentGroup.PrimCount) + 1;
3890 4254
3891 ISceneEntity entity = GetLinkEntity(linknum); 4255 if (linknum < 0)
4256 return UUID.Zero.ToString();
3892 4257
3893 if (entity != null) 4258 List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
3894 return entity.UUID.ToString(); 4259 if (avatars.Count > linknum)
3895 else 4260 {
3896 return ScriptBaseClass.NULL_KEY; 4261 return avatars[linknum].UUID.ToString();
4262 }
4263 }
4264 return UUID.Zero.ToString();
4265 }
3897 } 4266 }
3898 4267
3899 /// <summary> 4268 /// <summary>
@@ -3952,17 +4321,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3952 m_host.AddScriptLPS(1); 4321 m_host.AddScriptLPS(1);
3953 int count = 0; 4322 int count = 0;
3954 4323
3955 lock (m_host.TaskInventory) 4324 m_host.TaskInventory.LockItemsForRead(true);
4325 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3956 { 4326 {
3957 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4327 if (inv.Value.Type == type || type == -1)
3958 { 4328 {
3959 if (inv.Value.Type == type || type == -1) 4329 count = count + 1;
3960 {
3961 count = count + 1;
3962 }
3963 } 4330 }
3964 } 4331 }
3965 4332
4333 m_host.TaskInventory.LockItemsForRead(false);
3966 return count; 4334 return count;
3967 } 4335 }
3968 4336
@@ -3971,16 +4339,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3971 m_host.AddScriptLPS(1); 4339 m_host.AddScriptLPS(1);
3972 ArrayList keys = new ArrayList(); 4340 ArrayList keys = new ArrayList();
3973 4341
3974 lock (m_host.TaskInventory) 4342 m_host.TaskInventory.LockItemsForRead(true);
4343 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3975 { 4344 {
3976 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4345 if (inv.Value.Type == type || type == -1)
3977 { 4346 {
3978 if (inv.Value.Type == type || type == -1) 4347 keys.Add(inv.Value.Name);
3979 {
3980 keys.Add(inv.Value.Name);
3981 }
3982 } 4348 }
3983 } 4349 }
4350 m_host.TaskInventory.LockItemsForRead(false);
3984 4351
3985 if (keys.Count == 0) 4352 if (keys.Count == 0)
3986 { 4353 {
@@ -4018,7 +4385,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4018 if (item == null) 4385 if (item == null)
4019 { 4386 {
4020 llSay(0, String.Format("Could not find object '{0}'", inventory)); 4387 llSay(0, String.Format("Could not find object '{0}'", inventory));
4021 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4388 return;
4389// throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
4022 } 4390 }
4023 4391
4024 UUID objId = item.ItemID; 4392 UUID objId = item.ItemID;
@@ -4046,33 +4414,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4046 return; 4414 return;
4047 } 4415 }
4048 } 4416 }
4417
4049 // destination is an avatar 4418 // destination is an avatar
4050 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); 4419 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
4051 4420
4052 if (agentItem == null) 4421 if (agentItem == null)
4053 return; 4422 return;
4054 4423
4055 if (m_TransferModule != null) 4424 byte[] bucket = new byte[1];
4056 { 4425 bucket[0] = (byte)item.Type;
4057 byte[] bucket = new byte[1]; 4426 //byte[] objBytes = agentItem.ID.GetBytes();
4058 bucket[0] = (byte)item.Type; 4427 //Array.Copy(objBytes, 0, bucket, 1, 16);
4059 4428
4060 GridInstantMessage msg = new GridInstantMessage(World, 4429 GridInstantMessage msg = new GridInstantMessage(World,
4061 m_host.OwnerID, m_host.Name, destId, 4430 m_host.OwnerID, m_host.Name, destId,
4062 (byte)InstantMessageDialog.TaskInventoryOffered, 4431 (byte)InstantMessageDialog.TaskInventoryOffered,
4063 false, item.Name+". "+m_host.Name+" is located at "+ 4432 false, item.Name+". "+m_host.Name+" is located at "+
4064 World.RegionInfo.RegionName+" "+ 4433 World.RegionInfo.RegionName+" "+
4065 m_host.AbsolutePosition.ToString(), 4434 m_host.AbsolutePosition.ToString(),
4066 agentItem.ID, true, m_host.AbsolutePosition, 4435 agentItem.ID, true, m_host.AbsolutePosition,
4067 bucket, true); 4436 bucket, true);
4068 4437
4069 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4438 ScenePresence sp;
4070 }
4071 4439
4440 if (World.TryGetScenePresence(destId, out sp))
4441 {
4442 sp.ControllingClient.SendInstantMessage(msg);
4443 }
4444 else
4445 {
4446 if (m_TransferModule != null)
4447 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4448 }
4449
4450 //This delay should only occur when giving inventory to avatars.
4072 ScriptSleep(3000); 4451 ScriptSleep(3000);
4073 } 4452 }
4074 } 4453 }
4075 4454
4455 [DebuggerNonUserCode]
4076 public void llRemoveInventory(string name) 4456 public void llRemoveInventory(string name)
4077 { 4457 {
4078 m_host.AddScriptLPS(1); 4458 m_host.AddScriptLPS(1);
@@ -4127,109 +4507,115 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4127 { 4507 {
4128 m_host.AddScriptLPS(1); 4508 m_host.AddScriptLPS(1);
4129 4509
4130 UUID uuid = (UUID)id; 4510 UUID uuid;
4131 PresenceInfo pinfo = null; 4511 if (UUID.TryParse(id, out uuid))
4132 UserAccount account;
4133
4134 UserInfoCacheEntry ce;
4135 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4136 { 4512 {
4137 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); 4513 PresenceInfo pinfo = null;
4138 if (account == null) 4514 UserAccount account;
4515
4516 UserInfoCacheEntry ce;
4517 if (!m_userInfoCache.TryGetValue(uuid, out ce))
4139 { 4518 {
4140 m_userInfoCache[uuid] = null; // Cache negative 4519 account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
4141 return UUID.Zero.ToString(); 4520 if (account == null)
4142 } 4521 {
4522 m_userInfoCache[uuid] = null; // Cache negative
4523 return UUID.Zero.ToString();
4524 }
4143 4525
4144 4526
4145 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); 4527 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4146 if (pinfos != null && pinfos.Length > 0) 4528 if (pinfos != null && pinfos.Length > 0)
4147 {
4148 foreach (PresenceInfo p in pinfos)
4149 { 4529 {
4150 if (p.RegionID != UUID.Zero) 4530 foreach (PresenceInfo p in pinfos)
4151 { 4531 {
4152 pinfo = p; 4532 if (p.RegionID != UUID.Zero)
4533 {
4534 pinfo = p;
4535 }
4153 } 4536 }
4154 } 4537 }
4155 }
4156 4538
4157 ce = new UserInfoCacheEntry(); 4539 ce = new UserInfoCacheEntry();
4158 ce.time = Util.EnvironmentTickCount(); 4540 ce.time = Util.EnvironmentTickCount();
4159 ce.account = account; 4541 ce.account = account;
4160 ce.pinfo = pinfo; 4542 ce.pinfo = pinfo;
4161 } 4543 m_userInfoCache[uuid] = ce;
4162 else 4544 }
4163 { 4545 else
4164 if (ce == null) 4546 {
4165 return UUID.Zero.ToString(); 4547 if (ce == null)
4548 return UUID.Zero.ToString();
4166 4549
4167 account = ce.account; 4550 account = ce.account;
4168 pinfo = ce.pinfo; 4551 pinfo = ce.pinfo;
4169 } 4552 }
4170 4553
4171 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) 4554 if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
4172 {
4173 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4174 if (pinfos != null && pinfos.Length > 0)
4175 { 4555 {
4176 foreach (PresenceInfo p in pinfos) 4556 PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
4557 if (pinfos != null && pinfos.Length > 0)
4177 { 4558 {
4178 if (p.RegionID != UUID.Zero) 4559 foreach (PresenceInfo p in pinfos)
4179 { 4560 {
4180 pinfo = p; 4561 if (p.RegionID != UUID.Zero)
4562 {
4563 pinfo = p;
4564 }
4181 } 4565 }
4182 } 4566 }
4183 } 4567 else
4184 else 4568 pinfo = null;
4185 pinfo = null;
4186 4569
4187 ce.time = Util.EnvironmentTickCount(); 4570 ce.time = Util.EnvironmentTickCount();
4188 ce.pinfo = pinfo; 4571 ce.pinfo = pinfo;
4189 } 4572 }
4190 4573
4191 string reply = String.Empty; 4574 string reply = String.Empty;
4192 4575
4193 switch (data) 4576 switch (data)
4194 { 4577 {
4195 case 1: // DATA_ONLINE (0|1) 4578 case 1: // DATA_ONLINE (0|1)
4196 if (pinfo != null && pinfo.RegionID != UUID.Zero) 4579 if (pinfo != null && pinfo.RegionID != UUID.Zero)
4197 reply = "1"; 4580 reply = "1";
4198 else 4581 else
4199 reply = "0"; 4582 reply = "0";
4200 break; 4583 break;
4201 case 2: // DATA_NAME (First Last) 4584 case 2: // DATA_NAME (First Last)
4202 reply = account.FirstName + " " + account.LastName; 4585 reply = account.FirstName + " " + account.LastName;
4203 break; 4586 break;
4204 case 3: // DATA_BORN (YYYY-MM-DD) 4587 case 3: // DATA_BORN (YYYY-MM-DD)
4205 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); 4588 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
4206 born = born.AddSeconds(account.Created); 4589 born = born.AddSeconds(account.Created);
4207 reply = born.ToString("yyyy-MM-dd"); 4590 reply = born.ToString("yyyy-MM-dd");
4208 break; 4591 break;
4209 case 4: // DATA_RATING (0,0,0,0,0,0) 4592 case 4: // DATA_RATING (0,0,0,0,0,0)
4210 reply = "0,0,0,0,0,0"; 4593 reply = "0,0,0,0,0,0";
4211 break; 4594 break;
4212 case 7: // DATA_USERLEVEL (integer) 4595 case 8: // DATA_PAYINFO (0|1|2|3)
4213 reply = account.UserLevel.ToString(); 4596 reply = "0";
4214 break; 4597 break;
4215 case 8: // DATA_PAYINFO (0|1|2|3) 4598 default:
4216 reply = "0"; 4599 return UUID.Zero.ToString(); // Raise no event
4217 break; 4600 }
4218 default:
4219 return UUID.Zero.ToString(); // Raise no event
4220 }
4221 4601
4222 UUID rq = UUID.Random(); 4602 UUID rq = UUID.Random();
4223 4603
4224 UUID tid = AsyncCommands. 4604 UUID tid = AsyncCommands.
4225 DataserverPlugin.RegisterRequest(m_host.LocalId, 4605 DataserverPlugin.RegisterRequest(m_host.LocalId,
4226 m_item.ItemID, rq.ToString()); 4606 m_item.ItemID, rq.ToString());
4227 4607
4228 AsyncCommands. 4608 AsyncCommands.
4229 DataserverPlugin.DataserverReply(rq.ToString(), reply); 4609 DataserverPlugin.DataserverReply(rq.ToString(), reply);
4230 4610
4231 ScriptSleep(100); 4611 ScriptSleep(100);
4232 return tid.ToString(); 4612 return tid.ToString();
4613 }
4614 else
4615 {
4616 ShoutError("Invalid UUID passed to llRequestAgentData.");
4617 }
4618 return "";
4233 } 4619 }
4234 4620
4235 public LSL_String llRequestInventoryData(string name) 4621 public LSL_String llRequestInventoryData(string name)
@@ -4286,12 +4672,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4286 if (UUID.TryParse(agent, out agentId)) 4672 if (UUID.TryParse(agent, out agentId))
4287 { 4673 {
4288 ScenePresence presence = World.GetScenePresence(agentId); 4674 ScenePresence presence = World.GetScenePresence(agentId);
4289 if (presence != null) 4675 if (presence != null && presence.PresenceType != PresenceType.Npc)
4290 { 4676 {
4677 // agent must not be a god
4678 if (presence.UserLevel >= 200) return;
4679
4291 // agent must be over the owners land 4680 // agent must be over the owners land
4292 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID) 4681 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID)
4293 { 4682 {
4294 World.TeleportClientHome(agentId, presence.ControllingClient); 4683 if (!World.TeleportClientHome(agentId, presence.ControllingClient))
4684 {
4685 // They can't be teleported home for some reason
4686 GridRegion regionInfo = World.GridService.GetRegionByUUID(UUID.Zero, new UUID("2b02daac-e298-42fa-9a75-f488d37896e6"));
4687 if (regionInfo != null)
4688 {
4689 World.RequestTeleportLocation(
4690 presence.ControllingClient, regionInfo.RegionHandle, new Vector3(128, 128, 23), Vector3.Zero,
4691 (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
4692 }
4693 }
4295 } 4694 }
4296 } 4695 }
4297 } 4696 }
@@ -4309,20 +4708,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4309 ScenePresence presence = World.GetScenePresence(agentId); 4708 ScenePresence presence = World.GetScenePresence(agentId);
4310 if (presence != null && presence.PresenceType != PresenceType.Npc) 4709 if (presence != null && presence.PresenceType != PresenceType.Npc)
4311 { 4710 {
4312 // agent must not be a god
4313 if (presence.GodLevel >= 200) return;
4314
4315 if (destination == String.Empty) 4711 if (destination == String.Empty)
4316 destination = World.RegionInfo.RegionName; 4712 destination = World.RegionInfo.RegionName;
4317 4713
4318 // agent must be over the owners land 4714 if (m_item.PermsGranter == agentId)
4319 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID) 4715 {
4716 if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TELEPORT) != 0)
4717 {
4718 DoLLTeleport(presence, destination, targetPos, targetLookAt);
4719 }
4720 }
4721
4722 // agent must be wearing the object
4723 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.OwnerID == presence.UUID)
4320 { 4724 {
4321 DoLLTeleport(presence, destination, targetPos, targetLookAt); 4725 DoLLTeleport(presence, destination, targetPos, targetLookAt);
4322 } 4726 }
4323 else // or must be wearing the prim 4727 else
4324 { 4728 {
4325 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.OwnerID == presence.UUID) 4729 // agent must not be a god
4730 if (presence.GodLevel >= 200) return;
4731
4732 // agent must be over the owners land
4733 ILandObject agentLand = World.LandChannel.GetLandObject(presence.AbsolutePosition);
4734 ILandObject objectLand = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
4735 if (m_host.OwnerID == objectLand.LandData.OwnerID && m_host.OwnerID == agentLand.LandData.OwnerID)
4326 { 4736 {
4327 DoLLTeleport(presence, destination, targetPos, targetLookAt); 4737 DoLLTeleport(presence, destination, targetPos, targetLookAt);
4328 } 4738 }
@@ -4336,24 +4746,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4336 m_host.AddScriptLPS(1); 4746 m_host.AddScriptLPS(1);
4337 UUID agentId = new UUID(); 4747 UUID agentId = new UUID();
4338 4748
4339 ulong regionHandle = Utils.UIntsToLong((uint)global_coords.x, (uint)global_coords.y); 4749 ulong regionHandle = Utils.UIntsToLong((uint)(global_coords.x / 256) * 256, (uint)(global_coords.y / 256) * 256);
4340 4750
4341 if (UUID.TryParse(agent, out agentId)) 4751 if (UUID.TryParse(agent, out agentId))
4342 { 4752 {
4753 // This function is owner only!
4754 if (m_host.OwnerID != agentId)
4755 return;
4756
4343 ScenePresence presence = World.GetScenePresence(agentId); 4757 ScenePresence presence = World.GetScenePresence(agentId);
4758
4759 // Can't TP sitting avatars
4760 if (presence.ParentID != 0) // Sitting
4761 return;
4762
4344 if (presence != null && presence.PresenceType != PresenceType.Npc) 4763 if (presence != null && presence.PresenceType != PresenceType.Npc)
4345 { 4764 {
4346 // agent must not be a god 4765 if (m_item.PermsGranter == agentId)
4347 if (presence.GodLevel >= 200) return;
4348
4349 // agent must be over the owners land
4350 if (m_host.OwnerID == World.LandChannel.GetLandObject(presence.AbsolutePosition).LandData.OwnerID)
4351 { 4766 {
4352 World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation); 4767 // If attached using llAttachToAvatarTemp, cowardly refuse
4353 } 4768 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.ParentGroup.FromItemID == UUID.Zero)
4354 else // or must be wearing the prim 4769 return;
4355 { 4770
4356 if (m_host.ParentGroup.AttachmentPoint != 0 && m_host.OwnerID == presence.UUID) 4771 if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TELEPORT) != 0)
4357 { 4772 {
4358 World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation); 4773 World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation);
4359 } 4774 }
@@ -4430,9 +4845,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4430 { 4845 {
4431 m_host.AddScriptLPS(1); 4846 m_host.AddScriptLPS(1);
4432 4847
4848 if(impact_sound == "")
4849 {
4850 m_host.CollisionSoundVolume = (float)impact_volume;
4851 m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
4852 m_host.CollisionSoundType = 0;
4853 return;
4854 }
4433 // TODO: Parameter check logic required. 4855 // TODO: Parameter check logic required.
4434 m_host.CollisionSound = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound); 4856 m_host.CollisionSound = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound);
4435 m_host.CollisionSoundVolume = (float)impact_volume; 4857 m_host.CollisionSoundVolume = (float)impact_volume;
4858 m_host.CollisionSoundType = 1;
4436 } 4859 }
4437 4860
4438 public LSL_String llGetAnimation(string id) 4861 public LSL_String llGetAnimation(string id)
@@ -4446,14 +4869,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4446 4869
4447 if (m_host.RegionHandle == presence.RegionHandle) 4870 if (m_host.RegionHandle == presence.RegionHandle)
4448 { 4871 {
4449 Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames;
4450
4451 if (presence != null) 4872 if (presence != null)
4452 { 4873 {
4453 AnimationSet currentAnims = presence.Animator.Animations; 4874 if (presence.SitGround)
4454 string currentAnimationState = String.Empty; 4875 return "Sitting on Ground";
4455 if (animationstateNames.TryGetValue(currentAnims.ImplicitDefaultAnimation.AnimID, out currentAnimationState)) 4876 if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero)
4456 return currentAnimationState; 4877 return "Sitting";
4878
4879 string movementAnimation = presence.Animator.CurrentMovementAnimation;
4880 string lslMovementAnimation;
4881
4882 if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation))
4883 return lslMovementAnimation;
4457 } 4884 }
4458 } 4885 }
4459 4886
@@ -4601,7 +5028,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4601 { 5028 {
4602 float distance = (PusheePos - m_host.AbsolutePosition).Length(); 5029 float distance = (PusheePos - m_host.AbsolutePosition).Length();
4603 float distance_term = distance * distance * distance; // Script Energy 5030 float distance_term = distance * distance * distance; // Script Energy
4604 float pusher_mass = m_host.GetMass(); 5031 // use total object mass and not part
5032 float pusher_mass = m_host.ParentGroup.GetMass();
4605 5033
4606 float PUSH_ATTENUATION_DISTANCE = 17f; 5034 float PUSH_ATTENUATION_DISTANCE = 17f;
4607 float PUSH_ATTENUATION_SCALE = 5f; 5035 float PUSH_ATTENUATION_SCALE = 5f;
@@ -4838,6 +5266,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4838 { 5266 {
4839 return item.AssetID.ToString(); 5267 return item.AssetID.ToString();
4840 } 5268 }
5269 m_host.TaskInventory.LockItemsForRead(false);
4841 5270
4842 return UUID.Zero.ToString(); 5271 return UUID.Zero.ToString();
4843 } 5272 }
@@ -4990,14 +5419,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4990 { 5419 {
4991 m_host.AddScriptLPS(1); 5420 m_host.AddScriptLPS(1);
4992 5421
4993 if (src == null) 5422 return src.Length;
4994 {
4995 return 0;
4996 }
4997 else
4998 {
4999 return src.Length;
5000 }
5001 } 5423 }
5002 5424
5003 public LSL_Integer llList2Integer(LSL_List src, int index) 5425 public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -5068,7 +5490,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5068 else if (src.Data[index] is LSL_Float) 5490 else if (src.Data[index] is LSL_Float)
5069 return Convert.ToDouble(((LSL_Float)src.Data[index]).value); 5491 return Convert.ToDouble(((LSL_Float)src.Data[index]).value);
5070 else if (src.Data[index] is LSL_String) 5492 else if (src.Data[index] is LSL_String)
5071 return Convert.ToDouble(((LSL_String)src.Data[index]).m_string); 5493 {
5494 string str = ((LSL_String) src.Data[index]).m_string;
5495 Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)");
5496 if (m != Match.Empty)
5497 {
5498 str = m.Value;
5499 double d = 0.0;
5500 if (!Double.TryParse(str, out d))
5501 return 0.0;
5502
5503 return d;
5504 }
5505 return 0.0;
5506 }
5072 return Convert.ToDouble(src.Data[index]); 5507 return Convert.ToDouble(src.Data[index]);
5073 } 5508 }
5074 catch (FormatException) 5509 catch (FormatException)
@@ -5110,7 +5545,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5110 // for completion and should LSL_Key ever be implemented 5545 // for completion and should LSL_Key ever be implemented
5111 // as it's own struct 5546 // as it's own struct
5112 else if (!(src.Data[index] is LSL_String || 5547 else if (!(src.Data[index] is LSL_String ||
5113 src.Data[index] is LSL_Key)) 5548 src.Data[index] is LSL_Key ||
5549 src.Data[index] is String))
5114 { 5550 {
5115 return ""; 5551 return "";
5116 } 5552 }
@@ -5368,7 +5804,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5368 } 5804 }
5369 } 5805 }
5370 } 5806 }
5371 else { 5807 else
5808 {
5372 object[] array = new object[src.Length]; 5809 object[] array = new object[src.Length];
5373 Array.Copy(src.Data, 0, array, 0, src.Length); 5810 Array.Copy(src.Data, 0, array, 0, src.Length);
5374 result = new LSL_List(array); 5811 result = new LSL_List(array);
@@ -5475,7 +5912,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5475 public LSL_Integer llGetRegionAgentCount() 5912 public LSL_Integer llGetRegionAgentCount()
5476 { 5913 {
5477 m_host.AddScriptLPS(1); 5914 m_host.AddScriptLPS(1);
5478 return new LSL_Integer(World.GetRootAgentCount()); 5915
5916 int count = 0;
5917 World.ForEachRootScenePresence(delegate(ScenePresence sp) {
5918 count++;
5919 });
5920
5921 return new LSL_Integer(count);
5479 } 5922 }
5480 5923
5481 public LSL_Vector llGetRegionCorner() 5924 public LSL_Vector llGetRegionCorner()
@@ -5716,6 +6159,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5716 flags |= ScriptBaseClass.AGENT_AWAY; 6159 flags |= ScriptBaseClass.AGENT_AWAY;
5717 } 6160 }
5718 6161
6162 UUID busy = new UUID("efcf670c-2d18-8128-973a-034ebc806b67");
6163 UUID[] anims = agent.Animator.GetAnimationArray();
6164 if (Array.Exists<UUID>(anims, a => { return a == busy; }))
6165 {
6166 flags |= ScriptBaseClass.AGENT_BUSY;
6167 }
6168
5719 // seems to get unset, even if in mouselook, when avatar is sitting on a prim??? 6169 // seems to get unset, even if in mouselook, when avatar is sitting on a prim???
5720 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0) 6170 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
5721 { 6171 {
@@ -5763,6 +6213,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5763 flags |= ScriptBaseClass.AGENT_SITTING; 6213 flags |= ScriptBaseClass.AGENT_SITTING;
5764 } 6214 }
5765 6215
6216 if (agent.Appearance.VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MALE] > 0)
6217 {
6218 flags |= ScriptBaseClass.AGENT_MALE;
6219 }
6220
5766 return flags; 6221 return flags;
5767 } 6222 }
5768 6223
@@ -5908,9 +6363,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5908 6363
5909 List<SceneObjectPart> parts = GetLinkParts(linknumber); 6364 List<SceneObjectPart> parts = GetLinkParts(linknumber);
5910 6365
5911 foreach (SceneObjectPart part in parts) 6366 try
6367 {
6368 foreach (SceneObjectPart part in parts)
6369 {
6370 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
6371 }
6372 }
6373 finally
5912 { 6374 {
5913 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
5914 } 6375 }
5915 } 6376 }
5916 6377
@@ -5964,13 +6425,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5964 6425
5965 if (m_host.OwnerID == land.LandData.OwnerID) 6426 if (m_host.OwnerID == land.LandData.OwnerID)
5966 { 6427 {
5967 World.TeleportClientHome(agentID, presence.ControllingClient); 6428 Vector3 p = World.GetNearestAllowedPosition(presence, land);
6429 presence.TeleportWithMomentum(p, null);
6430 presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
5968 } 6431 }
5969 } 6432 }
5970 } 6433 }
5971 ScriptSleep(5000); 6434 ScriptSleep(5000);
5972 } 6435 }
5973 6436
6437 public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
6438 {
6439 return ParseString2List(str, separators, in_spacers, false);
6440 }
6441
5974 public LSL_Integer llOverMyLand(string id) 6442 public LSL_Integer llOverMyLand(string id)
5975 { 6443 {
5976 m_host.AddScriptLPS(1); 6444 m_host.AddScriptLPS(1);
@@ -6023,26 +6491,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6023 } 6491 }
6024 else 6492 else
6025 { 6493 {
6026 agentSize = GetAgentSize(avatar); 6494// agentSize = new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight);
6495 Vector3 s = avatar.Appearance.AvatarSize;
6496 agentSize = new LSL_Vector(s.X, s.Y, s.Z);
6027 } 6497 }
6028
6029 return agentSize; 6498 return agentSize;
6030 } 6499 }
6031 6500
6032 public LSL_Integer llSameGroup(string agent) 6501 public LSL_Integer llSameGroup(string id)
6033 { 6502 {
6034 m_host.AddScriptLPS(1); 6503 m_host.AddScriptLPS(1);
6035 UUID agentId = new UUID(); 6504 UUID uuid = new UUID();
6036 if (!UUID.TryParse(agent, out agentId)) 6505 if (!UUID.TryParse(id, out uuid))
6037 return new LSL_Integer(0); 6506 return new LSL_Integer(0);
6038 ScenePresence presence = World.GetScenePresence(agentId); 6507
6039 if (presence == null || presence.IsChildAgent) // Return flase for child agents 6508 // Check if it's a group key
6040 return new LSL_Integer(0); 6509 if (uuid == m_host.ParentGroup.RootPart.GroupID)
6041 IClientAPI client = presence.ControllingClient;
6042 if (m_host.GroupID == client.ActiveGroupId)
6043 return new LSL_Integer(1); 6510 return new LSL_Integer(1);
6044 else 6511
6512 // We got passed a UUID.Zero
6513 if (uuid == UUID.Zero)
6514 return new LSL_Integer(0);
6515
6516 // Handle the case where id names an avatar
6517 ScenePresence presence = World.GetScenePresence(uuid);
6518 if (presence != null)
6519 {
6520 if (presence.IsChildAgent)
6521 return new LSL_Integer(0);
6522
6523 IClientAPI client = presence.ControllingClient;
6524 if (m_host.ParentGroup.RootPart.GroupID == client.ActiveGroupId)
6525 return new LSL_Integer(1);
6526
6527 return new LSL_Integer(0);
6528 }
6529
6530 // Handle object case
6531 SceneObjectPart part = World.GetSceneObjectPart(uuid);
6532 if (part != null)
6533 {
6534 // This will handle both deed and non-deed and also the no
6535 // group case
6536 if (part.ParentGroup.RootPart.GroupID == m_host.ParentGroup.RootPart.GroupID)
6537 return new LSL_Integer(1);
6538
6045 return new LSL_Integer(0); 6539 return new LSL_Integer(0);
6540 }
6541
6542 return new LSL_Integer(0);
6046 } 6543 }
6047 6544
6048 public void llUnSit(string id) 6545 public void llUnSit(string id)
@@ -6631,6 +7128,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6631 7128
6632 protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot) 7129 protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot)
6633 { 7130 {
7131 // LSL quaternions can normalize to 0, normal Quaternions can't.
7132 if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0)
7133 rot.s = 1; // ZERO_ROTATION = 0,0,0,1
7134
6634 part.SitTargetPosition = offset; 7135 part.SitTargetPosition = offset;
6635 part.SitTargetOrientation = rot; 7136 part.SitTargetOrientation = rot;
6636 part.ParentGroup.HasGroupChanged = true; 7137 part.ParentGroup.HasGroupChanged = true;
@@ -6817,30 +7318,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6817 UUID av = new UUID(); 7318 UUID av = new UUID();
6818 if (!UUID.TryParse(avatar,out av)) 7319 if (!UUID.TryParse(avatar,out av))
6819 { 7320 {
6820 LSLError("First parameter to llDialog needs to be a key"); 7321 //LSLError("First parameter to llDialog needs to be a key");
6821 return; 7322 return;
6822 } 7323 }
6823 if (buttons.Length < 1) 7324 if (buttons.Length < 1)
6824 { 7325 {
6825 LSLError("No less than 1 button can be shown"); 7326 buttons.Add("OK");
6826 return;
6827 } 7327 }
6828 if (buttons.Length > 12) 7328 if (buttons.Length > 12)
6829 { 7329 {
6830 LSLError("No more than 12 buttons can be shown"); 7330 ShoutError("button list too long, must be 12 or fewer entries");
6831 return;
6832 } 7331 }
6833 string[] buts = new string[buttons.Length]; 7332 int length = buttons.Length;
6834 for (int i = 0; i < buttons.Length; i++) 7333 if (length > 12)
7334 length = 12;
7335
7336 string[] buts = new string[length];
7337 for (int i = 0; i < length; i++)
6835 { 7338 {
6836 if (buttons.Data[i].ToString() == String.Empty) 7339 if (buttons.Data[i].ToString() == String.Empty)
6837 { 7340 {
6838 LSLError("button label cannot be blank"); 7341 ShoutError("button label cannot be blank");
6839 return; 7342 return;
6840 } 7343 }
6841 if (buttons.Data[i].ToString().Length > 24) 7344 if (buttons.Data[i].ToString().Length > 24)
6842 { 7345 {
6843 LSLError("button label cannot be longer than 24 characters"); 7346 ShoutError("button label cannot be longer than 24 characters");
6844 return; 7347 return;
6845 } 7348 }
6846 buts[i] = buttons.Data[i].ToString(); 7349 buts[i] = buttons.Data[i].ToString();
@@ -6907,9 +7410,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6907 return; 7410 return;
6908 } 7411 }
6909 7412
6910 // the rest of the permission checks are done in RezScript, so check the pin there as well 7413 SceneObjectPart dest = World.GetSceneObjectPart(destId);
6911 World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); 7414 if (dest != null)
7415 {
7416 if ((item.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID)
7417 {
7418 // the rest of the permission checks are done in RezScript, so check the pin there as well
7419 World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param);
6912 7420
7421 if ((item.BasePermissions & (uint)PermissionMask.Copy) == 0)
7422 m_host.Inventory.RemoveInventoryItem(item.ItemID);
7423 }
7424 }
6913 // this will cause the delay even if the script pin or permissions were wrong - seems ok 7425 // this will cause the delay even if the script pin or permissions were wrong - seems ok
6914 ScriptSleep(3000); 7426 ScriptSleep(3000);
6915 } 7427 }
@@ -6983,19 +7495,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6983 public LSL_String llMD5String(string src, int nonce) 7495 public LSL_String llMD5String(string src, int nonce)
6984 { 7496 {
6985 m_host.AddScriptLPS(1); 7497 m_host.AddScriptLPS(1);
6986 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString())); 7498 return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()), Encoding.UTF8);
6987 } 7499 }
6988 7500
6989 public LSL_String llSHA1String(string src) 7501 public LSL_String llSHA1String(string src)
6990 { 7502 {
6991 m_host.AddScriptLPS(1); 7503 m_host.AddScriptLPS(1);
6992 return Util.SHA1Hash(src).ToLower(); 7504 return Util.SHA1Hash(src, Encoding.UTF8).ToLower();
6993 } 7505 }
6994 7506
6995 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) 7507 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve)
6996 { 7508 {
6997 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7509 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
6998 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7510 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7511 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7512 return shapeBlock;
6999 7513
7000 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 7514 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
7001 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 7515 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -7100,6 +7614,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7100 // Prim type box, cylinder and prism. 7614 // Prim type box, cylinder and prism.
7101 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte profileshape, byte pathcurve) 7615 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte profileshape, byte pathcurve)
7102 { 7616 {
7617 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7618 return;
7619
7103 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7620 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
7104 ObjectShapePacket.ObjectDataBlock shapeBlock; 7621 ObjectShapePacket.ObjectDataBlock shapeBlock;
7105 7622
@@ -7153,6 +7670,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7153 // Prim type sphere. 7670 // Prim type sphere.
7154 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve) 7671 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve)
7155 { 7672 {
7673 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7674 return;
7675
7156 ObjectShapePacket.ObjectDataBlock shapeBlock; 7676 ObjectShapePacket.ObjectDataBlock shapeBlock;
7157 7677
7158 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve); 7678 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve);
@@ -7194,6 +7714,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7194 // Prim type torus, tube and ring. 7714 // Prim type torus, tube and ring.
7195 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte profileshape, byte pathcurve) 7715 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte profileshape, byte pathcurve)
7196 { 7716 {
7717 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7718 return;
7719
7197 float tempFloat; // Use in float expressions below to avoid byte cast precision issues. 7720 float tempFloat; // Use in float expressions below to avoid byte cast precision issues.
7198 ObjectShapePacket.ObjectDataBlock shapeBlock; 7721 ObjectShapePacket.ObjectDataBlock shapeBlock;
7199 7722
@@ -7329,6 +7852,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7329 // Prim type sculpt. 7852 // Prim type sculpt.
7330 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve) 7853 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve)
7331 { 7854 {
7855 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
7856 return;
7857
7332 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 7858 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
7333 UUID sculptId; 7859 UUID sculptId;
7334 7860
@@ -7351,7 +7877,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7351 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag)) 7877 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag))
7352 { 7878 {
7353 // default 7879 // default
7354 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; 7880 type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
7355 } 7881 }
7356 7882
7357 part.Shape.SetSculptProperties((byte)type, sculptId); 7883 part.Shape.SetSculptProperties((byte)type, sculptId);
@@ -7368,15 +7894,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7368 ScriptSleep(200); 7894 ScriptSleep(200);
7369 } 7895 }
7370 7896
7371 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7372 {
7373 m_host.AddScriptLPS(1);
7374
7375 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
7376
7377 ScriptSleep(200);
7378 }
7379
7380 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7897 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
7381 { 7898 {
7382 m_host.AddScriptLPS(1); 7899 m_host.AddScriptLPS(1);
@@ -7384,169 +7901,135 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7384 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast"); 7901 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast");
7385 } 7902 }
7386 7903
7387 protected void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc) 7904 private void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc)
7388 { 7905 {
7389 List<SceneObjectPart> parts = GetLinkParts(linknumber); 7906 List<object> parts = new List<object>();
7907 List<SceneObjectPart> prims = GetLinkParts(linknumber);
7908 List<ScenePresence> avatars = GetLinkAvatars(linknumber);
7909 foreach (SceneObjectPart p in prims)
7910 parts.Add(p);
7911 foreach (ScenePresence p in avatars)
7912 parts.Add(p);
7390 7913
7391 LSL_List remaining = null; 7914 LSL_List remaining = null;
7392 uint rulesParsed = 0; 7915 uint rulesParsed = 0;
7393 7916
7394 foreach (SceneObjectPart part in parts) 7917 if (parts.Count > 0)
7395 remaining = SetPrimParams(part, rules, originFunc, ref rulesParsed);
7396
7397 while (remaining != null && remaining.Length > 2)
7398 { 7918 {
7399 linknumber = remaining.GetLSLIntegerItem(0); 7919 foreach (object part in parts)
7400 rules = remaining.GetSublist(1, -1);
7401 parts = GetLinkParts(linknumber);
7402
7403 foreach (SceneObjectPart part in parts)
7404 remaining = SetPrimParams(part, rules, originFunc, ref rulesParsed);
7405 }
7406 }
7407
7408 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
7409 {
7410 SceneObjectGroup group = m_host.ParentGroup;
7411
7412 if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
7413 return;
7414 if (group.IsAttachment)
7415 return;
7416
7417 if (frames.Data.Length > 0) // We are getting a new motion
7418 {
7419 if (group.RootPart.KeyframeMotion != null)
7420 group.RootPart.KeyframeMotion.Delete();
7421 group.RootPart.KeyframeMotion = null;
7422
7423 int idx = 0;
7424
7425 KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
7426 KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
7427
7428 while (idx < options.Data.Length)
7429 { 7920 {
7430 int option = (int)options.GetLSLIntegerItem(idx++); 7921 if (part is SceneObjectPart)
7431 int remain = options.Data.Length - idx; 7922 remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
7923 else
7924 remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
7925 }
7432 7926
7433 switch (option) 7927 while ((object)remaining != null && remaining.Length > 2)
7928 {
7929 linknumber = remaining.GetLSLIntegerItem(0);
7930 rules = remaining.GetSublist(1, -1);
7931 parts.Clear();
7932 prims = GetLinkParts(linknumber);
7933 avatars = GetLinkAvatars(linknumber);
7934 foreach (SceneObjectPart p in prims)
7935 parts.Add(p);
7936 foreach (ScenePresence p in avatars)
7937 parts.Add(p);
7938
7939 remaining = null;
7940 foreach (object part in parts)
7434 { 7941 {
7435 case ScriptBaseClass.KFM_MODE: 7942 if (part is SceneObjectPart)
7436 if (remain < 1) 7943 remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
7437 break; 7944 else
7438 int modeval = (int)options.GetLSLIntegerItem(idx++); 7945 remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
7439 switch(modeval)
7440 {
7441 case ScriptBaseClass.KFM_FORWARD:
7442 mode = KeyframeMotion.PlayMode.Forward;
7443 break;
7444 case ScriptBaseClass.KFM_REVERSE:
7445 mode = KeyframeMotion.PlayMode.Reverse;
7446 break;
7447 case ScriptBaseClass.KFM_LOOP:
7448 mode = KeyframeMotion.PlayMode.Loop;
7449 break;
7450 case ScriptBaseClass.KFM_PING_PONG:
7451 mode = KeyframeMotion.PlayMode.PingPong;
7452 break;
7453 }
7454 break;
7455 case ScriptBaseClass.KFM_DATA:
7456 if (remain < 1)
7457 break;
7458 int dataval = (int)options.GetLSLIntegerItem(idx++);
7459 data = (KeyframeMotion.DataFormat)dataval;
7460 break;
7461 } 7946 }
7462 } 7947 }
7948 }
7949 }
7463 7950
7464 group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data); 7951 public LSL_List llGetPhysicsMaterial()
7952 {
7953 LSL_List result = new LSL_List();
7465 7954
7466 idx = 0; 7955 result.Add(new LSL_Float(m_host.GravityModifier));
7956 result.Add(new LSL_Float(m_host.Restitution));
7957 result.Add(new LSL_Float(m_host.Friction));
7958 result.Add(new LSL_Float(m_host.Density));
7467 7959
7468 int elemLength = 2; 7960 return result;
7469 if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation)) 7961 }
7470 elemLength = 3;
7471 7962
7472 List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>(); 7963 private void SetPhysicsMaterial(SceneObjectPart part, int material_bits,
7473 while (idx < frames.Data.Length) 7964 float material_density, float material_friction,
7474 { 7965 float material_restitution, float material_gravity_modifier)
7475 int remain = frames.Data.Length - idx; 7966 {
7967 ExtraPhysicsData physdata = new ExtraPhysicsData();
7968 physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType;
7969 physdata.Density = part.Density;
7970 physdata.Friction = part.Friction;
7971 physdata.Bounce = part.Restitution;
7972 physdata.GravitationModifier = part.GravityModifier;
7476 7973
7477 if (remain < elemLength) 7974 if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0)
7478 break; 7975 physdata.Density = material_density;
7976 if ((material_bits & (int)ScriptBaseClass.FRICTION) != 0)
7977 physdata.Friction = material_friction;
7978 if ((material_bits & (int)ScriptBaseClass.RESTITUTION) != 0)
7979 physdata.Bounce = material_restitution;
7980 if ((material_bits & (int)ScriptBaseClass.GRAVITY_MULTIPLIER) != 0)
7981 physdata.GravitationModifier = material_gravity_modifier;
7479 7982
7480 KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe(); 7983 part.UpdateExtraPhysics(physdata);
7481 frame.Position = null; 7984 }
7482 frame.Rotation = null;
7483 7985
7484 if ((data & KeyframeMotion.DataFormat.Translation) != 0) 7986 public void llSetPhysicsMaterial(int material_bits,
7485 { 7987 float material_gravity_modifier, float material_restitution,
7486 LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++); 7988 float material_friction, float material_density)
7487 frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z); 7989 {
7488 } 7990 SetPhysicsMaterial(m_host, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
7489 if ((data & KeyframeMotion.DataFormat.Rotation) != 0) 7991 }
7490 {
7491 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
7492 Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
7493 q.Normalize();
7494 frame.Rotation = q;
7495 }
7496 7992
7497 float tempf = (float)frames.GetLSLFloatItem(idx++); 7993 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7498 frame.TimeMS = (int)(tempf * 1000.0f); 7994 {
7995 setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
7996 llSetLinkPrimitiveParamsFast(linknumber, rules);
7997 ScriptSleep(200);
7998 }
7499 7999
7500 keyframes.Add(frame); 8000 // vector up using libomv (c&p from sop )
7501 } 8001 // vector up rotated by r
8002 private Vector3 Zrot(Quaternion r)
8003 {
8004 double x, y, z, m;
7502 8005
7503 group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray()); 8006 m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
7504 group.RootPart.KeyframeMotion.Start(); 8007 if (Math.Abs(1.0 - m) > 0.000001)
7505 }
7506 else
7507 { 8008 {
7508 if (group.RootPart.KeyframeMotion == null) 8009 m = 1.0 / Math.Sqrt(m);
7509 return; 8010 r.X *= (float)m;
7510 8011 r.Y *= (float)m;
7511 if (options.Data.Length == 0) 8012 r.Z *= (float)m;
7512 { 8013 r.W *= (float)m;
7513 group.RootPart.KeyframeMotion.Stop(); 8014 }
7514 return;
7515 }
7516
7517 int idx = 0;
7518 8015
7519 while (idx < options.Data.Length) 8016 x = 2 * (r.X * r.Z + r.Y * r.W);
7520 { 8017 y = 2 * (-r.X * r.W + r.Y * r.Z);
7521 int option = (int)options.GetLSLIntegerItem(idx++); 8018 z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
7522 8019
7523 switch (option) 8020 return new Vector3((float)x, (float)y, (float)z);
7524 {
7525 case ScriptBaseClass.KFM_COMMAND:
7526 int cmd = (int)options.GetLSLIntegerItem(idx++);
7527 switch (cmd)
7528 {
7529 case ScriptBaseClass.KFM_CMD_PLAY:
7530 group.RootPart.KeyframeMotion.Start();
7531 break;
7532 case ScriptBaseClass.KFM_CMD_STOP:
7533 group.RootPart.KeyframeMotion.Stop();
7534 break;
7535 case ScriptBaseClass.KFM_CMD_PAUSE:
7536 group.RootPart.KeyframeMotion.Pause();
7537 break;
7538 }
7539 break;
7540 }
7541 }
7542 }
7543 } 8021 }
7544 8022
7545 protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules, string originFunc, ref uint rulesParsed) 8023 protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules, string originFunc, ref uint rulesParsed)
7546 { 8024 {
8025 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
8026 return null;
8027
7547 int idx = 0; 8028 int idx = 0;
7548 int idxStart = 0; 8029 int idxStart = 0;
7549 8030
8031 SceneObjectGroup parentgrp = part.ParentGroup;
8032
7550 bool positionChanged = false; 8033 bool positionChanged = false;
7551 LSL_Vector currentPosition = GetPartLocalPos(part); 8034 LSL_Vector currentPosition = GetPartLocalPos(part);
7552 8035
@@ -7571,8 +8054,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7571 return null; 8054 return null;
7572 8055
7573 v=rules.GetVector3Item(idx++); 8056 v=rules.GetVector3Item(idx++);
8057 if (part.IsRoot && !part.ParentGroup.IsAttachment)
8058 currentPosition = GetSetPosTarget(part, v, currentPosition, true);
8059 else
8060 currentPosition = GetSetPosTarget(part, v, currentPosition, false);
7574 positionChanged = true; 8061 positionChanged = true;
7575 currentPosition = GetSetPosTarget(part, v, currentPosition);
7576 8062
7577 break; 8063 break;
7578 case (int)ScriptBaseClass.PRIM_SIZE: 8064 case (int)ScriptBaseClass.PRIM_SIZE:
@@ -7589,7 +8075,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7589 8075
7590 LSL_Rotation q = rules.GetQuaternionItem(idx++); 8076 LSL_Rotation q = rules.GetQuaternionItem(idx++);
7591 // try to let this work as in SL... 8077 // try to let this work as in SL...
7592 if (part.ParentID == 0) 8078 if (part.ParentID == 0 || (part.ParentGroup != null && part == part.ParentGroup.RootPart))
7593 { 8079 {
7594 // special case: If we are root, rotate complete SOG to new rotation 8080 // special case: If we are root, rotate complete SOG to new rotation
7595 SetRot(part, q); 8081 SetRot(part, q);
@@ -7883,6 +8369,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7883 8369
7884 break; 8370 break;
7885 8371
8372 case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
8373 if (remain < 5)
8374 return null;
8375
8376 int material_bits = rules.GetLSLIntegerItem(idx++);
8377 float material_density = (float)rules.GetLSLFloatItem(idx++);
8378 float material_friction = (float)rules.GetLSLFloatItem(idx++);
8379 float material_restitution = (float)rules.GetLSLFloatItem(idx++);
8380 float material_gravity_modifier = (float)rules.GetLSLFloatItem(idx++);
8381
8382 SetPhysicsMaterial(part, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
8383
8384 break;
8385
7886 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ: 8386 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
7887 if (remain < 1) 8387 if (remain < 1)
7888 return null; 8388 return null;
@@ -7962,14 +8462,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7962 if (part.ParentGroup.RootPart == part) 8462 if (part.ParentGroup.RootPart == part)
7963 { 8463 {
7964 SceneObjectGroup parent = part.ParentGroup; 8464 SceneObjectGroup parent = part.ParentGroup;
7965 parent.UpdateGroupPosition(currentPosition); 8465 Util.FireAndForget(delegate(object x) {
8466 parent.UpdateGroupPosition(currentPosition);
8467 });
7966 } 8468 }
7967 else 8469 else
7968 { 8470 {
7969 part.OffsetPosition = currentPosition; 8471 part.OffsetPosition = currentPosition;
7970 SceneObjectGroup parent = part.ParentGroup; 8472// SceneObjectGroup parent = part.ParentGroup;
7971 parent.HasGroupChanged = true; 8473// parent.HasGroupChanged = true;
7972 parent.ScheduleGroupForTerseUpdate(); 8474// parent.ScheduleGroupForTerseUpdate();
8475 part.ScheduleTerseUpdate();
7973 } 8476 }
7974 } 8477 }
7975 } 8478 }
@@ -8007,10 +8510,91 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8007 8510
8008 public LSL_String llXorBase64Strings(string str1, string str2) 8511 public LSL_String llXorBase64Strings(string str1, string str2)
8009 { 8512 {
8010 m_host.AddScriptLPS(1); 8513 string b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
8011 Deprecated("llXorBase64Strings"); 8514
8012 ScriptSleep(300); 8515 ScriptSleep(300);
8013 return String.Empty; 8516 m_host.AddScriptLPS(1);
8517
8518 if (str1 == String.Empty)
8519 return String.Empty;
8520 if (str2 == String.Empty)
8521 return str1;
8522
8523 int len = str2.Length;
8524 if ((len % 4) != 0) // LL is EVIL!!!!
8525 {
8526 while (str2.EndsWith("="))
8527 str2 = str2.Substring(0, str2.Length - 1);
8528
8529 len = str2.Length;
8530 int mod = len % 4;
8531
8532 if (mod == 1)
8533 str2 = str2.Substring(0, str2.Length - 1);
8534 else if (mod == 2)
8535 str2 += "==";
8536 else if (mod == 3)
8537 str2 += "=";
8538 }
8539
8540 byte[] data1;
8541 byte[] data2;
8542 try
8543 {
8544 data1 = Convert.FromBase64String(str1);
8545 data2 = Convert.FromBase64String(str2);
8546 }
8547 catch (Exception)
8548 {
8549 return new LSL_String(String.Empty);
8550 }
8551
8552 // For cases where the decoded length of s2 is greater
8553 // than the decoded length of s1, simply perform a normal
8554 // decode and XOR
8555 //
8556 if (data2.Length >= data1.Length)
8557 {
8558 for (int pos = 0 ; pos < data1.Length ; pos++ )
8559 data1[pos] ^= data2[pos];
8560
8561 return Convert.ToBase64String(data1);
8562 }
8563
8564 // Remove padding
8565 while (str1.EndsWith("="))
8566 str1 = str1.Substring(0, str1.Length - 1);
8567 while (str2.EndsWith("="))
8568 str2 = str2.Substring(0, str2.Length - 1);
8569
8570 byte[] d1 = new byte[str1.Length];
8571 byte[] d2 = new byte[str2.Length];
8572
8573 for (int i = 0 ; i < str1.Length ; i++)
8574 {
8575 int idx = b64.IndexOf(str1.Substring(i, 1));
8576 if (idx == -1)
8577 idx = 0;
8578 d1[i] = (byte)idx;
8579 }
8580
8581 for (int i = 0 ; i < str2.Length ; i++)
8582 {
8583 int idx = b64.IndexOf(str2.Substring(i, 1));
8584 if (idx == -1)
8585 idx = 0;
8586 d2[i] = (byte)idx;
8587 }
8588
8589 string output = String.Empty;
8590
8591 for (int pos = 0 ; pos < d1.Length ; pos++)
8592 output += b64[d1[pos] ^ d2[pos % d2.Length]];
8593
8594 while (output.Length % 3 > 0)
8595 output += "=";
8596
8597 return output;
8014 } 8598 }
8015 8599
8016 public void llRemoteDataSetRegion() 8600 public void llRemoteDataSetRegion()
@@ -8135,8 +8719,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8135 public LSL_Integer llGetNumberOfPrims() 8719 public LSL_Integer llGetNumberOfPrims()
8136 { 8720 {
8137 m_host.AddScriptLPS(1); 8721 m_host.AddScriptLPS(1);
8138 8722 int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
8139 return m_host.ParentGroup.PrimCount + m_host.ParentGroup.GetSittingAvatarsCount(); 8723
8724 return m_host.ParentGroup.PrimCount + avatarCount;
8140 } 8725 }
8141 8726
8142 /// <summary> 8727 /// <summary>
@@ -8151,55 +8736,114 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8151 m_host.AddScriptLPS(1); 8736 m_host.AddScriptLPS(1);
8152 UUID objID = UUID.Zero; 8737 UUID objID = UUID.Zero;
8153 LSL_List result = new LSL_List(); 8738 LSL_List result = new LSL_List();
8739
8740 // If the ID is not valid, return null result
8154 if (!UUID.TryParse(obj, out objID)) 8741 if (!UUID.TryParse(obj, out objID))
8155 { 8742 {
8156 result.Add(new LSL_Vector()); 8743 result.Add(new LSL_Vector());
8157 result.Add(new LSL_Vector()); 8744 result.Add(new LSL_Vector());
8158 return result; 8745 return result;
8159 } 8746 }
8747
8748 // Check if this is an attached prim. If so, replace
8749 // the UUID with the avatar UUID and report it's bounding box
8750 SceneObjectPart part = World.GetSceneObjectPart(objID);
8751 if (part != null && part.ParentGroup.IsAttachment)
8752 objID = part.ParentGroup.AttachedAvatar;
8753
8754 // Find out if this is an avatar ID. If so, return it's box
8160 ScenePresence presence = World.GetScenePresence(objID); 8755 ScenePresence presence = World.GetScenePresence(objID);
8161 if (presence != null) 8756 if (presence != null)
8162 { 8757 {
8163 if (presence.ParentID == 0) // not sat on an object 8758 // As per LSL Wiki, there is no difference between sitting
8759 // and standing avatar since server 1.36
8760 LSL_Vector lower;
8761 LSL_Vector upper;
8762
8763 Vector3 box = presence.Appearance.AvatarBoxSize * 0.5f;
8764
8765 if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID
8766 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
8767/*
8164 { 8768 {
8165 LSL_Vector lower; 8769 // This is for ground sitting avatars
8166 LSL_Vector upper; 8770 float height = presence.Appearance.AvatarHeight / 2.66666667f;
8167 if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID 8771 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
8168 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 8772 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
8169 {
8170 // This is for ground sitting avatars
8171 float height = presence.Appearance.AvatarHeight / 2.66666667f;
8172 lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
8173 upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
8174 }
8175 else
8176 {
8177 // This is for standing/flying avatars
8178 float height = presence.Appearance.AvatarHeight / 2.0f;
8179 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
8180 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
8181 }
8182 result.Add(lower);
8183 result.Add(upper);
8184 return result;
8185 } 8773 }
8186 else 8774 else
8187 { 8775 {
8188 // sitting on an object so we need the bounding box of that 8776 // This is for standing/flying avatars
8189 // which should include the avatar so set the UUID to the 8777 float height = presence.Appearance.AvatarHeight / 2.0f;
8190 // UUID of the object the avatar is sat on and allow it to fall through 8778 lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
8191 // to processing an object 8779 upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
8192 SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
8193 objID = p.UUID;
8194 } 8780 }
8781
8782 // Adjust to the documented error offsets (see LSL Wiki)
8783 lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
8784 upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
8785*/
8786 {
8787 // This is for ground sitting avatars TODO!
8788 lower = new LSL_Vector(-box.X - 0.1125, -box.Y, box.Z * -1.0f);
8789 upper = new LSL_Vector(box.X + 0.1125, box.Y, box.Z * -1.0f);
8790 }
8791 else
8792 {
8793 // This is for standing/flying avatars
8794 lower = new LSL_Vector(-box.X, -box.Y, -box.Z);
8795 upper = new LSL_Vector(box.X, box.Y, box.Z);
8796 }
8797
8798 if (lower.x > upper.x)
8799 lower.x = upper.x;
8800 if (lower.y > upper.y)
8801 lower.y = upper.y;
8802 if (lower.z > upper.z)
8803 lower.z = upper.z;
8804
8805 result.Add(lower);
8806 result.Add(upper);
8807 return result;
8195 } 8808 }
8196 SceneObjectPart part = World.GetSceneObjectPart(objID); 8809
8810 part = World.GetSceneObjectPart(objID);
8197 // Currently only works for single prims without a sitting avatar 8811 // Currently only works for single prims without a sitting avatar
8198 if (part != null) 8812 if (part != null)
8199 { 8813 {
8200 Vector3 halfSize = part.Scale / 2.0f; 8814 float minX;
8201 LSL_Vector lower = (new LSL_Vector(halfSize)) * -1.0f; 8815 float maxX;
8202 LSL_Vector upper = new LSL_Vector(halfSize); 8816 float minY;
8817 float maxY;
8818 float minZ;
8819 float maxZ;
8820
8821 // This BBox is in sim coordinates, with the offset being
8822 // a contained point.
8823 Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
8824 out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
8825
8826 minX -= offsets[0].X;
8827 maxX -= offsets[0].X;
8828 minY -= offsets[0].Y;
8829 maxY -= offsets[0].Y;
8830 minZ -= offsets[0].Z;
8831 maxZ -= offsets[0].Z;
8832
8833 LSL_Vector lower;
8834 LSL_Vector upper;
8835
8836 // Adjust to the documented error offsets (see LSL Wiki)
8837 lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
8838 upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
8839
8840 if (lower.x > upper.x)
8841 lower.x = upper.x;
8842 if (lower.y > upper.y)
8843 lower.y = upper.y;
8844 if (lower.z > upper.z)
8845 lower.z = upper.z;
8846
8203 result.Add(lower); 8847 result.Add(lower);
8204 result.Add(upper); 8848 result.Add(upper);
8205 return result; 8849 return result;
@@ -8216,227 +8860,70 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8216 return new LSL_Vector(m_host.GetGeometricCenter()); 8860 return new LSL_Vector(m_host.GetGeometricCenter());
8217 } 8861 }
8218 8862
8219 public LSL_List GetEntityParams(ISceneEntity entity, LSL_List rules) 8863 public LSL_List llGetPrimitiveParams(LSL_List rules)
8220 { 8864 {
8221 LSL_List result = new LSL_List(); 8865 m_host.AddScriptLPS(1);
8222 LSL_List remaining = null;
8223
8224 while (true)
8225 {
8226// m_log.DebugFormat(
8227// "[LSL API]: GetEntityParams has {0} rules with scene entity named {1}",
8228// rules.Length, entity != null ? entity.Name : "NULL");
8229
8230 if (entity == null)
8231 return result;
8232 8866
8233 if (entity is SceneObjectPart) 8867 LSL_List result = new LSL_List();
8234 remaining = GetPrimParams((SceneObjectPart)entity, rules, ref result);
8235 else
8236 remaining = GetAgentParams((ScenePresence)entity, rules, ref result);
8237 8868
8238 if (remaining == null || remaining.Length < 2) 8869 LSL_List remaining = GetPrimParams(m_host, rules, ref result);
8239 return result;
8240 8870
8871 while ((object)remaining != null && remaining.Length > 2)
8872 {
8241 int linknumber = remaining.GetLSLIntegerItem(0); 8873 int linknumber = remaining.GetLSLIntegerItem(0);
8242 rules = remaining.GetSublist(1, -1); 8874 rules = remaining.GetSublist(1, -1);
8243 entity = GetLinkEntity(linknumber); 8875 List<SceneObjectPart> parts = GetLinkParts(linknumber);
8244 }
8245 }
8246 8876
8247 public LSL_List llGetPrimitiveParams(LSL_List rules) 8877 foreach (SceneObjectPart part in parts)
8248 { 8878 remaining = GetPrimParams(part, rules, ref result);
8249 m_host.AddScriptLPS(1); 8879 }
8250 8880
8251 return GetEntityParams(m_host, rules); 8881 return result;
8252 } 8882 }
8253 8883
8254 public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules) 8884 public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules)
8255 { 8885 {
8256 m_host.AddScriptLPS(1); 8886 m_host.AddScriptLPS(1);
8257 8887
8258 return GetEntityParams(GetLinkEntity(linknumber), rules); 8888 // acording to SL wiki this must indicate a single link number or link_root or link_this.
8259 } 8889 // keep other options as before
8260 8890
8261 public LSL_Vector GetAgentSize(ScenePresence sp) 8891 List<SceneObjectPart> parts;
8262 { 8892 List<ScenePresence> avatars;
8263 return new LSL_Vector(0.45, 0.6, sp.Appearance.AvatarHeight); 8893
8264 } 8894 LSL_List res = new LSL_List();
8895 LSL_List remaining = null;
8265 8896
8266 /// <summary> 8897 while (rules.Length > 0)
8267 /// Gets params for a seated avatar in a linkset.
8268 /// </summary>
8269 /// <returns></returns>
8270 /// <param name='sp'></param>
8271 /// <param name='rules'></param>
8272 /// <param name='res'></param>
8273 public LSL_List GetAgentParams(ScenePresence sp, LSL_List rules, ref LSL_List res)
8274 {
8275 int idx = 0;
8276 while (idx < rules.Length)
8277 { 8898 {
8278 int code = (int)rules.GetLSLIntegerItem(idx++); 8899 parts = GetLinkParts(linknumber);
8279 int remain = rules.Length-idx; 8900 avatars = GetLinkAvatars(linknumber);
8280 8901
8281 switch (code) 8902 remaining = null;
8903 foreach (SceneObjectPart part in parts)
8282 { 8904 {
8283 case (int)ScriptBaseClass.PRIM_MATERIAL: 8905 remaining = GetPrimParams(part, rules, ref res);
8284 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_MATERIAL_FLESH)); 8906 }
8285 break; 8907 foreach (ScenePresence avatar in avatars)
8286 8908 {
8287 case (int)ScriptBaseClass.PRIM_PHYSICS: 8909 remaining = GetPrimParams(avatar, rules, ref res);
8288 res.Add(ScriptBaseClass.FALSE); 8910 }
8289 break;
8290
8291 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
8292 res.Add(ScriptBaseClass.FALSE);
8293 break;
8294
8295 case (int)ScriptBaseClass.PRIM_PHANTOM:
8296 res.Add(ScriptBaseClass.FALSE);
8297 break;
8298
8299 case (int)ScriptBaseClass.PRIM_POSITION:
8300 res.Add(new LSL_Vector(sp.AbsolutePosition));
8301 break;
8302
8303 case (int)ScriptBaseClass.PRIM_SIZE:
8304 res.Add(GetAgentSize(sp));
8305 break;
8306
8307 case (int)ScriptBaseClass.PRIM_ROTATION:
8308 res.Add(sp.GetWorldRotation());
8309 break;
8310
8311 case (int)ScriptBaseClass.PRIM_TYPE:
8312 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
8313 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
8314 res.Add(new LSL_Vector(0, 1, 0));
8315 res.Add(new LSL_Float(0));
8316 res.Add(new LSL_Vector(0, 0, 0));
8317 res.Add(new LSL_Vector(1, 1, 0));
8318 res.Add(new LSL_Vector(0, 0, 0));
8319 break;
8320
8321 case (int)ScriptBaseClass.PRIM_TEXTURE:
8322 if (remain < 1)
8323 return null;
8324
8325 int face = (int)rules.GetLSLIntegerItem(idx++);
8326 if (face > 21)
8327 break;
8328
8329 res.Add(new LSL_String(""));
8330 res.Add(ScriptBaseClass.ZERO_VECTOR);
8331 res.Add(ScriptBaseClass.ZERO_VECTOR);
8332 res.Add(new LSL_Float(0));
8333 break;
8334
8335 case (int)ScriptBaseClass.PRIM_COLOR:
8336 if (remain < 1)
8337 return null;
8338
8339 face = (int)rules.GetLSLIntegerItem(idx++);
8340 if (face > 21)
8341 break;
8342
8343 res.Add(ScriptBaseClass.ZERO_VECTOR);
8344 res.Add(new LSL_Float(0));
8345 break;
8346
8347 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
8348 if (remain < 1)
8349 return null;
8350
8351 face = (int)rules.GetLSLIntegerItem(idx++);
8352 if (face > 21)
8353 break;
8354
8355 res.Add(ScriptBaseClass.PRIM_SHINY_NONE);
8356 res.Add(ScriptBaseClass.PRIM_BUMP_NONE);
8357 break;
8358
8359 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
8360 if (remain < 1)
8361 return null;
8362
8363 face = (int)rules.GetLSLIntegerItem(idx++);
8364 if (face > 21)
8365 break;
8366
8367 res.Add(ScriptBaseClass.FALSE);
8368 break;
8369
8370 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
8371 res.Add(ScriptBaseClass.FALSE);
8372 res.Add(new LSL_Integer(0));
8373 res.Add(new LSL_Float(0));
8374 res.Add(new LSL_Float(0));
8375 res.Add(new LSL_Float(0));
8376 res.Add(new LSL_Float(0));
8377 res.Add(ScriptBaseClass.ZERO_VECTOR);
8378 break;
8379
8380 case (int)ScriptBaseClass.PRIM_TEXGEN:
8381 if (remain < 1)
8382 return null;
8383
8384 face = (int)rules.GetLSLIntegerItem(idx++);
8385 if (face > 21)
8386 break;
8387
8388 res.Add(ScriptBaseClass.PRIM_TEXGEN_DEFAULT);
8389 break;
8390
8391 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
8392 res.Add(ScriptBaseClass.FALSE);
8393 res.Add(ScriptBaseClass.ZERO_VECTOR);
8394 res.Add(ScriptBaseClass.ZERO_VECTOR);
8395 break;
8396
8397 case (int)ScriptBaseClass.PRIM_GLOW:
8398 if (remain < 1)
8399 return null;
8400
8401 face = (int)rules.GetLSLIntegerItem(idx++);
8402 if (face > 21)
8403 break;
8404
8405 res.Add(new LSL_Float(0));
8406 break;
8407
8408 case (int)ScriptBaseClass.PRIM_TEXT:
8409 res.Add(new LSL_String(""));
8410 res.Add(ScriptBaseClass.ZERO_VECTOR);
8411 res.Add(new LSL_Float(1));
8412 break;
8413
8414 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
8415 res.Add(new LSL_Rotation(sp.Rotation));
8416 break;
8417
8418 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
8419 res.Add(new LSL_Vector(sp.OffsetPosition));
8420 break;
8421
8422 case (int)ScriptBaseClass.PRIM_SLICE:
8423 res.Add(new LSL_Vector(0, 1, 0));
8424 break;
8425
8426 case (int)ScriptBaseClass.PRIM_LINK_TARGET:
8427 if(remain < 3)
8428 return null;
8429 8911
8430 return rules.GetSublist(idx, -1); 8912 if ((object)remaining != null && remaining.Length > 0)
8913 {
8914 linknumber = remaining.GetLSLIntegerItem(0);
8915 rules = remaining.GetSublist(1, -1);
8431 } 8916 }
8917 else
8918 break;
8432 } 8919 }
8433 8920
8434 return null; 8921 return res;
8435 } 8922 }
8436 8923
8437 public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules, ref LSL_List res) 8924 public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules, ref LSL_List res)
8438 { 8925 {
8439 int idx = 0; 8926 int idx=0;
8440 while (idx < rules.Length) 8927 while (idx < rules.Length)
8441 { 8928 {
8442 int code = (int)rules.GetLSLIntegerItem(idx++); 8929 int code = (int)rules.GetLSLIntegerItem(idx++);
@@ -8470,19 +8957,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8470 break; 8957 break;
8471 8958
8472 case (int)ScriptBaseClass.PRIM_POSITION: 8959 case (int)ScriptBaseClass.PRIM_POSITION:
8473 LSL_Vector v = new LSL_Vector(part.AbsolutePosition); 8960 LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
8474 8961 part.AbsolutePosition.Y,
8475 // For some reason, the part.AbsolutePosition.* values do not change if the 8962 part.AbsolutePosition.Z);
8476 // linkset is rotated; they always reflect the child prim's world position
8477 // as though the linkset is unrotated. This is incompatible behavior with SL's
8478 // implementation, so will break scripts imported from there (not to mention it
8479 // makes it more difficult to determine a child prim's actual inworld position).
8480 if (!part.IsRoot)
8481 {
8482 LSL_Vector rootPos = new LSL_Vector(m_host.ParentGroup.AbsolutePosition);
8483 v = ((v - rootPos) * llGetRootRotation()) + rootPos;
8484 }
8485
8486 res.Add(v); 8963 res.Add(v);
8487 break; 8964 break;
8488 8965
@@ -8652,30 +9129,56 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8652 if (remain < 1) 9129 if (remain < 1)
8653 return null; 9130 return null;
8654 9131
8655 face=(int)rules.GetLSLIntegerItem(idx++); 9132 face = (int)rules.GetLSLIntegerItem(idx++);
8656 9133
8657 tex = part.Shape.Textures; 9134 tex = part.Shape.Textures;
9135 int shiny;
8658 if (face == ScriptBaseClass.ALL_SIDES) 9136 if (face == ScriptBaseClass.ALL_SIDES)
8659 { 9137 {
8660 for (face = 0; face < GetNumberOfSides(part); face++) 9138 for (face = 0; face < GetNumberOfSides(part); face++)
8661 { 9139 {
8662 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9140 Shininess shinyness = tex.GetFace((uint)face).Shiny;
8663 // Convert Shininess to PRIM_SHINY_* 9141 if (shinyness == Shininess.High)
8664 res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); 9142 {
8665 // PRIM_BUMP_* 9143 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8666 res.Add(new LSL_Integer((int)texface.Bump)); 9144 }
9145 else if (shinyness == Shininess.Medium)
9146 {
9147 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
9148 }
9149 else if (shinyness == Shininess.Low)
9150 {
9151 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
9152 }
9153 else
9154 {
9155 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
9156 }
9157 res.Add(new LSL_Integer(shiny));
9158 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8667 } 9159 }
8668 } 9160 }
8669 else 9161 else
8670 { 9162 {
8671 if (face >= 0 && face < GetNumberOfSides(part)) 9163 Shininess shinyness = tex.GetFace((uint)face).Shiny;
9164 if (shinyness == Shininess.High)
8672 { 9165 {
8673 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9166 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
8674 // Convert Shininess to PRIM_SHINY_*
8675 res.Add(new LSL_Integer((uint)texface.Shiny >> 6));
8676 // PRIM_BUMP_*
8677 res.Add(new LSL_Integer((int)texface.Bump));
8678 } 9167 }
9168 else if (shinyness == Shininess.Medium)
9169 {
9170 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
9171 }
9172 else if (shinyness == Shininess.Low)
9173 {
9174 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
9175 }
9176 else
9177 {
9178 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
9179 }
9180 res.Add(new LSL_Integer(shiny));
9181 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
8679 } 9182 }
8680 break; 9183 break;
8681 9184
@@ -8686,21 +9189,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8686 face = (int)rules.GetLSLIntegerItem(idx++); 9189 face = (int)rules.GetLSLIntegerItem(idx++);
8687 9190
8688 tex = part.Shape.Textures; 9191 tex = part.Shape.Textures;
9192 int fullbright;
8689 if (face == ScriptBaseClass.ALL_SIDES) 9193 if (face == ScriptBaseClass.ALL_SIDES)
8690 { 9194 {
8691 for (face = 0; face < GetNumberOfSides(part); face++) 9195 for (face = 0; face < GetNumberOfSides(part); face++)
8692 { 9196 {
8693 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9197 if (tex.GetFace((uint)face).Fullbright == true)
8694 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 9198 {
9199 fullbright = ScriptBaseClass.TRUE;
9200 }
9201 else
9202 {
9203 fullbright = ScriptBaseClass.FALSE;
9204 }
9205 res.Add(new LSL_Integer(fullbright));
8695 } 9206 }
8696 } 9207 }
8697 else 9208 else
8698 { 9209 {
8699 if (face >= 0 && face < GetNumberOfSides(part)) 9210 if (tex.GetFace((uint)face).Fullbright == true)
8700 { 9211 {
8701 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9212 fullbright = ScriptBaseClass.TRUE;
8702 res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); 9213 }
9214 else
9215 {
9216 fullbright = ScriptBaseClass.FALSE;
8703 } 9217 }
9218 res.Add(new LSL_Integer(fullbright));
8704 } 9219 }
8705 break; 9220 break;
8706 9221
@@ -8722,27 +9237,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8722 break; 9237 break;
8723 9238
8724 case (int)ScriptBaseClass.PRIM_TEXGEN: 9239 case (int)ScriptBaseClass.PRIM_TEXGEN:
9240 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
8725 if (remain < 1) 9241 if (remain < 1)
8726 return null; 9242 return null;
8727 9243
8728 face=(int)rules.GetLSLIntegerItem(idx++); 9244 face = (int)rules.GetLSLIntegerItem(idx++);
8729 9245
8730 tex = part.Shape.Textures; 9246 tex = part.Shape.Textures;
8731 if (face == ScriptBaseClass.ALL_SIDES) 9247 if (face == ScriptBaseClass.ALL_SIDES)
8732 { 9248 {
8733 for (face = 0; face < GetNumberOfSides(part); face++) 9249 for (face = 0; face < GetNumberOfSides(part); face++)
8734 { 9250 {
8735 MappingType texgen = tex.GetFace((uint)face).TexMapType; 9251 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
8736 // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc. 9252 {
8737 res.Add(new LSL_Integer((uint)texgen >> 1)); 9253 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
9254 }
9255 else
9256 {
9257 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
9258 }
8738 } 9259 }
8739 } 9260 }
8740 else 9261 else
8741 { 9262 {
8742 if (face >= 0 && face < GetNumberOfSides(part)) 9263 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
9264 {
9265 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
9266 }
9267 else
8743 { 9268 {
8744 MappingType texgen = tex.GetFace((uint)face).TexMapType; 9269 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
8745 res.Add(new LSL_Integer((uint)texgen >> 1));
8746 } 9270 }
8747 } 9271 }
8748 break; 9272 break;
@@ -8766,24 +9290,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8766 if (remain < 1) 9290 if (remain < 1)
8767 return null; 9291 return null;
8768 9292
8769 face=(int)rules.GetLSLIntegerItem(idx++); 9293 face = (int)rules.GetLSLIntegerItem(idx++);
8770 9294
8771 tex = part.Shape.Textures; 9295 tex = part.Shape.Textures;
9296 float primglow;
8772 if (face == ScriptBaseClass.ALL_SIDES) 9297 if (face == ScriptBaseClass.ALL_SIDES)
8773 { 9298 {
8774 for (face = 0; face < GetNumberOfSides(part); face++) 9299 for (face = 0; face < GetNumberOfSides(part); face++)
8775 { 9300 {
8776 Primitive.TextureEntryFace texface = tex.GetFace((uint)face); 9301 primglow = tex.GetFace((uint)face).Glow;
8777 res.Add(new LSL_Float(texface.Glow)); 9302 res.Add(new LSL_Float(primglow));
8778 } 9303 }
8779 } 9304 }
8780 else 9305 else
8781 { 9306 {
8782 if (face >= 0 && face < GetNumberOfSides(part)) 9307 primglow = tex.GetFace((uint)face).Glow;
8783 { 9308 res.Add(new LSL_Float(primglow));
8784 Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
8785 res.Add(new LSL_Float(texface.Glow));
8786 }
8787 } 9309 }
8788 break; 9310 break;
8789 9311
@@ -8795,15 +9317,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8795 textColor.B)); 9317 textColor.B));
8796 res.Add(new LSL_Float(textColor.A)); 9318 res.Add(new LSL_Float(textColor.A));
8797 break; 9319 break;
9320
8798 case (int)ScriptBaseClass.PRIM_NAME: 9321 case (int)ScriptBaseClass.PRIM_NAME:
8799 res.Add(new LSL_String(part.Name)); 9322 res.Add(new LSL_String(part.Name));
8800 break; 9323 break;
9324
8801 case (int)ScriptBaseClass.PRIM_DESC: 9325 case (int)ScriptBaseClass.PRIM_DESC:
8802 res.Add(new LSL_String(part.Description)); 9326 res.Add(new LSL_String(part.Description));
8803 break; 9327 break;
8804 case (int)ScriptBaseClass.PRIM_ROT_LOCAL: 9328 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
8805 res.Add(new LSL_Rotation(part.RotationOffset)); 9329 res.Add(new LSL_Rotation(part.RotationOffset));
8806 break; 9330 break;
9331
8807 case (int)ScriptBaseClass.PRIM_POS_LOCAL: 9332 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
8808 res.Add(new LSL_Vector(GetPartLocalPos(part))); 9333 res.Add(new LSL_Vector(GetPartLocalPos(part)));
8809 break; 9334 break;
@@ -9416,8 +9941,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9416 // The function returns an ordered list 9941 // The function returns an ordered list
9417 // representing the tokens found in the supplied 9942 // representing the tokens found in the supplied
9418 // sources string. If two successive tokenizers 9943 // sources string. If two successive tokenizers
9419 // are encountered, then a NULL entry is added 9944 // are encountered, then a null-string entry is
9420 // to the list. 9945 // added to the list.
9421 // 9946 //
9422 // It is a precondition that the source and 9947 // It is a precondition that the source and
9423 // toekizer lisst are non-null. If they are null, 9948 // toekizer lisst are non-null. If they are null,
@@ -9425,7 +9950,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9425 // while their lengths are being determined. 9950 // while their lengths are being determined.
9426 // 9951 //
9427 // A small amount of working memoryis required 9952 // A small amount of working memoryis required
9428 // of approximately 8*#tokenizers. 9953 // of approximately 8*#tokenizers + 8*srcstrlen.
9429 // 9954 //
9430 // There are many ways in which this function 9955 // There are many ways in which this function
9431 // can be implemented, this implementation is 9956 // can be implemented, this implementation is
@@ -9441,155 +9966,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9441 // and eliminates redundant tokenizers as soon 9966 // and eliminates redundant tokenizers as soon
9442 // as is possible. 9967 // as is possible.
9443 // 9968 //
9444 // The implementation tries to avoid any copying 9969 // The implementation tries to minimize temporary
9445 // of arrays or other objects. 9970 // garbage generation.
9446 // </remarks> 9971 // </remarks>
9447 9972
9448 private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) 9973 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
9449 { 9974 {
9450 int beginning = 0; 9975 return ParseString2List(src, separators, spacers, true);
9451 int srclen = src.Length; 9976 }
9452 int seplen = separators.Length;
9453 object[] separray = separators.Data;
9454 int spclen = spacers.Length;
9455 object[] spcarray = spacers.Data;
9456 int mlen = seplen+spclen;
9457
9458 int[] offset = new int[mlen+1];
9459 bool[] active = new bool[mlen];
9460
9461 int best;
9462 int j;
9463
9464 // Initial capacity reduces resize cost
9465 9977
9466 LSL_List tokens = new LSL_List(); 9978 private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
9979 {
9980 int srclen = src.Length;
9981 int seplen = separators.Length;
9982 object[] separray = separators.Data;
9983 int spclen = spacers.Length;
9984 object[] spcarray = spacers.Data;
9985 int dellen = 0;
9986 string[] delarray = new string[seplen+spclen];
9467 9987
9468 // All entries are initially valid 9988 int outlen = 0;
9989 string[] outarray = new string[srclen*2+1];
9469 9990
9470 for (int i = 0; i < mlen; i++) 9991 int i, j;
9471 active[i] = true; 9992 string d;
9472 9993
9473 offset[mlen] = srclen; 9994 m_host.AddScriptLPS(1);
9474 9995
9475 while (beginning < srclen) 9996 /*
9997 * Convert separator and spacer lists to C# strings.
9998 * Also filter out null strings so we don't hang.
9999 */
10000 for (i = 0; i < seplen; i ++)
9476 { 10001 {
10002 d = separray[i].ToString();
10003 if (d.Length > 0)
10004 {
10005 delarray[dellen++] = d;
10006 }
10007 }
10008 seplen = dellen;
9477 10009
9478 best = mlen; // as bad as it gets 10010 for (i = 0; i < spclen; i ++)
10011 {
10012 d = spcarray[i].ToString();
10013 if (d.Length > 0)
10014 {
10015 delarray[dellen++] = d;
10016 }
10017 }
9479 10018
9480 // Scan for separators 10019 /*
10020 * Scan through source string from beginning to end.
10021 */
10022 for (i = 0;;)
10023 {
9481 10024
9482 for (j = 0; j < seplen; j++) 10025 /*
10026 * Find earliest delimeter in src starting at i (if any).
10027 */
10028 int earliestDel = -1;
10029 int earliestSrc = srclen;
10030 string earliestStr = null;
10031 for (j = 0; j < dellen; j ++)
9483 { 10032 {
9484 if (separray[j].ToString() == String.Empty) 10033 d = delarray[j];
9485 active[j] = false; 10034 if (d != null)
9486
9487 if (active[j])
9488 { 10035 {
9489 // scan all of the markers 10036 int index = src.IndexOf(d, i);
9490 if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) 10037 if (index < 0)
9491 { 10038 {
9492 // not present at all 10039 delarray[j] = null; // delim nowhere in src, don't check it anymore
9493 active[j] = false;
9494 } 10040 }
9495 else 10041 else if (index < earliestSrc)
9496 { 10042 {
9497 // present and correct 10043 earliestSrc = index; // where delimeter starts in source string
9498 if (offset[j] < offset[best]) 10044 earliestDel = j; // where delimeter is in delarray[]
9499 { 10045 earliestStr = d; // the delimeter string from delarray[]
9500 // closest so far 10046 if (index == i) break; // can't do any better than found at beg of string
9501 best = j;
9502 if (offset[best] == beginning)
9503 break;
9504 }
9505 } 10047 }
9506 } 10048 }
9507 } 10049 }
9508 10050
9509 // Scan for spacers 10051 /*
9510 10052 * Output source string starting at i through start of earliest delimeter.
9511 if (offset[best] != beginning) 10053 */
10054 if (keepNulls || (earliestSrc > i))
9512 { 10055 {
9513 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) 10056 outarray[outlen++] = src.Substring(i, earliestSrc - i);
9514 {
9515 if (spcarray[j-seplen].ToString() == String.Empty)
9516 active[j] = false;
9517
9518 if (active[j])
9519 {
9520 // scan all of the markers
9521 if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
9522 {
9523 // not present at all
9524 active[j] = false;
9525 }
9526 else
9527 {
9528 // present and correct
9529 if (offset[j] < offset[best])
9530 {
9531 // closest so far
9532 best = j;
9533 }
9534 }
9535 }
9536 }
9537 } 10057 }
9538 10058
9539 // This is the normal exit from the scanning loop 10059 /*
10060 * If no delimeter found at or after i, we're done scanning.
10061 */
10062 if (earliestDel < 0) break;
9540 10063
9541 if (best == mlen) 10064 /*
10065 * If delimeter was a spacer, output the spacer.
10066 */
10067 if (earliestDel >= seplen)
9542 { 10068 {
9543 // no markers were found on this pass 10069 outarray[outlen++] = earliestStr;
9544 // so we're pretty much done
9545 if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
9546 tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
9547 break;
9548 } 10070 }
9549 10071
9550 // Otherwise we just add the newly delimited token 10072 /*
9551 // and recalculate where the search should continue. 10073 * Look at rest of src string following delimeter.
9552 if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) 10074 */
9553 tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); 10075 i = earliestSrc + earliestStr.Length;
9554
9555 if (best < seplen)
9556 {
9557 beginning = offset[best] + (separray[best].ToString()).Length;
9558 }
9559 else
9560 {
9561 beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
9562 string str = spcarray[best - seplen].ToString();
9563 if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
9564 tokens.Add(new LSL_String(str));
9565 }
9566 } 10076 }
9567 10077
9568 // This an awkward an not very intuitive boundary case. If the 10078 /*
9569 // last substring is a tokenizer, then there is an implied trailing 10079 * Make up an exact-sized output array suitable for an LSL_List object.
9570 // null list entry. Hopefully the single comparison will not be too 10080 */
9571 // arduous. Alternatively the 'break' could be replced with a return 10081 object[] outlist = new object[outlen];
9572 // but that's shabby programming. 10082 for (i = 0; i < outlen; i ++)
9573
9574 if ((beginning == srclen) && (keepNulls))
9575 { 10083 {
9576 if (srclen != 0) 10084 outlist[i] = new LSL_String(outarray[i]);
9577 tokens.Add(new LSL_String(""));
9578 } 10085 }
9579 10086 return new LSL_List(outlist);
9580 return tokens;
9581 }
9582
9583 public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
9584 {
9585 m_host.AddScriptLPS(1);
9586 return this.ParseString(src, separators, spacers, false);
9587 }
9588
9589 public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
9590 {
9591 m_host.AddScriptLPS(1);
9592 return this.ParseString(src, separators, spacers, true);
9593 } 10087 }
9594 10088
9595 public LSL_Integer llGetObjectPermMask(int mask) 10089 public LSL_Integer llGetObjectPermMask(int mask)
@@ -9684,6 +10178,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9684 case 4: 10178 case 4:
9685 return (int)item.NextPermissions; 10179 return (int)item.NextPermissions;
9686 } 10180 }
10181 m_host.TaskInventory.LockItemsForRead(false);
9687 10182
9688 return -1; 10183 return -1;
9689 } 10184 }
@@ -9887,31 +10382,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9887 UUID key = new UUID(); 10382 UUID key = new UUID();
9888 if (UUID.TryParse(id, out key)) 10383 if (UUID.TryParse(id, out key))
9889 { 10384 {
9890 try 10385 // return total object mass
9891 { 10386 SceneObjectPart part = World.GetSceneObjectPart(key);
9892 SceneObjectPart obj = World.GetSceneObjectPart(World.Entities[key].LocalId); 10387 if (part != null)
9893 if (obj != null) 10388 return part.ParentGroup.GetMass();
9894 return (double)obj.GetMass(); 10389
9895 // the object is null so the key is for an avatar 10390 // the object is null so the key is for an avatar
9896 ScenePresence avatar = World.GetScenePresence(key); 10391 ScenePresence avatar = World.GetScenePresence(key);
9897 if (avatar != null) 10392 if (avatar != null)
9898 if (avatar.IsChildAgent)
9899 // reference http://www.lslwiki.net/lslwiki/wakka.php?wakka=llGetObjectMass
9900 // child agents have a mass of 1.0
9901 return 1;
9902 else
9903 return (double)avatar.GetMass();
9904 }
9905 catch (KeyNotFoundException)
9906 { 10393 {
9907 return 0; // The Object/Agent not in the region so just return zero 10394 if (avatar.IsChildAgent)
10395 {
10396 // reference http://www.lslwiki.net/lslwiki/wakka.php?wakka=llGetObjectMass
10397 // child agents have a mass of 1.0
10398 return 1;
10399 }
10400 else
10401 {
10402 return (double)avatar.GetMass();
10403 }
9908 } 10404 }
9909 } 10405 }
9910 return 0; 10406 return 0;
9911 } 10407 }
9912 10408
9913 /// <summary> 10409 /// <summary>
9914 /// illListReplaceList removes the sub-list defined by the inclusive indices 10410 /// llListReplaceList removes the sub-list defined by the inclusive indices
9915 /// start and end and inserts the src list in its place. The inclusive 10411 /// start and end and inserts the src list in its place. The inclusive
9916 /// nature of the indices means that at least one element must be deleted 10412 /// nature of the indices means that at least one element must be deleted
9917 /// if the indices are within the bounds of the existing list. I.e. 2,2 10413 /// if the indices are within the bounds of the existing list. I.e. 2,2
@@ -9968,16 +10464,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9968 // based upon end. Note that if end exceeds the upper 10464 // based upon end. Note that if end exceeds the upper
9969 // bound in this case, the entire destination list 10465 // bound in this case, the entire destination list
9970 // is removed. 10466 // is removed.
9971 else 10467 else if (start == 0)
9972 { 10468 {
9973 if (end + 1 < dest.Length) 10469 if (end + 1 < dest.Length)
9974 {
9975 return src + dest.GetSublist(end + 1, -1); 10470 return src + dest.GetSublist(end + 1, -1);
9976 }
9977 else 10471 else
9978 {
9979 return src; 10472 return src;
9980 } 10473 }
10474 else // Start < 0
10475 {
10476 if (end + 1 < dest.Length)
10477 return dest.GetSublist(end + 1, -1);
10478 else
10479 return new LSL_List();
9981 } 10480 }
9982 } 10481 }
9983 // Finally, if start > end, we strip away a prefix and 10482 // Finally, if start > end, we strip away a prefix and
@@ -10028,17 +10527,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10028 int width = 0; 10527 int width = 0;
10029 int height = 0; 10528 int height = 0;
10030 10529
10031 ParcelMediaCommandEnum? commandToSend = null; 10530 uint commandToSend = 0;
10032 float time = 0.0f; // default is from start 10531 float time = 0.0f; // default is from start
10033 10532
10034 ScenePresence presence = null; 10533 ScenePresence presence = null;
10035 10534
10036 for (int i = 0; i < commandList.Data.Length; i++) 10535 for (int i = 0; i < commandList.Data.Length; i++)
10037 { 10536 {
10038 ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; 10537 uint command = (uint)(commandList.GetLSLIntegerItem(i));
10039 switch (command) 10538 switch (command)
10040 { 10539 {
10041 case ParcelMediaCommandEnum.Agent: 10540 case (uint)ParcelMediaCommandEnum.Agent:
10042 // we send only to one agent 10541 // we send only to one agent
10043 if ((i + 1) < commandList.Length) 10542 if ((i + 1) < commandList.Length)
10044 { 10543 {
@@ -10055,25 +10554,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10055 } 10554 }
10056 break; 10555 break;
10057 10556
10058 case ParcelMediaCommandEnum.Loop: 10557 case (uint)ParcelMediaCommandEnum.Loop:
10059 loop = 1; 10558 loop = 1;
10060 commandToSend = command; 10559 commandToSend = command;
10061 update = true; //need to send the media update packet to set looping 10560 update = true; //need to send the media update packet to set looping
10062 break; 10561 break;
10063 10562
10064 case ParcelMediaCommandEnum.Play: 10563 case (uint)ParcelMediaCommandEnum.Play:
10065 loop = 0; 10564 loop = 0;
10066 commandToSend = command; 10565 commandToSend = command;
10067 update = true; //need to send the media update packet to make sure it doesn't loop 10566 update = true; //need to send the media update packet to make sure it doesn't loop
10068 break; 10567 break;
10069 10568
10070 case ParcelMediaCommandEnum.Pause: 10569 case (uint)ParcelMediaCommandEnum.Pause:
10071 case ParcelMediaCommandEnum.Stop: 10570 case (uint)ParcelMediaCommandEnum.Stop:
10072 case ParcelMediaCommandEnum.Unload: 10571 case (uint)ParcelMediaCommandEnum.Unload:
10073 commandToSend = command; 10572 commandToSend = command;
10074 break; 10573 break;
10075 10574
10076 case ParcelMediaCommandEnum.Url: 10575 case (uint)ParcelMediaCommandEnum.Url:
10077 if ((i + 1) < commandList.Length) 10576 if ((i + 1) < commandList.Length)
10078 { 10577 {
10079 if (commandList.Data[i + 1] is LSL_String) 10578 if (commandList.Data[i + 1] is LSL_String)
@@ -10086,7 +10585,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10086 } 10585 }
10087 break; 10586 break;
10088 10587
10089 case ParcelMediaCommandEnum.Texture: 10588 case (uint)ParcelMediaCommandEnum.Texture:
10090 if ((i + 1) < commandList.Length) 10589 if ((i + 1) < commandList.Length)
10091 { 10590 {
10092 if (commandList.Data[i + 1] is LSL_String) 10591 if (commandList.Data[i + 1] is LSL_String)
@@ -10099,7 +10598,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10099 } 10598 }
10100 break; 10599 break;
10101 10600
10102 case ParcelMediaCommandEnum.Time: 10601 case (uint)ParcelMediaCommandEnum.Time:
10103 if ((i + 1) < commandList.Length) 10602 if ((i + 1) < commandList.Length)
10104 { 10603 {
10105 if (commandList.Data[i + 1] is LSL_Float) 10604 if (commandList.Data[i + 1] is LSL_Float)
@@ -10111,7 +10610,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10111 } 10610 }
10112 break; 10611 break;
10113 10612
10114 case ParcelMediaCommandEnum.AutoAlign: 10613 case (uint)ParcelMediaCommandEnum.AutoAlign:
10115 if ((i + 1) < commandList.Length) 10614 if ((i + 1) < commandList.Length)
10116 { 10615 {
10117 if (commandList.Data[i + 1] is LSL_Integer) 10616 if (commandList.Data[i + 1] is LSL_Integer)
@@ -10125,7 +10624,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10125 } 10624 }
10126 break; 10625 break;
10127 10626
10128 case ParcelMediaCommandEnum.Type: 10627 case (uint)ParcelMediaCommandEnum.Type:
10129 if ((i + 1) < commandList.Length) 10628 if ((i + 1) < commandList.Length)
10130 { 10629 {
10131 if (commandList.Data[i + 1] is LSL_String) 10630 if (commandList.Data[i + 1] is LSL_String)
@@ -10138,7 +10637,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10138 } 10637 }
10139 break; 10638 break;
10140 10639
10141 case ParcelMediaCommandEnum.Desc: 10640 case (uint)ParcelMediaCommandEnum.Desc:
10142 if ((i + 1) < commandList.Length) 10641 if ((i + 1) < commandList.Length)
10143 { 10642 {
10144 if (commandList.Data[i + 1] is LSL_String) 10643 if (commandList.Data[i + 1] is LSL_String)
@@ -10151,7 +10650,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10151 } 10650 }
10152 break; 10651 break;
10153 10652
10154 case ParcelMediaCommandEnum.Size: 10653 case (uint)ParcelMediaCommandEnum.Size:
10155 if ((i + 2) < commandList.Length) 10654 if ((i + 2) < commandList.Length)
10156 { 10655 {
10157 if (commandList.Data[i + 1] is LSL_Integer) 10656 if (commandList.Data[i + 1] is LSL_Integer)
@@ -10221,7 +10720,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10221 } 10720 }
10222 } 10721 }
10223 10722
10224 if (commandToSend != null) 10723 if (commandToSend != 0)
10225 { 10724 {
10226 // the commandList contained a start/stop/... command, too 10725 // the commandList contained a start/stop/... command, too
10227 if (presence == null) 10726 if (presence == null)
@@ -10258,7 +10757,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10258 10757
10259 if (aList.Data[i] != null) 10758 if (aList.Data[i] != null)
10260 { 10759 {
10261 switch ((ParcelMediaCommandEnum) aList.Data[i]) 10760 switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
10262 { 10761 {
10263 case ParcelMediaCommandEnum.Url: 10762 case ParcelMediaCommandEnum.Url:
10264 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition).MediaURL)); 10763 list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition).MediaURL));
@@ -10315,15 +10814,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10315 10814
10316 if (quick_pay_buttons.Data.Length < 4) 10815 if (quick_pay_buttons.Data.Length < 4)
10317 { 10816 {
10318 LSLError("List must have at least 4 elements"); 10817 int x;
10319 return; 10818 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
10819 {
10820 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
10821 }
10320 } 10822 }
10321 m_host.ParentGroup.RootPart.PayPrice[0]=price; 10823 int[] nPrice = new int[5];
10322 10824 nPrice[0] = price;
10323 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 10825 nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
10324 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 10826 nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
10325 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 10827 nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
10326 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 10828 nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
10829 m_host.ParentGroup.RootPart.PayPrice = nPrice;
10327 m_host.ParentGroup.HasGroupChanged = true; 10830 m_host.ParentGroup.HasGroupChanged = true;
10328 } 10831 }
10329 10832
@@ -10340,7 +10843,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10340 return Vector3.Zero; 10843 return Vector3.Zero;
10341 } 10844 }
10342 10845
10343 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10846// ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
10847 ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
10344 if (presence != null) 10848 if (presence != null)
10345 { 10849 {
10346 LSL_Vector pos = new LSL_Vector(presence.CameraPosition); 10850 LSL_Vector pos = new LSL_Vector(presence.CameraPosition);
@@ -10363,7 +10867,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10363 return Quaternion.Identity; 10867 return Quaternion.Identity;
10364 } 10868 }
10365 10869
10366 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 10870// ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
10871 ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
10367 if (presence != null) 10872 if (presence != null)
10368 { 10873 {
10369 return new LSL_Rotation(presence.CameraRotation); 10874 return new LSL_Rotation(presence.CameraRotation);
@@ -10423,14 +10928,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10423 { 10928 {
10424 m_host.AddScriptLPS(1); 10929 m_host.AddScriptLPS(1);
10425 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0); 10930 DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0);
10426 if (detectedParams == null) return; // only works on the first detected avatar 10931 if (detectedParams == null)
10427 10932 {
10933 if (m_host.ParentGroup.IsAttachment == true)
10934 {
10935 detectedParams = new DetectParams();
10936 detectedParams.Key = m_host.OwnerID;
10937 }
10938 else
10939 {
10940 return;
10941 }
10942 }
10943
10428 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 10944 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
10429 if (avatar != null) 10945 if (avatar != null)
10430 { 10946 {
10431 avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, 10947 avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name,
10432 simname, pos, lookAt); 10948 simname, pos, lookAt);
10433 } 10949 }
10950
10434 ScriptSleep(1000); 10951 ScriptSleep(1000);
10435 } 10952 }
10436 10953
@@ -10554,12 +11071,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10554 11071
10555 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 11072 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
10556 object[] data = rules.Data; 11073 object[] data = rules.Data;
10557 for (int i = 0; i < data.Length; ++i) { 11074 for (int i = 0; i < data.Length; ++i)
11075 {
10558 int type = Convert.ToInt32(data[i++].ToString()); 11076 int type = Convert.ToInt32(data[i++].ToString());
10559 if (i >= data.Length) break; // odd number of entries => ignore the last 11077 if (i >= data.Length) break; // odd number of entries => ignore the last
10560 11078
10561 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 11079 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
10562 switch (type) { 11080 switch (type)
11081 {
10563 case ScriptBaseClass.CAMERA_FOCUS: 11082 case ScriptBaseClass.CAMERA_FOCUS:
10564 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 11083 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
10565 case ScriptBaseClass.CAMERA_POSITION: 11084 case ScriptBaseClass.CAMERA_POSITION:
@@ -10664,19 +11183,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10664 public LSL_String llXorBase64StringsCorrect(string str1, string str2) 11183 public LSL_String llXorBase64StringsCorrect(string str1, string str2)
10665 { 11184 {
10666 m_host.AddScriptLPS(1); 11185 m_host.AddScriptLPS(1);
10667 string ret = String.Empty; 11186
10668 string src1 = llBase64ToString(str1); 11187 if (str1 == String.Empty)
10669 string src2 = llBase64ToString(str2); 11188 return String.Empty;
10670 int c = 0; 11189 if (str2 == String.Empty)
10671 for (int i = 0; i < src1.Length; i++) 11190 return str1;
11191
11192 int len = str2.Length;
11193 if ((len % 4) != 0) // LL is EVIL!!!!
11194 {
11195 while (str2.EndsWith("="))
11196 str2 = str2.Substring(0, str2.Length - 1);
11197
11198 len = str2.Length;
11199 int mod = len % 4;
11200
11201 if (mod == 1)
11202 str2 = str2.Substring(0, str2.Length - 1);
11203 else if (mod == 2)
11204 str2 += "==";
11205 else if (mod == 3)
11206 str2 += "=";
11207 }
11208
11209 byte[] data1;
11210 byte[] data2;
11211 try
11212 {
11213 data1 = Convert.FromBase64String(str1);
11214 data2 = Convert.FromBase64String(str2);
11215 }
11216 catch (Exception)
11217 {
11218 return new LSL_String(String.Empty);
11219 }
11220
11221 byte[] d2 = new Byte[data1.Length];
11222 int pos = 0;
11223
11224 if (data1.Length <= data2.Length)
10672 { 11225 {
10673 ret += (char) (src1[i] ^ src2[c]); 11226 Array.Copy(data2, 0, d2, 0, data1.Length);
11227 }
11228 else
11229 {
11230 while (pos < data1.Length)
11231 {
11232 len = data1.Length - pos;
11233 if (len > data2.Length)
11234 len = data2.Length;
10674 11235
10675 c++; 11236 Array.Copy(data2, 0, d2, pos, len);
10676 if (c >= src2.Length) 11237 pos += len;
10677 c = 0; 11238 }
10678 } 11239 }
10679 return llStringToBase64(ret); 11240
11241 for (pos = 0 ; pos < data1.Length ; pos++ )
11242 data1[pos] ^= d2[pos];
11243
11244 return Convert.ToBase64String(data1);
10680 } 11245 }
10681 11246
10682 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) 11247 public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -10780,16 +11345,72 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10780 if (userAgent != null) 11345 if (userAgent != null)
10781 httpHeaders["User-Agent"] = userAgent; 11346 httpHeaders["User-Agent"] = userAgent;
10782 11347
11348 // See if the URL contains any header hacks
11349 string[] urlParts = url.Split(new char[] {'\n'});
11350 if (urlParts.Length > 1)
11351 {
11352 // Iterate the passed headers and parse them
11353 for (int i = 1 ; i < urlParts.Length ; i++ )
11354 {
11355 // The rest of those would be added to the body in SL.
11356 // Let's not do that.
11357 if (urlParts[i] == String.Empty)
11358 break;
11359
11360 // See if this could be a valid header
11361 string[] headerParts = urlParts[i].Split(new char[] {':'}, 2);
11362 if (headerParts.Length != 2)
11363 continue;
11364
11365 string headerName = headerParts[0].Trim();
11366 string headerValue = headerParts[1].Trim();
11367
11368 // Filter out headers that could be used to abuse
11369 // another system or cloak the request
11370 if (headerName.ToLower() == "x-secondlife-shard" ||
11371 headerName.ToLower() == "x-secondlife-object-name" ||
11372 headerName.ToLower() == "x-secondlife-object-key" ||
11373 headerName.ToLower() == "x-secondlife-region" ||
11374 headerName.ToLower() == "x-secondlife-local-position" ||
11375 headerName.ToLower() == "x-secondlife-local-velocity" ||
11376 headerName.ToLower() == "x-secondlife-local-rotation" ||
11377 headerName.ToLower() == "x-secondlife-owner-name" ||
11378 headerName.ToLower() == "x-secondlife-owner-key" ||
11379 headerName.ToLower() == "connection" ||
11380 headerName.ToLower() == "content-length" ||
11381 headerName.ToLower() == "from" ||
11382 headerName.ToLower() == "host" ||
11383 headerName.ToLower() == "proxy-authorization" ||
11384 headerName.ToLower() == "referer" ||
11385 headerName.ToLower() == "trailer" ||
11386 headerName.ToLower() == "transfer-encoding" ||
11387 headerName.ToLower() == "via" ||
11388 headerName.ToLower() == "authorization")
11389 continue;
11390
11391 httpHeaders[headerName] = headerValue;
11392 }
11393
11394 // Finally, strip any protocol specifier from the URL
11395 url = urlParts[0].Trim();
11396 int idx = url.IndexOf(" HTTP/");
11397 if (idx != -1)
11398 url = url.Substring(0, idx);
11399 }
11400
10783 string authregex = @"^(https?:\/\/)(\w+):(\w+)@(.*)$"; 11401 string authregex = @"^(https?:\/\/)(\w+):(\w+)@(.*)$";
10784 Regex r = new Regex(authregex); 11402 Regex r = new Regex(authregex);
10785 int[] gnums = r.GetGroupNumbers(); 11403 int[] gnums = r.GetGroupNumbers();
10786 Match m = r.Match(url); 11404 Match m = r.Match(url);
10787 if (m.Success) { 11405 if (m.Success)
10788 for (int i = 1; i < gnums.Length; i++) { 11406 {
11407 for (int i = 1; i < gnums.Length; i++)
11408 {
10789 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 11409 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
10790 //CaptureCollection cc = g.Captures; 11410 //CaptureCollection cc = g.Captures;
10791 } 11411 }
10792 if (m.Groups.Count == 5) { 11412 if (m.Groups.Count == 5)
11413 {
10793 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 11414 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
10794 url = m.Groups[1].ToString() + m.Groups[4].ToString(); 11415 url = m.Groups[1].ToString() + m.Groups[4].ToString();
10795 } 11416 }
@@ -10992,6 +11613,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10992 11613
10993 LSL_List ret = new LSL_List(); 11614 LSL_List ret = new LSL_List();
10994 UUID key = new UUID(); 11615 UUID key = new UUID();
11616
11617
10995 if (UUID.TryParse(id, out key)) 11618 if (UUID.TryParse(id, out key))
10996 { 11619 {
10997 ScenePresence av = World.GetScenePresence(key); 11620 ScenePresence av = World.GetScenePresence(key);
@@ -11009,13 +11632,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11009 ret.Add(new LSL_String("")); 11632 ret.Add(new LSL_String(""));
11010 break; 11633 break;
11011 case ScriptBaseClass.OBJECT_POS: 11634 case ScriptBaseClass.OBJECT_POS:
11012 ret.Add(new LSL_Vector((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z)); 11635 Vector3 avpos;
11636
11637 if (av.ParentID != 0 && av.ParentPart != null)
11638 {
11639 avpos = av.OffsetPosition;
11640
11641 Vector3 sitOffset = (Zrot(av.Rotation)) * (av.Appearance.AvatarHeight * 0.02638f *2.0f);
11642 avpos -= sitOffset;
11643
11644 avpos = av.ParentPart.GetWorldPosition() + avpos * av.ParentPart.GetWorldRotation();
11645 }
11646 else
11647 avpos = av.AbsolutePosition;
11648
11649 ret.Add(new LSL_Vector((double)avpos.X, (double)avpos.Y, (double)avpos.Z));
11013 break; 11650 break;
11014 case ScriptBaseClass.OBJECT_ROT: 11651 case ScriptBaseClass.OBJECT_ROT:
11015 ret.Add(new LSL_Rotation(av.GetWorldRotation())); 11652 Quaternion avrot = av.Rotation;
11653 if (av.ParentID != 0 && av.ParentPart != null)
11654 {
11655 avrot = av.ParentPart.GetWorldRotation() * avrot;
11656 }
11657 ret.Add(new LSL_Rotation((double)avrot.X, (double)avrot.Y, (double)avrot.Z, (double)avrot.W));
11016 break; 11658 break;
11017 case ScriptBaseClass.OBJECT_VELOCITY: 11659 case ScriptBaseClass.OBJECT_VELOCITY:
11018 ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z)); 11660 Vector3 avvel = av.Velocity;
11661 ret.Add(new LSL_Vector((double)avvel.X, (double)avvel.Y, (double)avvel.Z));
11019 break; 11662 break;
11020 case ScriptBaseClass.OBJECT_OWNER: 11663 case ScriptBaseClass.OBJECT_OWNER:
11021 ret.Add(new LSL_String(id)); 11664 ret.Add(new LSL_String(id));
@@ -11100,11 +11743,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11100 case ScriptBaseClass.OBJECT_NAME: 11743 case ScriptBaseClass.OBJECT_NAME:
11101 ret.Add(new LSL_String(obj.Name)); 11744 ret.Add(new LSL_String(obj.Name));
11102 break; 11745 break;
11103 case ScriptBaseClass.OBJECT_DESC: 11746 case ScriptBaseClass.OBJECT_DESC:
11104 ret.Add(new LSL_String(obj.Description)); 11747 ret.Add(new LSL_String(obj.Description));
11105 break; 11748 break;
11106 case ScriptBaseClass.OBJECT_POS: 11749 case ScriptBaseClass.OBJECT_POS:
11107 ret.Add(new LSL_Vector(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z)); 11750 Vector3 opos = obj.AbsolutePosition;
11751 ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z));
11108 break; 11752 break;
11109 case ScriptBaseClass.OBJECT_ROT: 11753 case ScriptBaseClass.OBJECT_ROT:
11110 { 11754 {
@@ -11154,9 +11798,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11154 // The value returned in SL for normal prims is prim count 11798 // The value returned in SL for normal prims is prim count
11155 ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount)); 11799 ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount));
11156 break; 11800 break;
11157 // The following 3 costs I have intentionaly coded to return zero. They are part of 11801
11158 // "Land Impact" calculations. These calculations are probably not applicable 11802 // costs below may need to be diferent for root parts, need to check
11159 // to OpenSim and are not yet complete in SL
11160 case ScriptBaseClass.OBJECT_SERVER_COST: 11803 case ScriptBaseClass.OBJECT_SERVER_COST:
11161 // The linden calculation is here 11804 // The linden calculation is here
11162 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight 11805 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight
@@ -11164,16 +11807,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11164 ret.Add(new LSL_Float(0)); 11807 ret.Add(new LSL_Float(0));
11165 break; 11808 break;
11166 case ScriptBaseClass.OBJECT_STREAMING_COST: 11809 case ScriptBaseClass.OBJECT_STREAMING_COST:
11167 // The linden calculation is here 11810 // The value returned in SL for normal prims is prim count * 0.06
11168 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Streaming_Cost 11811 ret.Add(new LSL_Float(obj.StreamingCost));
11169 // The value returned in SL for normal prims looks like the prim count * 0.06
11170 ret.Add(new LSL_Float(0));
11171 break; 11812 break;
11172 case ScriptBaseClass.OBJECT_PHYSICS_COST: 11813 case ScriptBaseClass.OBJECT_PHYSICS_COST:
11173 // The linden calculation is here 11814 // The value returned in SL for normal prims is prim count
11174 // http://wiki.secondlife.com/wiki/Mesh/Mesh_physics 11815 ret.Add(new LSL_Float(obj.PhysicsCost));
11175 // The value returned in SL for normal prims looks like the prim count
11176 ret.Add(new LSL_Float(0));
11177 break; 11816 break;
11178 case ScriptBaseClass.OBJECT_CHARACTER_TIME: // Pathfinding 11817 case ScriptBaseClass.OBJECT_CHARACTER_TIME: // Pathfinding
11179 ret.Add(new LSL_Float(0)); 11818 ret.Add(new LSL_Float(0));
@@ -11432,15 +12071,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11432 return result; 12071 return result;
11433 } 12072 }
11434 12073
11435 public void print(string str) 12074 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
11436 { 12075 {
11437 // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print 12076 List<SceneObjectPart> parts = GetLinkParts(link);
11438 IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "OSSL"); 12077 if (parts.Count < 1)
11439 if (ossl != null) 12078 return 0;
11440 { 12079
11441 ossl.CheckThreatLevel(ThreatLevel.High, "print"); 12080 return GetNumberOfSides(parts[0]);
11442 m_log.Info("LSL print():" + str);
11443 }
11444 } 12081 }
11445 12082
11446 private string Name2Username(string name) 12083 private string Name2Username(string name)
@@ -11485,7 +12122,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11485 12122
11486 return rq.ToString(); 12123 return rq.ToString();
11487 } 12124 }
11488 12125/*
12126 private void SayShoutTimerElapsed(Object sender, ElapsedEventArgs args)
12127 {
12128 m_SayShoutCount = 0;
12129 }
12130*/
11489 private struct Tri 12131 private struct Tri
11490 { 12132 {
11491 public Vector3 p1; 12133 public Vector3 p1;
@@ -11634,9 +12276,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11634 12276
11635 ContactResult result = new ContactResult (); 12277 ContactResult result = new ContactResult ();
11636 result.ConsumerID = group.LocalId; 12278 result.ConsumerID = group.LocalId;
11637 result.Depth = intersection.distance; 12279// result.Depth = intersection.distance;
11638 result.Normal = intersection.normal; 12280 result.Normal = intersection.normal;
11639 result.Pos = intersection.ipoint; 12281 result.Pos = intersection.ipoint;
12282 result.Depth = Vector3.Mag(rayStart - result.Pos);
11640 12283
11641 contacts.Add(result); 12284 contacts.Add(result);
11642 }); 12285 });
@@ -11769,6 +12412,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11769 12412
11770 return contacts[0]; 12413 return contacts[0];
11771 } 12414 }
12415/*
12416 // not done:
12417 private ContactResult[] testRay2NonPhysicalPhantom(Vector3 rayStart, Vector3 raydir, float raylenght)
12418 {
12419 ContactResult[] contacts = null;
12420 World.ForEachSOG(delegate(SceneObjectGroup group)
12421 {
12422 if (m_host.ParentGroup == group)
12423 return;
12424
12425 if (group.IsAttachment)
12426 return;
12427
12428 if(group.RootPart.PhysActor != null)
12429 return;
12430
12431 contacts = group.RayCastGroupPartsOBBNonPhysicalPhantom(rayStart, raydir, raylenght);
12432 });
12433 return contacts;
12434 }
12435*/
11772 12436
11773 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) 12437 public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
11774 { 12438 {
@@ -11892,18 +12556,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11892 } 12556 }
11893 } 12557 }
11894 12558
12559 // Double check this
11895 if (checkTerrain) 12560 if (checkTerrain)
11896 { 12561 {
11897 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd); 12562 bool skipGroundCheck = false;
11898 if (groundContact != null) 12563
11899 results.Add((ContactResult)groundContact); 12564 foreach (ContactResult c in results)
12565 {
12566 if (c.ConsumerID == 0) // Physics gave us a ground collision
12567 skipGroundCheck = true;
12568 }
12569
12570 if (!skipGroundCheck)
12571 {
12572 ContactResult? groundContact = GroundIntersection(rayStart, rayEnd);
12573 if (groundContact != null)
12574 results.Add((ContactResult)groundContact);
12575 }
11900 } 12576 }
11901 12577
11902 results.Sort(delegate(ContactResult a, ContactResult b) 12578 results.Sort(delegate(ContactResult a, ContactResult b)
11903 { 12579 {
11904 return a.Depth.CompareTo(b.Depth); 12580 return a.Depth.CompareTo(b.Depth);
11905 }); 12581 });
11906 12582
11907 int values = 0; 12583 int values = 0;
11908 SceneObjectGroup thisgrp = m_host.ParentGroup; 12584 SceneObjectGroup thisgrp = m_host.ParentGroup;
11909 12585
@@ -11996,7 +12672,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11996 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD: 12672 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD:
11997 if (!isAccount) return 0; 12673 if (!isAccount) return 0;
11998 if (estate.HasAccess(id)) return 1; 12674 if (estate.HasAccess(id)) return 1;
11999 if (estate.IsBanned(id)) 12675 if (estate.IsBanned(id, World.GetUserFlags(id)))
12000 estate.RemoveBan(id); 12676 estate.RemoveBan(id);
12001 estate.AddEstateUser(id); 12677 estate.AddEstateUser(id);
12002 break; 12678 break;
@@ -12015,14 +12691,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12015 break; 12691 break;
12016 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD: 12692 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD:
12017 if (!isAccount) return 0; 12693 if (!isAccount) return 0;
12018 if (estate.IsBanned(id)) return 1; 12694 if (estate.IsBanned(id, World.GetUserFlags(id))) return 1;
12019 EstateBan ban = new EstateBan(); 12695 EstateBan ban = new EstateBan();
12020 ban.EstateID = estate.EstateID; 12696 ban.EstateID = estate.EstateID;
12021 ban.BannedUserID = id; 12697 ban.BannedUserID = id;
12022 estate.AddBan(ban); 12698 estate.AddBan(ban);
12023 break; 12699 break;
12024 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE: 12700 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE:
12025 if (!isAccount || !estate.IsBanned(id)) return 0; 12701 if (!isAccount || !estate.IsBanned(id, World.GetUserFlags(id))) return 0;
12026 estate.RemoveBan(id); 12702 estate.RemoveBan(id);
12027 break; 12703 break;
12028 default: return 0; 12704 default: return 0;
@@ -12087,13 +12763,63 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12087 public void llCollisionSprite(string impact_sprite) 12763 public void llCollisionSprite(string impact_sprite)
12088 { 12764 {
12089 m_host.AddScriptLPS(1); 12765 m_host.AddScriptLPS(1);
12090 NotImplemented("llCollisionSprite"); 12766 // Viewer 2.0 broke this and it's likely LL has no intention
12767 // of fixing it. Therefore, letting this be a NOP seems appropriate.
12091 } 12768 }
12092 12769
12093 public void llGodLikeRezObject(string inventory, LSL_Vector pos) 12770 public void llGodLikeRezObject(string inventory, LSL_Vector pos)
12094 { 12771 {
12095 m_host.AddScriptLPS(1); 12772 m_host.AddScriptLPS(1);
12096 NotImplemented("llGodLikeRezObject"); 12773
12774 if (!World.Permissions.IsGod(m_host.OwnerID))
12775 NotImplemented("llGodLikeRezObject");
12776
12777 AssetBase rezAsset = World.AssetService.Get(inventory);
12778 if (rezAsset == null)
12779 {
12780 llSay(0, "Asset not found");
12781 return;
12782 }
12783
12784 SceneObjectGroup group = null;
12785
12786 try
12787 {
12788 string xmlData = Utils.BytesToString(rezAsset.Data);
12789 group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
12790 }
12791 catch
12792 {
12793 llSay(0, "Asset not found");
12794 return;
12795 }
12796
12797 if (group == null)
12798 {
12799 llSay(0, "Asset not found");
12800 return;
12801 }
12802
12803 group.RootPart.AttachPoint = group.RootPart.Shape.State;
12804 group.RootPart.AttachOffset = group.AbsolutePosition;
12805
12806 group.ResetIDs();
12807
12808 Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
12809 World.AddNewSceneObject(group, true, llpos, Quaternion.Identity, Vector3.Zero);
12810 group.CreateScriptInstances(0, true, World.DefaultScriptEngine, 3);
12811 group.ScheduleGroupForFullUpdate();
12812
12813 // objects rezzed with this method are die_at_edge by default.
12814 group.RootPart.SetDieAtEdge(true);
12815
12816 group.ResumeScripts();
12817
12818 m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
12819 "object_rez", new Object[] {
12820 new LSL_String(
12821 group.RootPart.UUID.ToString()) },
12822 new DetectParams[0]));
12097 } 12823 }
12098 12824
12099 public LSL_String llTransferLindenDollars(string destination, int amount) 12825 public LSL_String llTransferLindenDollars(string destination, int amount)
@@ -12144,8 +12870,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12144 return; 12870 return;
12145 } 12871 }
12146 12872
12873 string reason;
12147 bool result = money.ObjectGiveMoney( 12874 bool result = money.ObjectGiveMoney(
12148 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); 12875 m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount, txn, out reason);
12149 12876
12150 if (result) 12877 if (result)
12151 { 12878 {
@@ -12153,7 +12880,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12153 return; 12880 return;
12154 } 12881 }
12155 12882
12156 replydata = "LINDENDOLLAR_INSUFFICIENTFUNDS"; 12883 replydata = reason;
12157 } 12884 }
12158 finally 12885 finally
12159 { 12886 {
@@ -12170,6 +12897,610 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12170 } 12897 }
12171 12898
12172 #endregion 12899 #endregion
12900
12901 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
12902 {
12903 SceneObjectGroup group = m_host.ParentGroup;
12904
12905 if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
12906 return;
12907 if (group.IsAttachment)
12908 return;
12909
12910 if (frames.Data.Length > 0) // We are getting a new motion
12911 {
12912 if (group.RootPart.KeyframeMotion != null)
12913 group.RootPart.KeyframeMotion.Delete();
12914 group.RootPart.KeyframeMotion = null;
12915
12916 int idx = 0;
12917
12918 KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
12919 KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
12920
12921 while (idx < options.Data.Length)
12922 {
12923 int option = (int)options.GetLSLIntegerItem(idx++);
12924 int remain = options.Data.Length - idx;
12925
12926 switch (option)
12927 {
12928 case ScriptBaseClass.KFM_MODE:
12929 if (remain < 1)
12930 break;
12931 int modeval = (int)options.GetLSLIntegerItem(idx++);
12932 switch(modeval)
12933 {
12934 case ScriptBaseClass.KFM_FORWARD:
12935 mode = KeyframeMotion.PlayMode.Forward;
12936 break;
12937 case ScriptBaseClass.KFM_REVERSE:
12938 mode = KeyframeMotion.PlayMode.Reverse;
12939 break;
12940 case ScriptBaseClass.KFM_LOOP:
12941 mode = KeyframeMotion.PlayMode.Loop;
12942 break;
12943 case ScriptBaseClass.KFM_PING_PONG:
12944 mode = KeyframeMotion.PlayMode.PingPong;
12945 break;
12946 }
12947 break;
12948 case ScriptBaseClass.KFM_DATA:
12949 if (remain < 1)
12950 break;
12951 int dataval = (int)options.GetLSLIntegerItem(idx++);
12952 data = (KeyframeMotion.DataFormat)dataval;
12953 break;
12954 }
12955 }
12956
12957 group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data);
12958
12959 idx = 0;
12960
12961 int elemLength = 2;
12962 if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation))
12963 elemLength = 3;
12964
12965 List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>();
12966 while (idx < frames.Data.Length)
12967 {
12968 int remain = frames.Data.Length - idx;
12969
12970 if (remain < elemLength)
12971 break;
12972
12973 KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe();
12974 frame.Position = null;
12975 frame.Rotation = null;
12976
12977 if ((data & KeyframeMotion.DataFormat.Translation) != 0)
12978 {
12979 LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++);
12980 frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z);
12981 }
12982 if ((data & KeyframeMotion.DataFormat.Rotation) != 0)
12983 {
12984 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
12985 Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
12986 q.Normalize();
12987 frame.Rotation = q;
12988 }
12989
12990 float tempf = (float)frames.GetLSLFloatItem(idx++);
12991 frame.TimeMS = (int)(tempf * 1000.0f);
12992
12993 keyframes.Add(frame);
12994 }
12995
12996 group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray());
12997 group.RootPart.KeyframeMotion.Start();
12998 }
12999 else
13000 {
13001 if (group.RootPart.KeyframeMotion == null)
13002 return;
13003
13004 if (options.Data.Length == 0)
13005 {
13006 group.RootPart.KeyframeMotion.Stop();
13007 return;
13008 }
13009
13010 int code = (int)options.GetLSLIntegerItem(0);
13011
13012 int idx = 0;
13013
13014 while (idx < options.Data.Length)
13015 {
13016 int option = (int)options.GetLSLIntegerItem(idx++);
13017 int remain = options.Data.Length - idx;
13018
13019 switch (option)
13020 {
13021 case ScriptBaseClass.KFM_COMMAND:
13022 int cmd = (int)options.GetLSLIntegerItem(idx++);
13023 switch (cmd)
13024 {
13025 case ScriptBaseClass.KFM_CMD_PLAY:
13026 group.RootPart.KeyframeMotion.Start();
13027 break;
13028 case ScriptBaseClass.KFM_CMD_STOP:
13029 group.RootPart.KeyframeMotion.Stop();
13030 break;
13031 case ScriptBaseClass.KFM_CMD_PAUSE:
13032 group.RootPart.KeyframeMotion.Pause();
13033 break;
13034 }
13035 break;
13036 }
13037 }
13038 }
13039 }
13040
13041 protected LSL_List SetPrimParams(ScenePresence av, LSL_List rules, string originFunc, ref uint rulesParsed)
13042 {
13043 //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
13044
13045 int idx = 0;
13046 int idxStart = 0;
13047
13048 bool positionChanged = false;
13049 Vector3 finalPos = Vector3.Zero;
13050
13051 try
13052 {
13053 while (idx < rules.Length)
13054 {
13055 ++rulesParsed;
13056 int code = rules.GetLSLIntegerItem(idx++);
13057
13058 int remain = rules.Length - idx;
13059 idxStart = idx;
13060
13061 switch (code)
13062 {
13063 case (int)ScriptBaseClass.PRIM_POSITION:
13064 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
13065 {
13066 if (remain < 1)
13067 return null;
13068
13069 LSL_Vector v;
13070 v = rules.GetVector3Item(idx++);
13071
13072 SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
13073 if (part == null)
13074 break;
13075
13076 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
13077 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
13078 if (part.LinkNum > 1)
13079 {
13080 localRot = GetPartLocalRot(part);
13081 localPos = GetPartLocalPos(part);
13082 }
13083
13084 v -= localPos;
13085 v /= localRot;
13086
13087 LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
13088
13089 v = v + 2 * sitOffset;
13090
13091 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
13092 av.SendAvatarDataToAllAgents();
13093
13094 }
13095 break;
13096
13097 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
13098 case (int)ScriptBaseClass.PRIM_ROTATION:
13099 {
13100 if (remain < 1)
13101 return null;
13102
13103 LSL_Rotation r;
13104 r = rules.GetQuaternionItem(idx++);
13105
13106 SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
13107 if (part == null)
13108 break;
13109
13110 LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
13111 LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
13112
13113 if (part.LinkNum > 1)
13114 localRot = GetPartLocalRot(part);
13115
13116 r = r * llGetRootRotation() / localRot;
13117 av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
13118 av.SendAvatarDataToAllAgents();
13119 }
13120 break;
13121
13122 // parse rest doing nothing but number of parameters error check
13123 case (int)ScriptBaseClass.PRIM_SIZE:
13124 case (int)ScriptBaseClass.PRIM_MATERIAL:
13125 case (int)ScriptBaseClass.PRIM_PHANTOM:
13126 case (int)ScriptBaseClass.PRIM_PHYSICS:
13127 case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
13128 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
13129 case (int)ScriptBaseClass.PRIM_NAME:
13130 case (int)ScriptBaseClass.PRIM_DESC:
13131 if (remain < 1)
13132 return null;
13133 idx++;
13134 break;
13135
13136 case (int)ScriptBaseClass.PRIM_GLOW:
13137 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
13138 case (int)ScriptBaseClass.PRIM_TEXGEN:
13139 if (remain < 2)
13140 return null;
13141 idx += 2;
13142 break;
13143
13144 case (int)ScriptBaseClass.PRIM_TYPE:
13145 if (remain < 3)
13146 return null;
13147 code = (int)rules.GetLSLIntegerItem(idx++);
13148 remain = rules.Length - idx;
13149 switch (code)
13150 {
13151 case (int)ScriptBaseClass.PRIM_TYPE_BOX:
13152 case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
13153 case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
13154 if (remain < 6)
13155 return null;
13156 idx += 6;
13157 break;
13158
13159 case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
13160 if (remain < 5)
13161 return null;
13162 idx += 5;
13163 break;
13164
13165 case (int)ScriptBaseClass.PRIM_TYPE_TORUS:
13166 case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
13167 case (int)ScriptBaseClass.PRIM_TYPE_RING:
13168 if (remain < 11)
13169 return null;
13170 idx += 11;
13171 break;
13172
13173 case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
13174 if (remain < 2)
13175 return null;
13176 idx += 2;
13177 break;
13178 }
13179 break;
13180
13181 case (int)ScriptBaseClass.PRIM_COLOR:
13182 case (int)ScriptBaseClass.PRIM_TEXT:
13183 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
13184 case (int)ScriptBaseClass.PRIM_OMEGA:
13185 if (remain < 3)
13186 return null;
13187 idx += 3;
13188 break;
13189
13190 case (int)ScriptBaseClass.PRIM_TEXTURE:
13191 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
13192 case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
13193 if (remain < 5)
13194 return null;
13195 idx += 5;
13196 break;
13197
13198 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
13199 if (remain < 7)
13200 return null;
13201
13202 idx += 7;
13203 break;
13204
13205 case (int)ScriptBaseClass.PRIM_LINK_TARGET:
13206 if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
13207 return null;
13208
13209 return rules.GetSublist(idx, -1);
13210 }
13211 }
13212 }
13213 catch (InvalidCastException e)
13214 {
13215 ShoutError(string.Format(
13216 "{0} error running rule #{1}: arg #{2} ",
13217 originFunc, rulesParsed, idx - idxStart) + e.Message);
13218 }
13219 finally
13220 {
13221 if (positionChanged)
13222 {
13223 av.OffsetPosition = finalPos;
13224// av.SendAvatarDataToAllAgents();
13225 av.SendTerseUpdateToAllClients();
13226 positionChanged = false;
13227 }
13228 }
13229 return null;
13230 }
13231
13232 public LSL_List GetPrimParams(ScenePresence avatar, LSL_List rules, ref LSL_List res)
13233 {
13234 // avatars case
13235 // replies as SL wiki
13236
13237// SceneObjectPart sitPart = avatar.ParentPart; // most likelly it will be needed
13238 SceneObjectPart sitPart = World.GetSceneObjectPart(avatar.ParentID); // maybe better do this expensive search for it in case it's gone??
13239
13240 int idx = 0;
13241 while (idx < rules.Length)
13242 {
13243 int code = (int)rules.GetLSLIntegerItem(idx++);
13244 int remain = rules.Length - idx;
13245
13246 switch (code)
13247 {
13248 case (int)ScriptBaseClass.PRIM_MATERIAL:
13249 res.Add(new LSL_Integer((int)SOPMaterialData.SopMaterial.Flesh));
13250 break;
13251
13252 case (int)ScriptBaseClass.PRIM_PHYSICS:
13253 res.Add(new LSL_Integer(0));
13254 break;
13255
13256 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
13257 res.Add(new LSL_Integer(0));
13258 break;
13259
13260 case (int)ScriptBaseClass.PRIM_PHANTOM:
13261 res.Add(new LSL_Integer(0));
13262 break;
13263
13264 case (int)ScriptBaseClass.PRIM_POSITION:
13265
13266 Vector3 pos = avatar.OffsetPosition;
13267
13268 Vector3 sitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f *2.0f);
13269 pos -= sitOffset;
13270
13271 if( sitPart != null)
13272 pos = sitPart.GetWorldPosition() + pos * sitPart.GetWorldRotation();
13273
13274 res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z));
13275 break;
13276
13277 case (int)ScriptBaseClass.PRIM_SIZE:
13278 // as in llGetAgentSize above
13279// res.Add(new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight));
13280 Vector3 s = avatar.Appearance.AvatarSize;
13281 res.Add(new LSL_Vector(s.X, s.Y, s.Z));
13282
13283 break;
13284
13285 case (int)ScriptBaseClass.PRIM_ROTATION:
13286 Quaternion rot = avatar.Rotation;
13287 if (sitPart != null)
13288 {
13289 rot = sitPart.GetWorldRotation() * rot; // apply sit part world rotation
13290 }
13291
13292 res.Add(new LSL_Rotation (rot.X, rot.Y, rot.Z, rot.W));
13293 break;
13294
13295 case (int)ScriptBaseClass.PRIM_TYPE:
13296 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
13297 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
13298 res.Add(new LSL_Vector(0f,1.0f,0f));
13299 res.Add(new LSL_Float(0.0f));
13300 res.Add(new LSL_Vector(0, 0, 0));
13301 res.Add(new LSL_Vector(1.0f,1.0f,0f));
13302 res.Add(new LSL_Vector(0, 0, 0));
13303 break;
13304
13305 case (int)ScriptBaseClass.PRIM_TEXTURE:
13306 if (remain < 1)
13307 return null;
13308
13309 int face = (int)rules.GetLSLIntegerItem(idx++);
13310 if (face == ScriptBaseClass.ALL_SIDES)
13311 {
13312 for (face = 0; face < 21; face++)
13313 {
13314 res.Add(new LSL_String(""));
13315 res.Add(new LSL_Vector(0,0,0));
13316 res.Add(new LSL_Vector(0,0,0));
13317 res.Add(new LSL_Float(0.0));
13318 }
13319 }
13320 else
13321 {
13322 if (face >= 0 && face < 21)
13323 {
13324 res.Add(new LSL_String(""));
13325 res.Add(new LSL_Vector(0,0,0));
13326 res.Add(new LSL_Vector(0,0,0));
13327 res.Add(new LSL_Float(0.0));
13328 }
13329 }
13330 break;
13331
13332 case (int)ScriptBaseClass.PRIM_COLOR:
13333 if (remain < 1)
13334 return null;
13335
13336 face = (int)rules.GetLSLIntegerItem(idx++);
13337
13338 if (face == ScriptBaseClass.ALL_SIDES)
13339 {
13340 for (face = 0; face < 21; face++)
13341 {
13342 res.Add(new LSL_Vector(0,0,0));
13343 res.Add(new LSL_Float(0));
13344 }
13345 }
13346 else
13347 {
13348 res.Add(new LSL_Vector(0,0,0));
13349 res.Add(new LSL_Float(0));
13350 }
13351 break;
13352
13353 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
13354 if (remain < 1)
13355 return null;
13356 face = (int)rules.GetLSLIntegerItem(idx++);
13357
13358 if (face == ScriptBaseClass.ALL_SIDES)
13359 {
13360 for (face = 0; face < 21; face++)
13361 {
13362 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
13363 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
13364 }
13365 }
13366 else
13367 {
13368 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
13369 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
13370 }
13371 break;
13372
13373 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
13374 if (remain < 1)
13375 return null;
13376 face = (int)rules.GetLSLIntegerItem(idx++);
13377
13378 if (face == ScriptBaseClass.ALL_SIDES)
13379 {
13380 for (face = 0; face < 21; face++)
13381 {
13382 res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
13383 }
13384 }
13385 else
13386 {
13387 res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
13388 }
13389 break;
13390
13391 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
13392 res.Add(new LSL_Integer(0));
13393 res.Add(new LSL_Integer(0));// softness
13394 res.Add(new LSL_Float(0.0f)); // gravity
13395 res.Add(new LSL_Float(0.0f)); // friction
13396 res.Add(new LSL_Float(0.0f)); // wind
13397 res.Add(new LSL_Float(0.0f)); // tension
13398 res.Add(new LSL_Vector(0f,0f,0f));
13399 break;
13400
13401 case (int)ScriptBaseClass.PRIM_TEXGEN:
13402 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
13403 if (remain < 1)
13404 return null;
13405 face = (int)rules.GetLSLIntegerItem(idx++);
13406
13407 if (face == ScriptBaseClass.ALL_SIDES)
13408 {
13409 for (face = 0; face < 21; face++)
13410 {
13411 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
13412 }
13413 }
13414 else
13415 {
13416 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
13417 }
13418 break;
13419
13420 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
13421 res.Add(new LSL_Integer(0));
13422 res.Add(new LSL_Vector(0f,0f,0f));
13423 res.Add(new LSL_Float(0f)); // intensity
13424 res.Add(new LSL_Float(0f)); // radius
13425 res.Add(new LSL_Float(0f)); // falloff
13426 break;
13427
13428 case (int)ScriptBaseClass.PRIM_GLOW:
13429 if (remain < 1)
13430 return null;
13431 face = (int)rules.GetLSLIntegerItem(idx++);
13432
13433 if (face == ScriptBaseClass.ALL_SIDES)
13434 {
13435 for (face = 0; face < 21; face++)
13436 {
13437 res.Add(new LSL_Float(0f));
13438 }
13439 }
13440 else
13441 {
13442 res.Add(new LSL_Float(0f));
13443 }
13444 break;
13445
13446 case (int)ScriptBaseClass.PRIM_TEXT:
13447 res.Add(new LSL_String(""));
13448 res.Add(new LSL_Vector(0f,0f,0f));
13449 res.Add(new LSL_Float(1.0f));
13450 break;
13451
13452 case (int)ScriptBaseClass.PRIM_NAME:
13453 res.Add(new LSL_String(avatar.Name));
13454 break;
13455
13456 case (int)ScriptBaseClass.PRIM_DESC:
13457 res.Add(new LSL_String(""));
13458 break;
13459
13460 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
13461 Quaternion lrot = avatar.Rotation;
13462
13463 if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
13464 {
13465 lrot = sitPart.RotationOffset * lrot; // apply sit part rotation offset
13466 }
13467 res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W));
13468 break;
13469
13470 case (int)ScriptBaseClass.PRIM_POS_LOCAL:
13471 Vector3 lpos = avatar.OffsetPosition; // pos relative to sit part
13472 Vector3 lsitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f * 2.0f);
13473 lpos -= lsitOffset;
13474
13475 if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
13476 {
13477 lpos = sitPart.OffsetPosition + (lpos * sitPart.RotationOffset); // make it relative to root prim
13478 }
13479 res.Add(new LSL_Vector(lpos.X,lpos.Y,lpos.Z));
13480 break;
13481
13482 case (int)ScriptBaseClass.PRIM_LINK_TARGET:
13483 if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
13484 return null;
13485
13486 return rules.GetSublist(idx, -1);
13487 }
13488 }
13489
13490 return null;
13491 }
13492
13493 public void llSetContentType(LSL_Key id, LSL_Integer content_type)
13494 {
13495 if (m_UrlModule != null)
13496 {
13497 string type = "text.plain";
13498 if (content_type == (int)ScriptBaseClass.CONTENT_TYPE_HTML)
13499 type = "text/html";
13500
13501 m_UrlModule.HttpContentType(new UUID(id),type);
13502 }
13503 }
12173 } 13504 }
12174 13505
12175 public class NotecardCache 13506 public class NotecardCache
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 92dd813..edcdfbc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
136// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 136// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
137 137
138 Type returntype = m_comms.LookupReturnType(fname); 138 Type returntype = m_comms.LookupReturnType(fname);
139 if (returntype != typeof(string)) 139 if (returntype != typeof(void))
140 MODError(String.Format("return type mismatch for {0}",fname)); 140 MODError(String.Format("return type mismatch for {0}",fname));
141 141
142 modInvoke(fname,parms); 142 modInvoke(fname,parms);
@@ -329,6 +329,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
329 if (result != null) 329 if (result != null)
330 return result; 330 return result;
331 331
332 Type returntype = m_comms.LookupReturnType(fname);
333 if (returntype == typeof(void))
334 return null;
335
332 MODError(String.Format("Invocation of {0} failed; null return value",fname)); 336 MODError(String.Format("Invocation of {0} failed; null return value",fname));
333 } 337 }
334 catch (Exception e) 338 catch (Exception e)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 15fbbfd..c474173 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -139,6 +139,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
139 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; 139 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
140 internal float m_ScriptDelayFactor = 1.0f; 140 internal float m_ScriptDelayFactor = 1.0f;
141 internal float m_ScriptDistanceFactor = 1.0f; 141 internal float m_ScriptDistanceFactor = 1.0f;
142 internal bool m_debuggerSafe = false;
142 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); 143 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
143 144
144 protected IUrlModule m_UrlModule = null; 145 protected IUrlModule m_UrlModule = null;
@@ -149,6 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
149 m_ScriptEngine = scriptEngine; 150 m_ScriptEngine = scriptEngine;
150 m_host = host; 151 m_host = host;
151 m_item = item; 152 m_item = item;
153 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
152 154
153 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); 155 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
154 156
@@ -212,7 +214,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
212 214
213 internal void OSSLError(string msg) 215 internal void OSSLError(string msg)
214 { 216 {
215 throw new ScriptException("OSSL Runtime Error: " + msg); 217 if (m_debuggerSafe)
218 {
219 OSSLShoutError(msg);
220 }
221 else
222 {
223 throw new ScriptException("OSSL Runtime Error: " + msg);
224 }
216 } 225 }
217 226
218 /// <summary> 227 /// <summary>
@@ -931,18 +940,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
931 if (target != null) 940 if (target != null)
932 { 941 {
933 UUID animID=UUID.Zero; 942 UUID animID=UUID.Zero;
934 lock (m_host.TaskInventory) 943 m_host.TaskInventory.LockItemsForRead(true);
944 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
935 { 945 {
936 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 946 if (inv.Value.Name == animation)
937 { 947 {
938 if (inv.Value.Name == animation) 948 if (inv.Value.Type == (int)AssetType.Animation)
939 { 949 animID = inv.Value.AssetID;
940 if (inv.Value.Type == (int)AssetType.Animation) 950 continue;
941 animID = inv.Value.AssetID;
942 continue;
943 }
944 } 951 }
945 } 952 }
953 m_host.TaskInventory.LockItemsForRead(false);
946 if (animID == UUID.Zero) 954 if (animID == UUID.Zero)
947 target.Animator.AddAnimation(animation, m_host.UUID); 955 target.Animator.AddAnimation(animation, m_host.UUID);
948 else 956 else
@@ -983,6 +991,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
983 else 991 else
984 animID = UUID.Zero; 992 animID = UUID.Zero;
985 } 993 }
994 m_host.TaskInventory.LockItemsForRead(false);
986 995
987 if (animID == UUID.Zero) 996 if (animID == UUID.Zero)
988 target.Animator.RemoveAnimation(animation); 997 target.Animator.RemoveAnimation(animation);
@@ -1645,7 +1654,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1645 } 1654 }
1646 } 1655 }
1647 1656
1648 public Object osParseJSONNew(string JSON) 1657 private Object osParseJSONNew(string JSON)
1649 { 1658 {
1650 CheckThreatLevel(ThreatLevel.None, "osParseJSONNew"); 1659 CheckThreatLevel(ThreatLevel.None, "osParseJSONNew");
1651 1660
@@ -1847,15 +1856,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1847 { 1856 {
1848 UUID assetID = UUID.Zero; 1857 UUID assetID = UUID.Zero;
1849 1858
1850 if (!UUID.TryParse(notecardNameOrUuid, out assetID)) 1859 bool notecardNameIsUUID = UUID.TryParse(notecardNameOrUuid, out assetID);
1860
1861 if (!notecardNameIsUUID)
1851 { 1862 {
1852 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1863 assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
1853 {
1854 if (item.Type == 7 && item.Name == notecardNameOrUuid)
1855 {
1856 assetID = item.AssetID;
1857 }
1858 }
1859 } 1864 }
1860 1865
1861 if (assetID == UUID.Zero) 1866 if (assetID == UUID.Zero)
@@ -1866,7 +1871,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1866 AssetBase a = World.AssetService.Get(assetID.ToString()); 1871 AssetBase a = World.AssetService.Get(assetID.ToString());
1867 1872
1868 if (a == null) 1873 if (a == null)
1869 return UUID.Zero; 1874 {
1875 // Whoops, it's still possible here that the notecard name was properly
1876 // formatted like a UUID but isn't an asset UUID so lets look it up by name after all
1877 assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
1878 if (assetID == UUID.Zero)
1879 return UUID.Zero;
1880
1881 if (!NotecardCache.IsCached(assetID))
1882 {
1883 a = World.AssetService.Get(assetID.ToString());
1884
1885 if (a == null)
1886 {
1887 return UUID.Zero;
1888 }
1889 }
1890 }
1870 1891
1871 string data = Encoding.UTF8.GetString(a.Data); 1892 string data = Encoding.UTF8.GetString(a.Data);
1872 NotecardCache.Cache(assetID, data); 1893 NotecardCache.Cache(assetID, data);
@@ -1874,6 +1895,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1874 1895
1875 return assetID; 1896 return assetID;
1876 } 1897 }
1898 protected UUID SearchTaskInventoryForAssetId(string name)
1899 {
1900 UUID assetId = UUID.Zero;
1901 m_host.TaskInventory.LockItemsForRead(true);
1902 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1903 {
1904 if (item.Type == 7 && item.Name == name)
1905 {
1906 assetId = item.AssetID;
1907 }
1908 }
1909 m_host.TaskInventory.LockItemsForRead(false);
1910 return assetId;
1911 }
1877 1912
1878 /// <summary> 1913 /// <summary>
1879 /// Directly get an entire notecard at once. 1914 /// Directly get an entire notecard at once.
@@ -2351,7 +2386,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2351 CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); 2386 CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
2352 m_host.AddScriptLPS(1); 2387 m_host.AddScriptLPS(1);
2353 2388
2354 return NpcCreate(firstname, lastname, position, notecard, false, false); 2389 return NpcCreate(firstname, lastname, position, notecard, true, false);
2355 } 2390 }
2356 2391
2357 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) 2392 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
@@ -2362,24 +2397,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2362 return NpcCreate( 2397 return NpcCreate(
2363 firstname, lastname, position, notecard, 2398 firstname, lastname, position, notecard,
2364 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, 2399 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0,
2365 (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0); 2400 false);
2401// (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
2366 } 2402 }
2367 2403
2368 private LSL_Key NpcCreate( 2404 private LSL_Key NpcCreate(
2369 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent) 2405 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent)
2370 { 2406 {
2407 if (!owned)
2408 OSSLError("Unowned NPCs are unsupported");
2409
2410 string groupTitle = String.Empty;
2411
2412 if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z)))
2413 return new LSL_Key(UUID.Zero.ToString());
2414
2415 if (firstname != String.Empty || lastname != String.Empty)
2416 {
2417 if (firstname != "Shown outfit:")
2418 groupTitle = "- NPC -";
2419 }
2420
2371 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2421 INPCModule module = World.RequestModuleInterface<INPCModule>();
2372 if (module != null) 2422 if (module != null)
2373 { 2423 {
2374 AvatarAppearance appearance = null; 2424 AvatarAppearance appearance = null;
2375 2425
2376 UUID id; 2426// UUID id;
2377 if (UUID.TryParse(notecard, out id)) 2427// if (UUID.TryParse(notecard, out id))
2378 { 2428// {
2379 ScenePresence clonePresence = World.GetScenePresence(id); 2429// ScenePresence clonePresence = World.GetScenePresence(id);
2380 if (clonePresence != null) 2430// if (clonePresence != null)
2381 appearance = clonePresence.Appearance; 2431// appearance = clonePresence.Appearance;
2382 } 2432// }
2383 2433
2384 if (appearance == null) 2434 if (appearance == null)
2385 { 2435 {
@@ -2387,9 +2437,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2387 2437
2388 if (appearanceSerialized != null) 2438 if (appearanceSerialized != null)
2389 { 2439 {
2390 OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized); 2440 try
2391 appearance = new AvatarAppearance(); 2441 {
2392 appearance.Unpack(appearanceOsd); 2442 OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
2443 appearance = new AvatarAppearance();
2444 appearance.Unpack(appearanceOsd);
2445 }
2446 catch
2447 {
2448 return UUID.Zero.ToString();
2449 }
2393 } 2450 }
2394 else 2451 else
2395 { 2452 {
@@ -2408,6 +2465,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2408 World, 2465 World,
2409 appearance); 2466 appearance);
2410 2467
2468 ScenePresence sp;
2469 if (World.TryGetScenePresence(x, out sp))
2470 {
2471 sp.Grouptitle = groupTitle;
2472 sp.SendAvatarDataToAllAgents();
2473 }
2411 return new LSL_Key(x.ToString()); 2474 return new LSL_Key(x.ToString());
2412 } 2475 }
2413 2476
@@ -2705,16 +2768,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2705 CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); 2768 CheckThreatLevel(ThreatLevel.High, "osNpcRemove");
2706 m_host.AddScriptLPS(1); 2769 m_host.AddScriptLPS(1);
2707 2770
2708 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2771 ManualResetEvent ev = new ManualResetEvent(false);
2709 if (module != null)
2710 {
2711 UUID npcId = new UUID(npc.m_string);
2712 2772
2713 if (!module.CheckPermissions(npcId, m_host.OwnerID)) 2773 Util.FireAndForget(delegate(object x) {
2714 return; 2774 try
2775 {
2776 INPCModule module = World.RequestModuleInterface<INPCModule>();
2777 if (module != null)
2778 {
2779 UUID npcId = new UUID(npc.m_string);
2715 2780
2716 module.DeleteNPC(npcId, World); 2781 ILandObject l = World.LandChannel.GetLandObject(m_host.GroupPosition.X, m_host.GroupPosition.Y);
2717 } 2782 if (l == null || m_host.OwnerID != l.LandData.OwnerID)
2783 {
2784 if (!module.CheckPermissions(npcId, m_host.OwnerID))
2785 return;
2786 }
2787
2788 module.DeleteNPC(npcId, World);
2789 }
2790 }
2791 finally
2792 {
2793 ev.Set();
2794 }
2795 });
2796 ev.WaitOne();
2718 } 2797 }
2719 2798
2720 public void osNpcPlayAnimation(LSL_Key npc, string animation) 2799 public void osNpcPlayAnimation(LSL_Key npc, string animation)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 64dc2e2..181399d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -93,7 +93,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
93 private const int AGENT = 1; 93 private const int AGENT = 1;
94 private const int AGENT_BY_USERNAME = 0x10; 94 private const int AGENT_BY_USERNAME = 0x10;
95 private const int NPC = 0x20; 95 private const int NPC = 0x20;
96 private const int OS_NPC = 0x01000000;
97 private const int ACTIVE = 2; 96 private const int ACTIVE = 2;
98 private const int PASSIVE = 4; 97 private const int PASSIVE = 4;
99 private const int SCRIPTED = 8; 98 private const int SCRIPTED = 8;
@@ -240,7 +239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
240 List<SensedEntity> sensedEntities = new List<SensedEntity>(); 239 List<SensedEntity> sensedEntities = new List<SensedEntity>();
241 240
242 // Is the sensor type is AGENT and not SCRIPTED then include agents 241 // Is the sensor type is AGENT and not SCRIPTED then include agents
243 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC | OS_NPC)) != 0 && (ts.type & SCRIPTED) == 0) 242 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0)
244 { 243 {
245 sensedEntities.AddRange(doAgentSensor(ts)); 244 sensedEntities.AddRange(doAgentSensor(ts));
246 } 245 }
@@ -339,7 +338,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
339 float dy; 338 float dy;
340 float dz; 339 float dz;
341 340
342 Quaternion q = SensePoint.GetWorldRotation(); 341// Quaternion q = SensePoint.RotationOffset;
342 Quaternion q = SensePoint.GetWorldRotation(); // non-attached prim Sensor *always* uses World rotation!
343 if (SensePoint.ParentGroup.IsAttachment) 343 if (SensePoint.ParentGroup.IsAttachment)
344 { 344 {
345 // In attachments, rotate the sensor cone with the 345 // In attachments, rotate the sensor cone with the
@@ -358,7 +358,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
358 if (avatar == null) 358 if (avatar == null)
359 return sensedEntities; 359 return sensedEntities;
360 360
361 q = avatar.GetWorldRotation() * q; 361 fromRegionPos = avatar.AbsolutePosition;
362 q = avatar.Rotation;
362 } 363 }
363 364
364 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); 365 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
@@ -402,7 +403,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
402 objtype = 0; 403 objtype = 0;
403 404
404 part = ((SceneObjectGroup)ent).RootPart; 405 part = ((SceneObjectGroup)ent).RootPart;
405 if (part.ParentGroup.AttachmentPoint != 0) // Attached so ignore 406 if (part.ParentGroup.RootPart.Shape.PCode != (byte)PCode.Tree &&
407 part.ParentGroup.RootPart.Shape.PCode != (byte)PCode.NewTree &&
408 part.ParentGroup.AttachmentPoint != 0) // Attached so ignore
406 continue; 409 continue;
407 410
408 if (part.Inventory.ContainsScripts()) 411 if (part.Inventory.ContainsScripts())
@@ -489,8 +492,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
489 // Don't proceed if the avatar for this attachment has since been removed from the scene. 492 // Don't proceed if the avatar for this attachment has since been removed from the scene.
490 if (avatar == null) 493 if (avatar == null)
491 return sensedEntities; 494 return sensedEntities;
492 495 fromRegionPos = avatar.AbsolutePosition;
493 q = avatar.GetWorldRotation() * q; 496 q = avatar.Rotation;
494 } 497 }
495 498
496 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); 499 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
@@ -506,7 +509,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
506// "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}", 509// "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}",
507// presence.Name, presence.PresenceType, ts.name, ts.type); 510// presence.Name, presence.PresenceType, ts.name, ts.type);
508 511
509 if ((ts.type & NPC) == 0 && (ts.type & OS_NPC) == 0 && presence.PresenceType == PresenceType.Npc) 512 if ((ts.type & NPC) == 0 && presence.PresenceType == PresenceType.Npc)
510 { 513 {
511 INPC npcData = m_npcModule.GetNPC(presence.UUID, presence.Scene); 514 INPC npcData = m_npcModule.GetNPC(presence.UUID, presence.Scene);
512 if (npcData == null || !npcData.SenseAsAgent) 515 if (npcData == null || !npcData.SenseAsAgent)
@@ -706,4 +709,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
706 return retList; 709 return retList;
707 } 710 }
708 } 711 }
709} \ No newline at end of file 712}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 0b14565..68aacd2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -123,25 +123,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
123 if (Timers.Count == 0) 123 if (Timers.Count == 0)
124 return; 124 return;
125 125
126 Dictionary<string, TimerInfo>.ValueCollection tvals;
126 lock (TimerListLock) 127 lock (TimerListLock)
127 { 128 {
128 // Go through all timers 129 // Go through all timers
129 Dictionary<string, TimerInfo>.ValueCollection tvals = Timers.Values; 130 tvals = Timers.Values;
130 foreach (TimerInfo ts in tvals) 131 }
132
133 foreach (TimerInfo ts in tvals)
134 {
135 // Time has passed?
136 if (ts.next < DateTime.Now.Ticks)
131 { 137 {
132 // Time has passed? 138 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
133 if (ts.next < DateTime.Now.Ticks) 139 // Add it to queue
134 { 140 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
135 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 141 new EventParams("timer", new Object[0],
136 // Add it to queue 142 new DetectParams[0]));
137 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 143 // set next interval
138 new EventParams("timer", new Object[0], 144
139 new DetectParams[0])); 145 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
140 // set next interval 146 ts.next = DateTime.Now.Ticks + ts.interval;
141
142 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
143 ts.next = DateTime.Now.Ticks + ts.interval;
144 }
145 } 147 }
146 } 148 }
147 } 149 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
new file mode 100644
index 0000000..ab215f3
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
@@ -0,0 +1,46 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Collections;
29using OpenSim.Region.ScriptEngine.Interfaces;
30
31using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
32using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
33using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
34using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
35using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
36using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
37using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
38
39namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
40{
41 public interface ICM_Api
42 {
43 string cmDetectedCountry(int num);
44 string cmGetAgentCountry(key key);
45 }
46}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 340edb3..d211a2b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -126,6 +126,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
126 LSL_Float llGetEnergy(); 126 LSL_Float llGetEnergy();
127 LSL_Vector llGetForce(); 127 LSL_Vector llGetForce();
128 LSL_Integer llGetFreeMemory(); 128 LSL_Integer llGetFreeMemory();
129 LSL_Integer llGetUsedMemory();
129 LSL_Integer llGetFreeURLs(); 130 LSL_Integer llGetFreeURLs();
130 LSL_Vector llGetGeometricCenter(); 131 LSL_Vector llGetGeometricCenter();
131 LSL_Float llGetGMTclock(); 132 LSL_Float llGetGMTclock();
@@ -149,6 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
149 LSL_Vector llGetLocalPos(); 150 LSL_Vector llGetLocalPos();
150 LSL_Rotation llGetLocalRot(); 151 LSL_Rotation llGetLocalRot();
151 LSL_Float llGetMass(); 152 LSL_Float llGetMass();
153 LSL_Float llGetMassMKS();
152 LSL_Integer llGetMemoryLimit(); 154 LSL_Integer llGetMemoryLimit();
153 void llGetNextEmail(string address, string subject); 155 void llGetNextEmail(string address, string subject);
154 LSL_String llGetNotecardLine(string name, int line); 156 LSL_String llGetNotecardLine(string name, int line);
@@ -202,12 +204,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
202 LSL_String llGetTimestamp(); 204 LSL_String llGetTimestamp();
203 LSL_Vector llGetTorque(); 205 LSL_Vector llGetTorque();
204 LSL_Integer llGetUnixTime(); 206 LSL_Integer llGetUnixTime();
205 LSL_Integer llGetUsedMemory();
206 LSL_Vector llGetVel(); 207 LSL_Vector llGetVel();
207 LSL_Float llGetWallclock(); 208 LSL_Float llGetWallclock();
208 void llGiveInventory(string destination, string inventory); 209 void llGiveInventory(string destination, string inventory);
209 void llGiveInventoryList(string destination, string category, LSL_List inventory); 210 void llGiveInventoryList(string destination, string category, LSL_List inventory);
210 void llGiveMoney(string destination, int amount); 211 LSL_Integer llGiveMoney(string destination, int amount);
211 LSL_String llTransferLindenDollars(string destination, int amount); 212 LSL_String llTransferLindenDollars(string destination, int amount);
212 void llGodLikeRezObject(string inventory, LSL_Vector pos); 213 void llGodLikeRezObject(string inventory, LSL_Vector pos);
213 LSL_Float llGround(LSL_Vector offset); 214 LSL_Float llGround(LSL_Vector offset);
@@ -342,7 +343,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
342 void llSetDamage(double damage); 343 void llSetDamage(double damage);
343 void llSetForce(LSL_Vector force, int local); 344 void llSetForce(LSL_Vector force, int local);
344 void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local); 345 void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local);
345 void llSetVelocity(LSL_Vector velocity, int local);
346 void llSetAngularVelocity(LSL_Vector angularVelocity, int local); 346 void llSetAngularVelocity(LSL_Vector angularVelocity, int local);
347 void llSetHoverHeight(double height, int water, double tau); 347 void llSetHoverHeight(double height, int water, double tau);
348 void llSetInventoryPermMask(string item, int mask, int value); 348 void llSetInventoryPermMask(string item, int mask, int value);
@@ -360,11 +360,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
360 void llSetParcelMusicURL(string url); 360 void llSetParcelMusicURL(string url);
361 void llSetPayPrice(int price, LSL_List quick_pay_buttons); 361 void llSetPayPrice(int price, LSL_List quick_pay_buttons);
362 void llSetPos(LSL_Vector pos); 362 void llSetPos(LSL_Vector pos);
363 LSL_Integer llSetRegionPos(LSL_Vector pos);
363 LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules); 364 LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules);
364 void llSetPrimitiveParams(LSL_List rules); 365 void llSetPrimitiveParams(LSL_List rules);
365 void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules); 366 void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules);
366 void llSetPrimURL(string url); 367 void llSetPrimURL(string url);
367 LSL_Integer llSetRegionPos(LSL_Vector pos);
368 void llSetRemoteScriptAccessPin(int pin); 368 void llSetRemoteScriptAccessPin(int pin);
369 void llSetRot(LSL_Rotation rot); 369 void llSetRot(LSL_Rotation rot);
370 void llSetScale(LSL_Vector scale); 370 void llSetScale(LSL_Vector scale);
@@ -427,10 +427,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
427 LSL_Vector llWind(LSL_Vector offset); 427 LSL_Vector llWind(LSL_Vector offset);
428 LSL_String llXorBase64Strings(string str1, string str2); 428 LSL_String llXorBase64Strings(string str1, string str2);
429 LSL_String llXorBase64StringsCorrect(string str1, string str2); 429 LSL_String llXorBase64StringsCorrect(string str1, string str2);
430 void print(string str); 430 LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
431 void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density);
431 432
432 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc); 433 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc);
433 void llSetKeyframedMotion(LSL_List frames, LSL_List options); 434 void llSetKeyframedMotion(LSL_List frames, LSL_List options);
434 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 435 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
436 LSL_List llGetPhysicsMaterial();
435 } 437 }
436} 438}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 519779e..d80d389 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
144 // Avatar Info Commands 144 // Avatar Info Commands
145 string osGetAgentIP(string agent); 145 string osGetAgentIP(string agent);
146 LSL_List osGetAgents(); 146 LSL_List osGetAgents();
147 147
148 // Teleport commands 148 // Teleport commands
149 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 149 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
150 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 150 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
@@ -260,7 +260,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
260 string osGetScriptEngineName(); 260 string osGetScriptEngineName();
261 string osGetSimulatorVersion(); 261 string osGetSimulatorVersion();
262 string osGetPhysicsEngineType(); 262 string osGetPhysicsEngineType();
263 Object osParseJSONNew(string JSON);
264 Hashtable osParseJSON(string JSON); 263 Hashtable osParseJSON(string JSON);
265 264
266 void osMessageObject(key objectUUID,string message); 265 void osMessageObject(key objectUUID,string message);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
new file mode 100644
index 0000000..4132dfa
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
@@ -0,0 +1,71 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Runtime.Remoting.Lifetime;
30using System.Threading;
31using System.Reflection;
32using System.Collections;
33using System.Collections.Generic;
34using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
38using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
39using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
40using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
41using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
42using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
43using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
44using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
45using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
46
47namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
48{
49 public partial class ScriptBaseClass : MarshalByRefObject
50 {
51 public ICM_Api m_CM_Functions;
52
53 public void ApiTypeCM(IScriptApi api)
54 {
55 if (!(api is ICM_Api))
56 return;
57
58 m_CM_Functions = (ICM_Api)api;
59 }
60
61 public string cmDetectedCountry(int num)
62 {
63 return m_CM_Functions.cmDetectedCountry(num);
64 }
65
66 public string cmGetAgentCountry(key key)
67 {
68 return m_CM_Functions.cmGetAgentCountry(key);
69 }
70 }
71}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 9615315..943d7a2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Reflection; 31using System.Reflection;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using OpenSim.Region.ScriptEngine.Shared; 33using OpenSim.Region.ScriptEngine.Shared;
@@ -132,6 +133,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
132 return (eventFlags); 133 return (eventFlags);
133 } 134 }
134 135
136 [DebuggerNonUserCode]
135 public void ExecuteEvent(string state, string FunctionName, object[] args) 137 public void ExecuteEvent(string state, string FunctionName, object[] args)
136 { 138 {
137 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory. 139 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index a073862..e59c0be 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -56,7 +56,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
56 public const int ACTIVE = 2; 56 public const int ACTIVE = 2;
57 public const int PASSIVE = 4; 57 public const int PASSIVE = 4;
58 public const int SCRIPTED = 8; 58 public const int SCRIPTED = 8;
59 public const int OS_NPC = 0x01000000;
60 59
61 public const int CONTROL_FWD = 1; 60 public const int CONTROL_FWD = 1;
62 public const int CONTROL_BACK = 2; 61 public const int CONTROL_BACK = 2;
@@ -81,6 +80,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
81 public const int PERMISSION_CHANGE_PERMISSIONS = 512; 80 public const int PERMISSION_CHANGE_PERMISSIONS = 512;
82 public const int PERMISSION_TRACK_CAMERA = 1024; 81 public const int PERMISSION_TRACK_CAMERA = 1024;
83 public const int PERMISSION_CONTROL_CAMERA = 2048; 82 public const int PERMISSION_CONTROL_CAMERA = 2048;
83 public const int PERMISSION_TELEPORT = 4096;
84 84
85 public const int AGENT_FLYING = 1; 85 public const int AGENT_FLYING = 1;
86 public const int AGENT_ATTACHMENTS = 2; 86 public const int AGENT_ATTACHMENTS = 2;
@@ -95,6 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
95 public const int AGENT_CROUCHING = 1024; 95 public const int AGENT_CROUCHING = 1024;
96 public const int AGENT_BUSY = 2048; 96 public const int AGENT_BUSY = 2048;
97 public const int AGENT_ALWAYS_RUN = 4096; 97 public const int AGENT_ALWAYS_RUN = 4096;
98 public const int AGENT_MALE = 8192;
98 99
99 //Particle Systems 100 //Particle Systems
100 public const int PSYS_PART_INTERP_COLOR_MASK = 1; 101 public const int PSYS_PART_INTERP_COLOR_MASK = 1;
@@ -350,6 +351,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
350 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART 351 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
351 public const int CHANGED_MEDIA = 2048; 352 public const int CHANGED_MEDIA = 2048;
352 public const int CHANGED_ANIMATION = 16384; 353 public const int CHANGED_ANIMATION = 16384;
354 public const int CHANGED_POSITION = 32768;
353 public const int TYPE_INVALID = 0; 355 public const int TYPE_INVALID = 0;
354 public const int TYPE_INTEGER = 1; 356 public const int TYPE_INTEGER = 1;
355 public const int TYPE_FLOAT = 2; 357 public const int TYPE_FLOAT = 2;
@@ -698,7 +700,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
698 public const int FRICTION = 2; 700 public const int FRICTION = 2;
699 public const int RESTITUTION = 4; 701 public const int RESTITUTION = 4;
700 public const int GRAVITY_MULTIPLIER = 8; 702 public const int GRAVITY_MULTIPLIER = 8;
701 703
702 // extra constants for llSetPrimMediaParams 704 // extra constants for llSetPrimMediaParams
703 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); 705 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0);
704 public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000); 706 public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000);
@@ -770,7 +772,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
770 772
771 public static readonly LSLInteger RCERR_UNKNOWN = -1; 773 public static readonly LSLInteger RCERR_UNKNOWN = -1;
772 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; 774 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2;
773 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3; 775 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = -3;
774 776
775 public const int KFM_MODE = 1; 777 public const int KFM_MODE = 1;
776 public const int KFM_LOOP = 1; 778 public const int KFM_LOOP = 1;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 7cd17e7..4fc8d65 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Diagnostics; //for [DebuggerNonUserCode]
29using System.Runtime.Remoting.Lifetime; 30using System.Runtime.Remoting.Lifetime;
30using System.Threading; 31using System.Threading;
31using System.Reflection; 32using System.Reflection;
@@ -314,6 +315,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
314 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); 315 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
315 } 316 }
316 317
318 [DebuggerNonUserCode]
317 public void llDie() 319 public void llDie()
318 { 320 {
319 m_LSL_Functions.llDie(); 321 m_LSL_Functions.llDie();
@@ -474,6 +476,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
474 return m_LSL_Functions.llGetFreeMemory(); 476 return m_LSL_Functions.llGetFreeMemory();
475 } 477 }
476 478
479 public LSL_Integer llGetUsedMemory()
480 {
481 return m_LSL_Functions.llGetUsedMemory();
482 }
483
477 public LSL_Integer llGetFreeURLs() 484 public LSL_Integer llGetFreeURLs()
478 { 485 {
479 return m_LSL_Functions.llGetFreeURLs(); 486 return m_LSL_Functions.llGetFreeURLs();
@@ -554,11 +561,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
554 return m_LSL_Functions.llGetLinkNumberOfSides(link); 561 return m_LSL_Functions.llGetLinkNumberOfSides(link);
555 } 562 }
556 563
557 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
558 {
559 m_LSL_Functions.llSetKeyframedMotion(frames, options);
560 }
561
562 public LSL_Integer llGetListEntryType(LSL_List src, int index) 564 public LSL_Integer llGetListEntryType(LSL_List src, int index)
563 { 565 {
564 return m_LSL_Functions.llGetListEntryType(src, index); 566 return m_LSL_Functions.llGetListEntryType(src, index);
@@ -584,6 +586,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
584 return m_LSL_Functions.llGetMass(); 586 return m_LSL_Functions.llGetMass();
585 } 587 }
586 588
589 public LSL_Float llGetMassMKS()
590 {
591 return m_LSL_Functions.llGetMassMKS();
592 }
593
587 public LSL_Integer llGetMemoryLimit() 594 public LSL_Integer llGetMemoryLimit()
588 { 595 {
589 return m_LSL_Functions.llGetMemoryLimit(); 596 return m_LSL_Functions.llGetMemoryLimit();
@@ -849,11 +856,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
849 return m_LSL_Functions.llGetUnixTime(); 856 return m_LSL_Functions.llGetUnixTime();
850 } 857 }
851 858
852 public LSL_Integer llGetUsedMemory()
853 {
854 return m_LSL_Functions.llGetUsedMemory();
855 }
856
857 public LSL_Vector llGetVel() 859 public LSL_Vector llGetVel()
858 { 860 {
859 return m_LSL_Functions.llGetVel(); 861 return m_LSL_Functions.llGetVel();
@@ -874,9 +876,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
874 m_LSL_Functions.llGiveInventoryList(destination, category, inventory); 876 m_LSL_Functions.llGiveInventoryList(destination, category, inventory);
875 } 877 }
876 878
877 public void llGiveMoney(string destination, int amount) 879 public LSL_Integer llGiveMoney(string destination, int amount)
878 { 880 {
879 m_LSL_Functions.llGiveMoney(destination, amount); 881 return m_LSL_Functions.llGiveMoney(destination, amount);
880 } 882 }
881 883
882 public LSL_String llTransferLindenDollars(string destination, int amount) 884 public LSL_String llTransferLindenDollars(string destination, int amount)
@@ -1548,11 +1550,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1548 m_LSL_Functions.llSetForceAndTorque(force, torque, local); 1550 m_LSL_Functions.llSetForceAndTorque(force, torque, local);
1549 } 1551 }
1550 1552
1551 public void llSetVelocity(LSL_Vector force, int local)
1552 {
1553 m_LSL_Functions.llSetVelocity(force, local);
1554 }
1555
1556 public void llSetAngularVelocity(LSL_Vector force, int local) 1553 public void llSetAngularVelocity(LSL_Vector force, int local)
1557 { 1554 {
1558 m_LSL_Functions.llSetAngularVelocity(force, local); 1555 m_LSL_Functions.llSetAngularVelocity(force, local);
@@ -1633,6 +1630,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1633 m_LSL_Functions.llSetPos(pos); 1630 m_LSL_Functions.llSetPos(pos);
1634 } 1631 }
1635 1632
1633 public LSL_Integer llSetRegionPos(LSL_Vector pos)
1634 {
1635 return m_LSL_Functions.llSetRegionPos(pos);
1636 }
1637
1636 public void llSetPrimitiveParams(LSL_List rules) 1638 public void llSetPrimitiveParams(LSL_List rules)
1637 { 1639 {
1638 m_LSL_Functions.llSetPrimitiveParams(rules); 1640 m_LSL_Functions.llSetPrimitiveParams(rules);
@@ -1648,11 +1650,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1648 m_LSL_Functions.llSetPrimURL(url); 1650 m_LSL_Functions.llSetPrimURL(url);
1649 } 1651 }
1650 1652
1651 public LSL_Integer llSetRegionPos(LSL_Vector pos)
1652 {
1653 return m_LSL_Functions.llSetRegionPos(pos);
1654 }
1655
1656 public void llSetRemoteScriptAccessPin(int pin) 1653 public void llSetRemoteScriptAccessPin(int pin)
1657 { 1654 {
1658 m_LSL_Functions.llSetRemoteScriptAccessPin(pin); 1655 m_LSL_Functions.llSetRemoteScriptAccessPin(pin);
@@ -1998,9 +1995,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1998 return m_LSL_Functions.llClearLinkMedia(link, face); 1995 return m_LSL_Functions.llClearLinkMedia(link, face);
1999 } 1996 }
2000 1997
2001 public void print(string str) 1998 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
1999 {
2000 return m_LSL_Functions.llGetLinkNumberOfSides(link);
2001 }
2002
2003 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
2004 {
2005 m_LSL_Functions.llSetKeyframedMotion(frames, options);
2006 }
2007
2008 public void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density)
2009 {
2010 m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density);
2011 }
2012
2013 public LSL_List llGetPhysicsMaterial()
2002 { 2014 {
2003 m_LSL_Functions.print(str); 2015 return m_LSL_Functions.llGetPhysicsMaterial();
2004 } 2016 }
2005 } 2017 }
2006} 2018}
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/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 02a3541..9cf7b35 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -435,11 +435,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
435 return m_OSSL_Functions.osParseJSON(JSON); 435 return m_OSSL_Functions.osParseJSON(JSON);
436 } 436 }
437 437
438 public Object osParseJSONNew(string JSON)
439 {
440 return m_OSSL_Functions.osParseJSONNew(JSON);
441 }
442
443 public void osMessageObject(key objectUUID,string message) 438 public void osMessageObject(key objectUUID,string message)
444 { 439 {
445 m_OSSL_Functions.osMessageObject(objectUUID,message); 440 m_OSSL_Functions.osMessageObject(objectUUID,message);
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-22 06:04:51 +0000