diff options
Diffstat (limited to '')
18 files changed, 2989 insertions, 882 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 47a9cdc..94fd940 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
@@ -305,6 +305,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
305 | return null; | 305 | return null; |
306 | } | 306 | } |
307 | 307 | ||
308 | public static void StateChange(IScriptEngine engine, uint localID, UUID itemID) | ||
309 | { | ||
310 | // Remove a specific script | ||
311 | |||
312 | // Remove dataserver events | ||
313 | m_Dataserver[engine].RemoveEvents(localID, itemID); | ||
314 | |||
315 | IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>(); | ||
316 | if (comms != null) | ||
317 | comms.DeleteListener(itemID); | ||
318 | |||
319 | IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>(); | ||
320 | xmlrpc.DeleteChannels(itemID); | ||
321 | xmlrpc.CancelSRDRequests(itemID); | ||
322 | |||
323 | // Remove Sensors | ||
324 | m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID); | ||
325 | |||
326 | } | ||
327 | |||
308 | public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) | 328 | public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) |
309 | { | 329 | { |
310 | List<Object> data = new List<Object>(); | 330 | List<Object> data = new List<Object>(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs new file mode 100644 index 0000000..b5fa6de --- /dev/null +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | |||
@@ -0,0 +1,116 @@ | |||
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 | |||
28 | using System; | ||
29 | using System.Reflection; | ||
30 | using System.Collections; | ||
31 | using System.Collections.Generic; | ||
32 | using System.Runtime.Remoting.Lifetime; | ||
33 | using OpenMetaverse; | ||
34 | using Nini.Config; | ||
35 | using OpenSim; | ||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Region.CoreModules.World.LightShare; | ||
38 | using OpenSim.Region.Framework.Interfaces; | ||
39 | using OpenSim.Region.Framework.Scenes; | ||
40 | using OpenSim.Region.ScriptEngine.Shared; | ||
41 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; | ||
42 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | ||
43 | using OpenSim.Region.ScriptEngine.Interfaces; | ||
44 | using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; | ||
45 | using OpenSim.Services.Interfaces; | ||
46 | |||
47 | using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; | ||
48 | using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
49 | using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
50 | using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; | ||
51 | using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | ||
52 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
53 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | ||
54 | |||
55 | namespace OpenSim.Region.ScriptEngine.Shared.Api | ||
56 | { | ||
57 | [Serializable] | ||
58 | public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi | ||
59 | { | ||
60 | internal IScriptEngine m_ScriptEngine; | ||
61 | internal SceneObjectPart m_host; | ||
62 | internal TaskInventoryItem m_item; | ||
63 | internal bool m_CMFunctionsEnabled = false; | ||
64 | |||
65 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item) | ||
66 | { | ||
67 | m_ScriptEngine = ScriptEngine; | ||
68 | m_host = host; | ||
69 | m_item = item; | ||
70 | |||
71 | if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false)) | ||
72 | m_CMFunctionsEnabled = true; | ||
73 | } | ||
74 | |||
75 | public override Object InitializeLifetimeService() | ||
76 | { | ||
77 | ILease lease = (ILease)base.InitializeLifetimeService(); | ||
78 | |||
79 | if (lease.CurrentState == LeaseState.Initial) | ||
80 | { | ||
81 | lease.InitialLeaseTime = TimeSpan.FromMinutes(0); | ||
82 | // lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0); | ||
83 | // lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0); | ||
84 | } | ||
85 | return lease; | ||
86 | } | ||
87 | |||
88 | public Scene World | ||
89 | { | ||
90 | get { return m_ScriptEngine.World; } | ||
91 | } | ||
92 | |||
93 | public string cmDetectedCountry(int number) | ||
94 | { | ||
95 | m_host.AddScriptLPS(1); | ||
96 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number); | ||
97 | if (detectedParams == null) | ||
98 | return String.Empty; | ||
99 | return detectedParams.Country; | ||
100 | } | ||
101 | |||
102 | public string cmGetAgentCountry(LSL_Key key) | ||
103 | { | ||
104 | if (!World.Permissions.IsGod(m_host.OwnerID)) | ||
105 | return String.Empty; | ||
106 | |||
107 | UUID uuid; | ||
108 | |||
109 | if (!UUID.TryParse(key, out uuid)) | ||
110 | return String.Empty; | ||
111 | |||
112 | UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); | ||
113 | return account.UserCountry; | ||
114 | } | ||
115 | } | ||
116 | } | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0d275f7..0c7f49b 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
31 | using System.Runtime.Remoting.Lifetime; | 32 | using System.Runtime.Remoting.Lifetime; |
32 | using System.Text; | 33 | using System.Text; |
33 | using System.Threading; | 34 | using System.Threading; |
34 | using System.Text.RegularExpressions; | 35 | using System.Text.RegularExpressions; |
36 | using System.Timers; | ||
35 | using Nini.Config; | 37 | using Nini.Config; |
36 | using log4net; | 38 | using log4net; |
37 | using OpenMetaverse; | 39 | using OpenMetaverse; |
@@ -44,6 +46,7 @@ using OpenSim.Region.CoreModules.World.Land; | |||
44 | using OpenSim.Region.CoreModules.World.Terrain; | 46 | using OpenSim.Region.CoreModules.World.Terrain; |
45 | using OpenSim.Region.Framework.Interfaces; | 47 | using OpenSim.Region.Framework.Interfaces; |
46 | using OpenSim.Region.Framework.Scenes; | 48 | using OpenSim.Region.Framework.Scenes; |
49 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
47 | using OpenSim.Region.Framework.Scenes.Animation; | 50 | using OpenSim.Region.Framework.Scenes.Animation; |
48 | using OpenSim.Region.Physics.Manager; | 51 | using OpenSim.Region.Physics.Manager; |
49 | using OpenSim.Region.ScriptEngine.Shared; | 52 | using OpenSim.Region.ScriptEngine.Shared; |
@@ -65,6 +68,7 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | |||
65 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | 68 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; |
66 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | 69 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; |
67 | using System.Reflection; | 70 | using System.Reflection; |
71 | using Timer = System.Timers.Timer; | ||
68 | 72 | ||
69 | namespace OpenSim.Region.ScriptEngine.Shared.Api | 73 | namespace OpenSim.Region.ScriptEngine.Shared.Api |
70 | { | 74 | { |
@@ -103,15 +107,52 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
103 | protected int m_notecardLineReadCharsMax = 255; | 107 | protected int m_notecardLineReadCharsMax = 255; |
104 | protected int m_scriptConsoleChannel = 0; | 108 | protected int m_scriptConsoleChannel = 0; |
105 | protected bool m_scriptConsoleChannelEnabled = false; | 109 | protected bool m_scriptConsoleChannelEnabled = false; |
110 | protected bool m_debuggerSafe = false; | ||
106 | protected IUrlModule m_UrlModule = null; | 111 | protected IUrlModule m_UrlModule = null; |
107 | protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>(); | 112 | protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = |
108 | protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp. | 113 | new Dictionary<UUID, UserInfoCacheEntry>(); |
114 | protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp. | ||
115 | |||
116 | // protected Timer m_ShoutSayTimer; | ||
117 | protected int m_SayShoutCount = 0; | ||
118 | DateTime m_lastSayShoutCheck; | ||
119 | |||
120 | private Dictionary<string, string> MovementAnimationsForLSL = | ||
121 | new Dictionary<string, string> { | ||
122 | {"FLY", "Flying"}, | ||
123 | {"FLYSLOW", "FlyingSlow"}, | ||
124 | {"HOVER_UP", "Hovering Up"}, | ||
125 | {"HOVER_DOWN", "Hovering Down"}, | ||
126 | {"HOVER", "Hovering"}, | ||
127 | {"LAND", "Landing"}, | ||
128 | {"FALLDOWN", "Falling Down"}, | ||
129 | {"PREJUMP", "PreJumping"}, | ||
130 | {"JUMP", "Jumping"}, | ||
131 | {"STANDUP", "Standing Up"}, | ||
132 | {"SOFT_LAND", "Soft Landing"}, | ||
133 | {"STAND", "Standing"}, | ||
134 | {"CROUCHWALK", "CrouchWalking"}, | ||
135 | {"RUN", "Running"}, | ||
136 | {"WALK", "Walking"}, | ||
137 | {"CROUCH", "Crouching"}, | ||
138 | {"TURNLEFT", "Turning Left"}, | ||
139 | {"TURNRIGHT", "Turning Right"} | ||
140 | }; | ||
109 | 141 | ||
110 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item) | 142 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item) |
111 | { | 143 | { |
144 | /* | ||
145 | m_ShoutSayTimer = new Timer(1000); | ||
146 | m_ShoutSayTimer.Elapsed += SayShoutTimerElapsed; | ||
147 | m_ShoutSayTimer.AutoReset = true; | ||
148 | m_ShoutSayTimer.Start(); | ||
149 | */ | ||
150 | m_lastSayShoutCheck = DateTime.UtcNow; | ||
151 | |||
112 | m_ScriptEngine = ScriptEngine; | 152 | m_ScriptEngine = ScriptEngine; |
113 | m_host = host; | 153 | m_host = host; |
114 | m_item = item; | 154 | m_item = item; |
155 | m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false); | ||
115 | 156 | ||
116 | LoadLimits(); // read script limits from config. | 157 | LoadLimits(); // read script limits from config. |
117 | 158 | ||
@@ -171,6 +212,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
171 | get { return m_ScriptEngine.World; } | 212 | get { return m_ScriptEngine.World; } |
172 | } | 213 | } |
173 | 214 | ||
215 | [DebuggerNonUserCode] | ||
174 | public void state(string newState) | 216 | public void state(string newState) |
175 | { | 217 | { |
176 | m_ScriptEngine.SetState(m_item.ItemID, newState); | 218 | m_ScriptEngine.SetState(m_item.ItemID, newState); |
@@ -180,6 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
180 | /// Reset the named script. The script must be present | 222 | /// Reset the named script. The script must be present |
181 | /// in the same prim. | 223 | /// in the same prim. |
182 | /// </summary> | 224 | /// </summary> |
225 | [DebuggerNonUserCode] | ||
183 | public void llResetScript() | 226 | public void llResetScript() |
184 | { | 227 | { |
185 | m_host.AddScriptLPS(1); | 228 | m_host.AddScriptLPS(1); |
@@ -242,6 +285,57 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
242 | } | 285 | } |
243 | } | 286 | } |
244 | 287 | ||
288 | public List<ScenePresence> GetLinkAvatars(int linkType) | ||
289 | { | ||
290 | List<ScenePresence> ret = new List<ScenePresence>(); | ||
291 | if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted) | ||
292 | return ret; | ||
293 | |||
294 | List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars(); | ||
295 | |||
296 | switch (linkType) | ||
297 | { | ||
298 | case ScriptBaseClass.LINK_SET: | ||
299 | return avs; | ||
300 | |||
301 | case ScriptBaseClass.LINK_ROOT: | ||
302 | return ret; | ||
303 | |||
304 | case ScriptBaseClass.LINK_ALL_OTHERS: | ||
305 | return avs; | ||
306 | |||
307 | case ScriptBaseClass.LINK_ALL_CHILDREN: | ||
308 | return avs; | ||
309 | |||
310 | case ScriptBaseClass.LINK_THIS: | ||
311 | return ret; | ||
312 | |||
313 | default: | ||
314 | if (linkType < 0) | ||
315 | return ret; | ||
316 | |||
317 | int partCount = m_host.ParentGroup.GetPartCount(); | ||
318 | |||
319 | if (linkType <= partCount) | ||
320 | { | ||
321 | return ret; | ||
322 | } | ||
323 | else | ||
324 | { | ||
325 | linkType = linkType - partCount; | ||
326 | if (linkType > avs.Count) | ||
327 | { | ||
328 | return ret; | ||
329 | } | ||
330 | else | ||
331 | { | ||
332 | ret.Add(avs[linkType-1]); | ||
333 | return ret; | ||
334 | } | ||
335 | } | ||
336 | } | ||
337 | } | ||
338 | |||
245 | public List<SceneObjectPart> GetLinkParts(int linkType) | 339 | public List<SceneObjectPart> GetLinkParts(int linkType) |
246 | { | 340 | { |
247 | return GetLinkParts(m_host, linkType); | 341 | return GetLinkParts(m_host, linkType); |
@@ -250,6 +344,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
250 | private List<SceneObjectPart> GetLinkParts(SceneObjectPart part, int linkType) | 344 | private List<SceneObjectPart> GetLinkParts(SceneObjectPart part, int linkType) |
251 | { | 345 | { |
252 | List<SceneObjectPart> ret = new List<SceneObjectPart>(); | 346 | List<SceneObjectPart> ret = new List<SceneObjectPart>(); |
347 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
348 | return ret; | ||
253 | ret.Add(part); | 349 | ret.Add(part); |
254 | 350 | ||
255 | switch (linkType) | 351 | switch (linkType) |
@@ -440,31 +536,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
440 | 536 | ||
441 | //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke | 537 | //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke |
442 | 538 | ||
443 | /// <summary> | 539 | // Utility function for llRot2Euler |
444 | /// Convert an LSL rotation to a Euler vector. | 540 | |
445 | /// </summary> | 541 | // normalize an angle between -PI and PI (-180 to +180 degrees) |
446 | /// <remarks> | 542 | protected double NormalizeAngle(double angle) |
447 | /// Using algorithm based off http://www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToEuler/quat_2_euler_paper_ver2-1.pdf | ||
448 | /// to avoid issues with singularity and rounding with Y rotation of +/- PI/2 | ||
449 | /// </remarks> | ||
450 | /// <param name="r"></param> | ||
451 | /// <returns></returns> | ||
452 | public LSL_Vector llRot2Euler(LSL_Rotation r) | ||
453 | { | 543 | { |
454 | m_host.AddScriptLPS(1); | 544 | if (angle > -Math.PI && angle < Math.PI) |
545 | return angle; | ||
455 | 546 | ||
456 | LSL_Vector v = new LSL_Vector(0.0, 0.0, 1.0) * r; // Z axis unit vector unaffected by Z rotation component of r. | 547 | int numPis = (int)(Math.PI / angle); |
457 | double m = LSL_Vector.Mag(v); // Just in case v isn't normalized, need magnitude for Asin() operation later. | 548 | double remainder = angle - Math.PI * numPis; |
458 | if (m == 0.0) return new LSL_Vector(); | 549 | if (numPis % 2 == 1) |
459 | double x = Math.Atan2(-v.y, v.z); | 550 | return Math.PI - angle; |
460 | double sin = v.x / m; | 551 | return remainder; |
461 | if (sin < -0.999999 || sin > 0.999999) x = 0.0; // Force X rotation to 0 at the singularities. | 552 | } |
462 | double y = Math.Asin(sin); | ||
463 | // Rotate X axis unit vector by r and unwind the X and Y rotations leaving only the Z rotation | ||
464 | 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))); | ||
465 | double z = Math.Atan2(v.y, v.x); | ||
466 | 553 | ||
467 | return new LSL_Vector(x, y, z); | 554 | public LSL_Vector llRot2Euler(LSL_Rotation q1) |
555 | { | ||
556 | m_host.AddScriptLPS(1); | ||
557 | LSL_Vector eul = new LSL_Vector(); | ||
558 | |||
559 | double sqw = q1.s*q1.s; | ||
560 | double sqx = q1.x*q1.x; | ||
561 | double sqy = q1.z*q1.z; | ||
562 | double sqz = q1.y*q1.y; | ||
563 | double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor | ||
564 | double test = q1.x*q1.z + q1.y*q1.s; | ||
565 | if (test > 0.4999*unit) { // singularity at north pole | ||
566 | eul.z = 2 * Math.Atan2(q1.x,q1.s); | ||
567 | eul.y = Math.PI/2; | ||
568 | eul.x = 0; | ||
569 | return eul; | ||
570 | } | ||
571 | if (test < -0.4999*unit) { // singularity at south pole | ||
572 | eul.z = -2 * Math.Atan2(q1.x,q1.s); | ||
573 | eul.y = -Math.PI/2; | ||
574 | eul.x = 0; | ||
575 | return eul; | ||
576 | } | ||
577 | eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw); | ||
578 | eul.y = Math.Asin(2*test/unit); | ||
579 | eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw); | ||
580 | return eul; | ||
468 | } | 581 | } |
469 | 582 | ||
470 | /* From wiki: | 583 | /* From wiki: |
@@ -517,18 +630,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
517 | m_host.AddScriptLPS(1); | 630 | m_host.AddScriptLPS(1); |
518 | 631 | ||
519 | double x,y,z,s; | 632 | double x,y,z,s; |
520 | 633 | v.x *= 0.5; | |
521 | double c1 = Math.Cos(v.x * 0.5); | 634 | v.y *= 0.5; |
522 | double c2 = Math.Cos(v.y * 0.5); | 635 | v.z *= 0.5; |
523 | double c3 = Math.Cos(v.z * 0.5); | 636 | double c1 = Math.Cos(v.x); |
524 | double s1 = Math.Sin(v.x * 0.5); | 637 | double c2 = Math.Cos(v.y); |
525 | double s2 = Math.Sin(v.y * 0.5); | 638 | double c1c2 = c1 * c2; |
526 | double s3 = Math.Sin(v.z * 0.5); | 639 | double s1 = Math.Sin(v.x); |
527 | 640 | double s2 = Math.Sin(v.y); | |
528 | x = s1 * c2 * c3 + c1 * s2 * s3; | 641 | double s1s2 = s1 * s2; |
529 | y = c1 * s2 * c3 - s1 * c2 * s3; | 642 | double c1s2 = c1 * s2; |
530 | z = s1 * s2 * c3 + c1 * c2 * s3; | 643 | double s1c2 = s1 * c2; |
531 | s = c1 * c2 * c3 - s1 * s2 * s3; | 644 | double c3 = Math.Cos(v.z); |
645 | double s3 = Math.Sin(v.z); | ||
646 | |||
647 | x = s1c2 * c3 + c1s2 * s3; | ||
648 | y = c1s2 * c3 - s1c2 * s3; | ||
649 | z = s1s2 * c3 + c1c2 * s3; | ||
650 | s = c1c2 * c3 - s1s2 * s3; | ||
532 | 651 | ||
533 | return new LSL_Rotation(x, y, z, s); | 652 | return new LSL_Rotation(x, y, z, s); |
534 | } | 653 | } |
@@ -666,77 +785,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
666 | { | 785 | { |
667 | //A and B should both be normalized | 786 | //A and B should both be normalized |
668 | m_host.AddScriptLPS(1); | 787 | m_host.AddScriptLPS(1); |
669 | LSL_Rotation rotBetween; | 788 | /* This method is more accurate than the SL one, and thus causes problems |
670 | // Check for zero vectors. If either is zero, return zero rotation. Otherwise, | 789 | for scripts that deal with the SL inaccuracy around 180-degrees -.- .._. |
671 | // continue calculation. | 790 | |
672 | if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f)) | 791 | double dotProduct = LSL_Vector.Dot(a, b); |
792 | LSL_Vector crossProduct = LSL_Vector.Cross(a, b); | ||
793 | double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b); | ||
794 | double angle = Math.Acos(dotProduct / magProduct); | ||
795 | LSL_Vector axis = LSL_Vector.Norm(crossProduct); | ||
796 | double s = Math.Sin(angle / 2); | ||
797 | |||
798 | double x = axis.x * s; | ||
799 | double y = axis.y * s; | ||
800 | double z = axis.z * s; | ||
801 | double w = Math.Cos(angle / 2); | ||
802 | |||
803 | if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w)) | ||
804 | return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); | ||
805 | |||
806 | return new LSL_Rotation((float)x, (float)y, (float)z, (float)w); | ||
807 | */ | ||
808 | |||
809 | // This method mimics the 180 errors found in SL | ||
810 | // See www.euclideanspace.com... angleBetween | ||
811 | LSL_Vector vec_a = a; | ||
812 | LSL_Vector vec_b = b; | ||
813 | |||
814 | // Eliminate zero length | ||
815 | LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a); | ||
816 | LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b); | ||
817 | if (vec_a_mag < 0.00001 || | ||
818 | vec_b_mag < 0.00001) | ||
673 | { | 819 | { |
674 | rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); | 820 | return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); |
675 | } | 821 | } |
676 | else | 822 | |
823 | // Normalize | ||
824 | vec_a = llVecNorm(vec_a); | ||
825 | vec_b = llVecNorm(vec_b); | ||
826 | |||
827 | // Calculate axis and rotation angle | ||
828 | LSL_Vector axis = vec_a % vec_b; | ||
829 | LSL_Float cos_theta = vec_a * vec_b; | ||
830 | |||
831 | // Check if parallel | ||
832 | if (cos_theta > 0.99999) | ||
677 | { | 833 | { |
678 | a = LSL_Vector.Norm(a); | 834 | return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); |
679 | b = LSL_Vector.Norm(b); | 835 | } |
680 | double dotProduct = LSL_Vector.Dot(a, b); | 836 | |
681 | // There are two degenerate cases possible. These are for vectors 180 or | 837 | // Check if anti-parallel |
682 | // 0 degrees apart. These have to be detected and handled individually. | 838 | else if (cos_theta < -0.99999) |
683 | // | 839 | { |
684 | // Check for vectors 180 degrees apart. | 840 | LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a); |
685 | // A dot product of -1 would mean the angle between vectors is 180 degrees. | 841 | if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0); |
686 | if (dotProduct < -0.9999999f) | 842 | return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0); |
687 | { | 843 | } |
688 | // First assume X axis is orthogonal to the vectors. | 844 | else // other rotation |
689 | LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f); | 845 | { |
690 | orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a)); | 846 | LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f; |
691 | // Check for near zero vector. A very small non-zero number here will create | 847 | axis = llVecNorm(axis); |
692 | // a rotation in an undesired direction. | 848 | double x, y, z, s, t; |
693 | if (LSL_Vector.Mag(orthoVector) > 0.0001) | 849 | s = Math.Cos(theta); |
694 | { | 850 | t = Math.Sin(theta); |
695 | rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f); | 851 | x = axis.x * t; |
696 | } | 852 | y = axis.y * t; |
697 | // If the magnitude of the vector was near zero, then assume the X axis is not | 853 | z = axis.z * t; |
698 | // orthogonal and use the Z axis instead. | 854 | return new LSL_Rotation(x,y,z,s); |
699 | else | ||
700 | { | ||
701 | // Set 180 z rotation. | ||
702 | rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f); | ||
703 | } | ||
704 | } | ||
705 | // Check for parallel vectors. | ||
706 | // A dot product of 1 would mean the angle between vectors is 0 degrees. | ||
707 | else if (dotProduct > 0.9999999f) | ||
708 | { | ||
709 | // Set zero rotation. | ||
710 | rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); | ||
711 | } | ||
712 | else | ||
713 | { | ||
714 | // All special checks have been performed so get the axis of rotation. | ||
715 | LSL_Vector crossProduct = LSL_Vector.Cross(a, b); | ||
716 | // Quarternion s value is the length of the unit vector + dot product. | ||
717 | double qs = 1.0 + dotProduct; | ||
718 | rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs); | ||
719 | // Normalize the rotation. | ||
720 | double mag = LSL_Rotation.Mag(rotBetween); | ||
721 | // We shouldn't have to worry about a divide by zero here. The qs value will be | ||
722 | // non-zero because we already know if we're here, then the dotProduct is not -1 so | ||
723 | // qs will not be zero. Also, we've already handled the input vectors being zero so the | ||
724 | // crossProduct vector should also not be zero. | ||
725 | rotBetween.x = rotBetween.x / mag; | ||
726 | rotBetween.y = rotBetween.y / mag; | ||
727 | rotBetween.z = rotBetween.z / mag; | ||
728 | rotBetween.s = rotBetween.s / mag; | ||
729 | // Check for undefined values and set zero rotation if any found. This code might not actually be required | ||
730 | // any longer since zero vectors are checked for at the top. | ||
731 | if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s)) | ||
732 | { | ||
733 | rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); | ||
734 | } | ||
735 | } | ||
736 | } | 855 | } |
737 | return rotBetween; | ||
738 | } | 856 | } |
739 | 857 | ||
740 | public void llWhisper(int channelID, string text) | 858 | public void llWhisper(int channelID, string text) |
741 | { | 859 | { |
742 | m_host.AddScriptLPS(1); | 860 | m_host.AddScriptLPS(1); |
@@ -752,10 +870,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
752 | wComm.DeliverMessage(ChatTypeEnum.Whisper, channelID, m_host.Name, m_host.UUID, text); | 870 | wComm.DeliverMessage(ChatTypeEnum.Whisper, channelID, m_host.Name, m_host.UUID, text); |
753 | } | 871 | } |
754 | 872 | ||
873 | private void CheckSayShoutTime() | ||
874 | { | ||
875 | DateTime now = DateTime.UtcNow; | ||
876 | if ((now - m_lastSayShoutCheck).Ticks > 10000000) // 1sec | ||
877 | { | ||
878 | m_lastSayShoutCheck = now; | ||
879 | m_SayShoutCount = 0; | ||
880 | } | ||
881 | else | ||
882 | m_SayShoutCount++; | ||
883 | } | ||
884 | |||
755 | public void llSay(int channelID, string text) | 885 | public void llSay(int channelID, string text) |
756 | { | 886 | { |
757 | m_host.AddScriptLPS(1); | 887 | m_host.AddScriptLPS(1); |
758 | 888 | ||
889 | if (channelID == 0) | ||
890 | // m_SayShoutCount++; | ||
891 | CheckSayShoutTime(); | ||
892 | |||
893 | if (m_SayShoutCount >= 11) | ||
894 | ScriptSleep(2000); | ||
895 | |||
759 | if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel)) | 896 | if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel)) |
760 | { | 897 | { |
761 | Console.WriteLine(text); | 898 | Console.WriteLine(text); |
@@ -778,6 +915,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
778 | { | 915 | { |
779 | m_host.AddScriptLPS(1); | 916 | m_host.AddScriptLPS(1); |
780 | 917 | ||
918 | if (channelID == 0) | ||
919 | // m_SayShoutCount++; | ||
920 | CheckSayShoutTime(); | ||
921 | |||
922 | if (m_SayShoutCount >= 11) | ||
923 | ScriptSleep(2000); | ||
924 | |||
781 | if (text.Length > 1023) | 925 | if (text.Length > 1023) |
782 | text = text.Substring(0, 1023); | 926 | text = text.Substring(0, 1023); |
783 | 927 | ||
@@ -809,22 +953,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
809 | 953 | ||
810 | public void llRegionSayTo(string target, int channel, string msg) | 954 | public void llRegionSayTo(string target, int channel, string msg) |
811 | { | 955 | { |
956 | string error = String.Empty; | ||
957 | |||
812 | if (msg.Length > 1023) | 958 | if (msg.Length > 1023) |
813 | msg = msg.Substring(0, 1023); | 959 | msg = msg.Substring(0, 1023); |
814 | 960 | ||
815 | m_host.AddScriptLPS(1); | 961 | m_host.AddScriptLPS(1); |
816 | 962 | ||
817 | if (channel == ScriptBaseClass.DEBUG_CHANNEL) | ||
818 | { | ||
819 | return; | ||
820 | } | ||
821 | |||
822 | UUID TargetID; | 963 | UUID TargetID; |
823 | UUID.TryParse(target, out TargetID); | 964 | UUID.TryParse(target, out TargetID); |
824 | 965 | ||
825 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); | 966 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); |
826 | if (wComm != null) | 967 | if (wComm != null) |
827 | wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg); | 968 | if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error)) |
969 | LSLError(error); | ||
828 | } | 970 | } |
829 | 971 | ||
830 | public LSL_Integer llListen(int channelID, string name, string ID, string msg) | 972 | public LSL_Integer llListen(int channelID, string name, string ID, string msg) |
@@ -1080,10 +1222,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1080 | return detectedParams.TouchUV; | 1222 | return detectedParams.TouchUV; |
1081 | } | 1223 | } |
1082 | 1224 | ||
1225 | [DebuggerNonUserCode] | ||
1083 | public virtual void llDie() | 1226 | public virtual void llDie() |
1084 | { | 1227 | { |
1085 | m_host.AddScriptLPS(1); | 1228 | m_host.AddScriptLPS(1); |
1086 | throw new SelfDeleteException(); | 1229 | if (!m_host.ParentGroup.IsAttachment) throw new SelfDeleteException(); |
1087 | } | 1230 | } |
1088 | 1231 | ||
1089 | public LSL_Float llGround(LSL_Vector offset) | 1232 | public LSL_Float llGround(LSL_Vector offset) |
@@ -1154,6 +1297,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1154 | 1297 | ||
1155 | public void llSetStatus(int status, int value) | 1298 | public void llSetStatus(int status, int value) |
1156 | { | 1299 | { |
1300 | if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted) | ||
1301 | return; | ||
1157 | m_host.AddScriptLPS(1); | 1302 | m_host.AddScriptLPS(1); |
1158 | 1303 | ||
1159 | int statusrotationaxis = 0; | 1304 | int statusrotationaxis = 0; |
@@ -1177,6 +1322,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1177 | if (!allow) | 1322 | if (!allow) |
1178 | return; | 1323 | return; |
1179 | 1324 | ||
1325 | if (m_host.ParentGroup.RootPart.PhysActor != null && | ||
1326 | m_host.ParentGroup.RootPart.PhysActor.IsPhysical) | ||
1327 | return; | ||
1328 | |||
1180 | m_host.ScriptSetPhysicsStatus(true); | 1329 | m_host.ScriptSetPhysicsStatus(true); |
1181 | } | 1330 | } |
1182 | else | 1331 | else |
@@ -1376,6 +1525,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1376 | { | 1525 | { |
1377 | m_host.AddScriptLPS(1); | 1526 | m_host.AddScriptLPS(1); |
1378 | 1527 | ||
1528 | SetColor(m_host, color, face); | ||
1529 | } | ||
1530 | |||
1531 | protected void SetColor(SceneObjectPart part, LSL_Vector color, int face) | ||
1532 | { | ||
1533 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
1534 | return; | ||
1535 | |||
1536 | Primitive.TextureEntry tex = part.Shape.Textures; | ||
1537 | Color4 texcolor; | ||
1538 | if (face >= 0 && face < GetNumberOfSides(part)) | ||
1539 | { | ||
1540 | texcolor = tex.CreateFace((uint)face).RGBA; | ||
1541 | texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f); | ||
1542 | texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f); | ||
1543 | texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f); | ||
1544 | tex.FaceTextures[face].RGBA = texcolor; | ||
1545 | part.UpdateTextureEntry(tex.GetBytes()); | ||
1546 | return; | ||
1547 | } | ||
1548 | else if (face == ScriptBaseClass.ALL_SIDES) | ||
1549 | { | ||
1550 | for (uint i = 0; i < GetNumberOfSides(part); i++) | ||
1551 | { | ||
1552 | if (tex.FaceTextures[i] != null) | ||
1553 | { | ||
1554 | texcolor = tex.FaceTextures[i].RGBA; | ||
1555 | texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f); | ||
1556 | texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f); | ||
1557 | texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f); | ||
1558 | tex.FaceTextures[i].RGBA = texcolor; | ||
1559 | } | ||
1560 | texcolor = tex.DefaultTexture.RGBA; | ||
1561 | texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f); | ||
1562 | texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f); | ||
1563 | texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f); | ||
1564 | tex.DefaultTexture.RGBA = texcolor; | ||
1565 | } | ||
1566 | part.UpdateTextureEntry(tex.GetBytes()); | ||
1567 | return; | ||
1568 | } | ||
1569 | |||
1379 | if (face == ScriptBaseClass.ALL_SIDES) | 1570 | if (face == ScriptBaseClass.ALL_SIDES) |
1380 | face = SceneObjectPart.ALL_SIDES; | 1571 | face = SceneObjectPart.ALL_SIDES; |
1381 | 1572 | ||
@@ -1384,6 +1575,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1384 | 1575 | ||
1385 | public void SetTexGen(SceneObjectPart part, int face,int style) | 1576 | public void SetTexGen(SceneObjectPart part, int face,int style) |
1386 | { | 1577 | { |
1578 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
1579 | return; | ||
1580 | |||
1387 | Primitive.TextureEntry tex = part.Shape.Textures; | 1581 | Primitive.TextureEntry tex = part.Shape.Textures; |
1388 | MappingType textype; | 1582 | MappingType textype; |
1389 | textype = MappingType.Default; | 1583 | textype = MappingType.Default; |
@@ -1414,6 +1608,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1414 | 1608 | ||
1415 | public void SetGlow(SceneObjectPart part, int face, float glow) | 1609 | public void SetGlow(SceneObjectPart part, int face, float glow) |
1416 | { | 1610 | { |
1611 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
1612 | return; | ||
1613 | |||
1417 | Primitive.TextureEntry tex = part.Shape.Textures; | 1614 | Primitive.TextureEntry tex = part.Shape.Textures; |
1418 | if (face >= 0 && face < GetNumberOfSides(part)) | 1615 | if (face >= 0 && face < GetNumberOfSides(part)) |
1419 | { | 1616 | { |
@@ -1439,6 +1636,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1439 | 1636 | ||
1440 | public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) | 1637 | public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) |
1441 | { | 1638 | { |
1639 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
1640 | return; | ||
1442 | 1641 | ||
1443 | Shininess sval = new Shininess(); | 1642 | Shininess sval = new Shininess(); |
1444 | 1643 | ||
@@ -1489,6 +1688,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1489 | 1688 | ||
1490 | public void SetFullBright(SceneObjectPart part, int face, bool bright) | 1689 | public void SetFullBright(SceneObjectPart part, int face, bool bright) |
1491 | { | 1690 | { |
1691 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
1692 | return; | ||
1693 | |||
1492 | Primitive.TextureEntry tex = part.Shape.Textures; | 1694 | Primitive.TextureEntry tex = part.Shape.Textures; |
1493 | if (face >= 0 && face < GetNumberOfSides(part)) | 1695 | if (face >= 0 && face < GetNumberOfSides(part)) |
1494 | { | 1696 | { |
@@ -1549,13 +1751,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1549 | m_host.AddScriptLPS(1); | 1751 | m_host.AddScriptLPS(1); |
1550 | 1752 | ||
1551 | List<SceneObjectPart> parts = GetLinkParts(linknumber); | 1753 | List<SceneObjectPart> parts = GetLinkParts(linknumber); |
1552 | 1754 | if (parts.Count > 0) | |
1553 | foreach (SceneObjectPart part in parts) | 1755 | { |
1554 | SetAlpha(part, alpha, face); | 1756 | try |
1757 | { | ||
1758 | foreach (SceneObjectPart part in parts) | ||
1759 | SetAlpha(part, alpha, face); | ||
1760 | } | ||
1761 | finally | ||
1762 | { | ||
1763 | } | ||
1764 | } | ||
1555 | } | 1765 | } |
1556 | 1766 | ||
1557 | protected void SetAlpha(SceneObjectPart part, double alpha, int face) | 1767 | protected void SetAlpha(SceneObjectPart part, double alpha, int face) |
1558 | { | 1768 | { |
1769 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
1770 | return; | ||
1771 | |||
1559 | Primitive.TextureEntry tex = part.Shape.Textures; | 1772 | Primitive.TextureEntry tex = part.Shape.Textures; |
1560 | Color4 texcolor; | 1773 | Color4 texcolor; |
1561 | if (face >= 0 && face < GetNumberOfSides(part)) | 1774 | if (face >= 0 && face < GetNumberOfSides(part)) |
@@ -1608,7 +1821,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1608 | protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, | 1821 | protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, |
1609 | float wind, float tension, LSL_Vector Force) | 1822 | float wind, float tension, LSL_Vector Force) |
1610 | { | 1823 | { |
1611 | if (part == null) | 1824 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) |
1612 | return; | 1825 | return; |
1613 | 1826 | ||
1614 | if (flexi) | 1827 | if (flexi) |
@@ -1642,7 +1855,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1642 | /// <param name="falloff"></param> | 1855 | /// <param name="falloff"></param> |
1643 | protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) | 1856 | protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) |
1644 | { | 1857 | { |
1645 | if (part == null) | 1858 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) |
1646 | return; | 1859 | return; |
1647 | 1860 | ||
1648 | if (light) | 1861 | if (light) |
@@ -1675,11 +1888,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1675 | Primitive.TextureEntry tex = part.Shape.Textures; | 1888 | Primitive.TextureEntry tex = part.Shape.Textures; |
1676 | Color4 texcolor; | 1889 | Color4 texcolor; |
1677 | LSL_Vector rgb = new LSL_Vector(); | 1890 | LSL_Vector rgb = new LSL_Vector(); |
1891 | int nsides = GetNumberOfSides(part); | ||
1892 | |||
1678 | if (face == ScriptBaseClass.ALL_SIDES) | 1893 | if (face == ScriptBaseClass.ALL_SIDES) |
1679 | { | 1894 | { |
1680 | int i; | 1895 | int i; |
1681 | 1896 | for (i = 0; i < nsides; i++) | |
1682 | for (i = 0 ; i < GetNumberOfSides(part); i++) | ||
1683 | { | 1897 | { |
1684 | texcolor = tex.GetFace((uint)i).RGBA; | 1898 | texcolor = tex.GetFace((uint)i).RGBA; |
1685 | rgb.x += texcolor.R; | 1899 | rgb.x += texcolor.R; |
@@ -1687,14 +1901,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1687 | rgb.z += texcolor.B; | 1901 | rgb.z += texcolor.B; |
1688 | } | 1902 | } |
1689 | 1903 | ||
1690 | rgb.x /= (float)GetNumberOfSides(part); | 1904 | float invnsides = 1.0f / (float)nsides; |
1691 | rgb.y /= (float)GetNumberOfSides(part); | 1905 | |
1692 | rgb.z /= (float)GetNumberOfSides(part); | 1906 | rgb.x *= invnsides; |
1907 | rgb.y *= invnsides; | ||
1908 | rgb.z *= invnsides; | ||
1693 | 1909 | ||
1694 | return rgb; | 1910 | return rgb; |
1695 | } | 1911 | } |
1696 | 1912 | if (face >= 0 && face < nsides) | |
1697 | if (face >= 0 && face < GetNumberOfSides(part)) | ||
1698 | { | 1913 | { |
1699 | texcolor = tex.GetFace((uint)face).RGBA; | 1914 | texcolor = tex.GetFace((uint)face).RGBA; |
1700 | rgb.x = texcolor.R; | 1915 | rgb.x = texcolor.R; |
@@ -1721,15 +1936,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1721 | m_host.AddScriptLPS(1); | 1936 | m_host.AddScriptLPS(1); |
1722 | 1937 | ||
1723 | List<SceneObjectPart> parts = GetLinkParts(linknumber); | 1938 | List<SceneObjectPart> parts = GetLinkParts(linknumber); |
1724 | 1939 | if (parts.Count > 0) | |
1725 | foreach (SceneObjectPart part in parts) | 1940 | { |
1726 | SetTexture(part, texture, face); | 1941 | try |
1727 | 1942 | { | |
1943 | foreach (SceneObjectPart part in parts) | ||
1944 | SetTexture(part, texture, face); | ||
1945 | } | ||
1946 | finally | ||
1947 | { | ||
1948 | } | ||
1949 | } | ||
1728 | ScriptSleep(200); | 1950 | ScriptSleep(200); |
1729 | } | 1951 | } |
1730 | 1952 | ||
1731 | protected void SetTexture(SceneObjectPart part, string texture, int face) | 1953 | protected void SetTexture(SceneObjectPart part, string texture, int face) |
1732 | { | 1954 | { |
1955 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
1956 | return; | ||
1957 | |||
1733 | UUID textureID = new UUID(); | 1958 | UUID textureID = new UUID(); |
1734 | 1959 | ||
1735 | textureID = InventoryKey(texture, (int)AssetType.Texture); | 1960 | textureID = InventoryKey(texture, (int)AssetType.Texture); |
@@ -1774,6 +1999,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1774 | 1999 | ||
1775 | protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) | 2000 | protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) |
1776 | { | 2001 | { |
2002 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
2003 | return; | ||
2004 | |||
1777 | Primitive.TextureEntry tex = part.Shape.Textures; | 2005 | Primitive.TextureEntry tex = part.Shape.Textures; |
1778 | if (face >= 0 && face < GetNumberOfSides(part)) | 2006 | if (face >= 0 && face < GetNumberOfSides(part)) |
1779 | { | 2007 | { |
@@ -1810,6 +2038,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1810 | 2038 | ||
1811 | protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) | 2039 | protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) |
1812 | { | 2040 | { |
2041 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
2042 | return; | ||
2043 | |||
1813 | Primitive.TextureEntry tex = part.Shape.Textures; | 2044 | Primitive.TextureEntry tex = part.Shape.Textures; |
1814 | if (face >= 0 && face < GetNumberOfSides(part)) | 2045 | if (face >= 0 && face < GetNumberOfSides(part)) |
1815 | { | 2046 | { |
@@ -1846,6 +2077,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1846 | 2077 | ||
1847 | protected void RotateTexture(SceneObjectPart part, double rotation, int face) | 2078 | protected void RotateTexture(SceneObjectPart part, double rotation, int face) |
1848 | { | 2079 | { |
2080 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
2081 | return; | ||
2082 | |||
1849 | Primitive.TextureEntry tex = part.Shape.Textures; | 2083 | Primitive.TextureEntry tex = part.Shape.Textures; |
1850 | if (face >= 0 && face < GetNumberOfSides(part)) | 2084 | if (face >= 0 && face < GetNumberOfSides(part)) |
1851 | { | 2085 | { |
@@ -2016,24 +2250,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2016 | /// <param name="adjust">if TRUE, will cap the distance to 10m.</param> | 2250 | /// <param name="adjust">if TRUE, will cap the distance to 10m.</param> |
2017 | protected void SetPos(SceneObjectPart part, LSL_Vector targetPos, bool adjust) | 2251 | protected void SetPos(SceneObjectPart part, LSL_Vector targetPos, bool adjust) |
2018 | { | 2252 | { |
2019 | // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) | 2253 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) |
2254 | return; | ||
2255 | |||
2020 | LSL_Vector currentPos = GetPartLocalPos(part); | 2256 | LSL_Vector currentPos = GetPartLocalPos(part); |
2257 | LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos); | ||
2021 | 2258 | ||
2022 | float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y); | ||
2023 | bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true); | ||
2024 | 2259 | ||
2025 | if (part.ParentGroup.RootPart == part) | 2260 | if (part.ParentGroup.RootPart == part) |
2026 | { | 2261 | { |
2027 | if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0) | ||
2028 | targetPos.z = ground; | ||
2029 | SceneObjectGroup parent = part.ParentGroup; | 2262 | SceneObjectGroup parent = part.ParentGroup; |
2030 | parent.UpdateGroupPosition(!adjust ? targetPos : | 2263 | if (!World.Permissions.CanObjectEntry(parent.UUID, false, (Vector3)toPos)) |
2031 | SetPosAdjust(currentPos, targetPos)); | 2264 | return; |
2265 | Util.FireAndForget(delegate(object x) { | ||
2266 | parent.UpdateGroupPosition((Vector3)toPos); | ||
2267 | }); | ||
2032 | } | 2268 | } |
2033 | else | 2269 | else |
2034 | { | 2270 | { |
2035 | part.OffsetPosition = !adjust ? targetPos : | 2271 | part.OffsetPosition = (Vector3)toPos; |
2036 | SetPosAdjust(currentPos, targetPos); | ||
2037 | SceneObjectGroup parent = part.ParentGroup; | 2272 | SceneObjectGroup parent = part.ParentGroup; |
2038 | parent.HasGroupChanged = true; | 2273 | parent.HasGroupChanged = true; |
2039 | parent.ScheduleGroupForTerseUpdate(); | 2274 | parent.ScheduleGroupForTerseUpdate(); |
@@ -2066,13 +2301,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2066 | else | 2301 | else |
2067 | { | 2302 | { |
2068 | if (part.ParentGroup.IsAttachment) | 2303 | if (part.ParentGroup.IsAttachment) |
2069 | { | ||
2070 | pos = part.AttachedPos; | 2304 | pos = part.AttachedPos; |
2071 | } | ||
2072 | else | 2305 | else |
2073 | { | ||
2074 | pos = part.AbsolutePosition; | 2306 | pos = part.AbsolutePosition; |
2075 | } | ||
2076 | } | 2307 | } |
2077 | 2308 | ||
2078 | // m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos); | 2309 | // m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos); |
@@ -2085,18 +2316,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2085 | m_host.AddScriptLPS(1); | 2316 | m_host.AddScriptLPS(1); |
2086 | 2317 | ||
2087 | // try to let this work as in SL... | 2318 | // try to let this work as in SL... |
2088 | if (m_host.ParentID == 0) | 2319 | if (m_host.LinkNum < 2) |
2089 | { | 2320 | { |
2090 | // special case: If we are root, rotate complete SOG to new rotation | 2321 | // Special case: If we are root, rotate complete SOG to new |
2322 | // rotation. | ||
2323 | // We are root if the link number is 0 (single prim) or 1 | ||
2324 | // (root prim). ParentID may be nonzero in attachments and | ||
2325 | // using it would cause attachments and HUDs to rotate | ||
2326 | // to the wrong positions. | ||
2327 | |||
2091 | SetRot(m_host, rot); | 2328 | SetRot(m_host, rot); |
2092 | } | 2329 | } |
2093 | else | 2330 | else |
2094 | { | 2331 | { |
2095 | // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask. | 2332 | // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask. |
2096 | SceneObjectPart rootPart = m_host.ParentGroup.RootPart; | 2333 | SceneObjectPart rootPart; |
2097 | if (rootPart != null) // better safe than sorry | 2334 | if (m_host.ParentGroup != null) // better safe than sorry |
2098 | { | 2335 | { |
2099 | SetRot(m_host, rootPart.RotationOffset * (Quaternion)rot); | 2336 | rootPart = m_host.ParentGroup.RootPart; |
2337 | if (rootPart != null) | ||
2338 | SetRot(m_host, rootPart.RotationOffset * (Quaternion)rot); | ||
2100 | } | 2339 | } |
2101 | } | 2340 | } |
2102 | 2341 | ||
@@ -2112,25 +2351,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2112 | 2351 | ||
2113 | protected void SetRot(SceneObjectPart part, Quaternion rot) | 2352 | protected void SetRot(SceneObjectPart part, Quaternion rot) |
2114 | { | 2353 | { |
2115 | part.UpdateRotation(rot); | 2354 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) |
2116 | // Update rotation does not move the object in the physics scene if it's a linkset. | 2355 | return; |
2117 | 2356 | ||
2118 | //KF: Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type | 2357 | bool isroot = (part == part.ParentGroup.RootPart); |
2119 | // part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; | 2358 | bool isphys; |
2120 | 2359 | ||
2121 | // So, after thinking about this for a bit, the issue with the part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition line | ||
2122 | // is it isn't compatible with vehicles because it causes the vehicle body to have to be broken down and rebuilt | ||
2123 | // It's perfectly okay when the object is not an active physical body though. | ||
2124 | // So, part.ParentGroup.ResetChildPrimPhysicsPositions(); does the thing that Kitto is warning against | ||
2125 | // but only if the object is not physial and active. This is important for rotating doors. | ||
2126 | // without the absoluteposition = absoluteposition happening, the doors do not move in the physics | ||
2127 | // scene | ||
2128 | PhysicsActor pa = part.PhysActor; | 2360 | PhysicsActor pa = part.PhysActor; |
2129 | 2361 | ||
2130 | if (pa != null && !pa.IsPhysical) | 2362 | // keep using physactor ideia of isphysical |
2363 | // it should be SOP ideia of that | ||
2364 | // not much of a issue with ubitODE | ||
2365 | if (pa != null && pa.IsPhysical) | ||
2366 | isphys = true; | ||
2367 | else | ||
2368 | isphys = false; | ||
2369 | |||
2370 | // SL doesn't let scripts rotate root of physical linksets | ||
2371 | if (isroot && isphys) | ||
2372 | return; | ||
2373 | |||
2374 | part.UpdateRotation(rot); | ||
2375 | |||
2376 | // Update rotation does not move the object in the physics engine if it's a non physical linkset | ||
2377 | // so do a nasty update of parts positions if is a root part rotation | ||
2378 | if (isroot && pa != null) // with if above implies non physical root part | ||
2131 | { | 2379 | { |
2132 | part.ParentGroup.ResetChildPrimPhysicsPositions(); | 2380 | part.ParentGroup.ResetChildPrimPhysicsPositions(); |
2133 | } | 2381 | } |
2382 | else // fix sitting avatars. This is only needed bc of how we link avas to child parts, not root part | ||
2383 | { | ||
2384 | List<ScenePresence> sittingavas = part.ParentGroup.GetLinkedAvatars(); | ||
2385 | if (sittingavas.Count > 0) | ||
2386 | { | ||
2387 | foreach (ScenePresence av in sittingavas) | ||
2388 | { | ||
2389 | if (isroot || part.LocalId == av.ParentID) | ||
2390 | av.SendTerseUpdateToAllClients(); | ||
2391 | } | ||
2392 | } | ||
2393 | } | ||
2134 | } | 2394 | } |
2135 | 2395 | ||
2136 | /// <summary> | 2396 | /// <summary> |
@@ -2178,8 +2438,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2178 | 2438 | ||
2179 | public LSL_Rotation llGetLocalRot() | 2439 | public LSL_Rotation llGetLocalRot() |
2180 | { | 2440 | { |
2441 | return GetPartLocalRot(m_host); | ||
2442 | } | ||
2443 | |||
2444 | private LSL_Rotation GetPartLocalRot(SceneObjectPart part) | ||
2445 | { | ||
2181 | m_host.AddScriptLPS(1); | 2446 | m_host.AddScriptLPS(1); |
2182 | return new LSL_Rotation(m_host.RotationOffset.X, m_host.RotationOffset.Y, m_host.RotationOffset.Z, m_host.RotationOffset.W); | 2447 | Quaternion rot = part.RotationOffset; |
2448 | return new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W); | ||
2183 | } | 2449 | } |
2184 | 2450 | ||
2185 | public void llSetForce(LSL_Vector force, int local) | 2451 | public void llSetForce(LSL_Vector force, int local) |
@@ -2259,16 +2525,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2259 | m_host.ApplyImpulse(v, local != 0); | 2525 | m_host.ApplyImpulse(v, local != 0); |
2260 | } | 2526 | } |
2261 | 2527 | ||
2528 | |||
2262 | public void llApplyRotationalImpulse(LSL_Vector force, int local) | 2529 | public void llApplyRotationalImpulse(LSL_Vector force, int local) |
2263 | { | 2530 | { |
2264 | m_host.AddScriptLPS(1); | 2531 | m_host.AddScriptLPS(1); |
2265 | m_host.ApplyAngularImpulse(force, local != 0); | 2532 | m_host.ParentGroup.RootPart.ApplyAngularImpulse(force, local != 0); |
2266 | } | 2533 | } |
2267 | 2534 | ||
2268 | public void llSetTorque(LSL_Vector torque, int local) | 2535 | public void llSetTorque(LSL_Vector torque, int local) |
2269 | { | 2536 | { |
2270 | m_host.AddScriptLPS(1); | 2537 | m_host.AddScriptLPS(1); |
2271 | m_host.SetAngularImpulse(torque, local != 0); | 2538 | m_host.ParentGroup.RootPart.SetAngularImpulse(torque, local != 0); |
2272 | } | 2539 | } |
2273 | 2540 | ||
2274 | public LSL_Vector llGetTorque() | 2541 | public LSL_Vector llGetTorque() |
@@ -2285,20 +2552,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2285 | llSetTorque(torque, local); | 2552 | llSetTorque(torque, local); |
2286 | } | 2553 | } |
2287 | 2554 | ||
2555 | public void llSetVelocity(LSL_Vector vel, int local) | ||
2556 | { | ||
2557 | m_host.AddScriptLPS(1); | ||
2558 | m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0); | ||
2559 | } | ||
2560 | |||
2288 | public LSL_Vector llGetVel() | 2561 | public LSL_Vector llGetVel() |
2289 | { | 2562 | { |
2290 | m_host.AddScriptLPS(1); | 2563 | m_host.AddScriptLPS(1); |
2291 | 2564 | ||
2292 | Vector3 vel; | 2565 | Vector3 vel = Vector3.Zero; |
2293 | 2566 | ||
2294 | if (m_host.ParentGroup.IsAttachment) | 2567 | if (m_host.ParentGroup.IsAttachment) |
2295 | { | 2568 | { |
2296 | ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar); | 2569 | ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar); |
2297 | vel = avatar.Velocity; | 2570 | if (avatar != null) |
2571 | vel = avatar.Velocity; | ||
2298 | } | 2572 | } |
2299 | else | 2573 | else |
2300 | { | 2574 | { |
2301 | vel = m_host.Velocity; | 2575 | vel = m_host.ParentGroup.RootPart.Velocity; |
2302 | } | 2576 | } |
2303 | 2577 | ||
2304 | return new LSL_Vector(vel.X, vel.Y, vel.Z); | 2578 | return new LSL_Vector(vel.X, vel.Y, vel.Z); |
@@ -2310,10 +2584,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2310 | return new LSL_Vector(m_host.Acceleration.X, m_host.Acceleration.Y, m_host.Acceleration.Z); | 2584 | return new LSL_Vector(m_host.Acceleration.X, m_host.Acceleration.Y, m_host.Acceleration.Z); |
2311 | } | 2585 | } |
2312 | 2586 | ||
2587 | public void llSetAngularVelocity(LSL_Vector avel, int local) | ||
2588 | { | ||
2589 | m_host.AddScriptLPS(1); | ||
2590 | m_host.SetAngularVelocity(new Vector3((float)avel.x, (float)avel.y, (float)avel.z), local != 0); | ||
2591 | } | ||
2592 | |||
2313 | public LSL_Vector llGetOmega() | 2593 | public LSL_Vector llGetOmega() |
2314 | { | 2594 | { |
2315 | m_host.AddScriptLPS(1); | 2595 | m_host.AddScriptLPS(1); |
2316 | return new LSL_Vector(m_host.AngularVelocity.X, m_host.AngularVelocity.Y, m_host.AngularVelocity.Z); | 2596 | Vector3 avel = m_host.AngularVelocity; |
2597 | return new LSL_Vector(avel.X, avel.Y, avel.Z); | ||
2317 | } | 2598 | } |
2318 | 2599 | ||
2319 | public LSL_Float llGetTimeOfDay() | 2600 | public LSL_Float llGetTimeOfDay() |
@@ -2839,16 +3120,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2839 | new_group.RootPart.UUID.ToString()) }, | 3120 | new_group.RootPart.UUID.ToString()) }, |
2840 | new DetectParams[0])); | 3121 | new DetectParams[0])); |
2841 | 3122 | ||
2842 | float groupmass = new_group.GetMass(); | 3123 | // do recoil |
3124 | SceneObjectGroup hostgrp = m_host.ParentGroup; | ||
3125 | if (hostgrp == null) | ||
3126 | return; | ||
3127 | |||
3128 | if (hostgrp.IsAttachment) // don't recoil avatars | ||
3129 | return; | ||
2843 | 3130 | ||
2844 | PhysicsActor pa = new_group.RootPart.PhysActor; | 3131 | PhysicsActor pa = new_group.RootPart.PhysActor; |
2845 | 3132 | ||
2846 | if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero) | 3133 | if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero) |
2847 | { | 3134 | { |
2848 | //Recoil. | 3135 | float groupmass = new_group.GetMass(); |
2849 | llApplyImpulse(vel * groupmass, 0); | 3136 | vel *= -groupmass; |
3137 | llApplyImpulse(vel, 0); | ||
2850 | } | 3138 | } |
2851 | // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) | 3139 | // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) |
3140 | return; | ||
3141 | |||
2852 | }); | 3142 | }); |
2853 | 3143 | ||
2854 | //ScriptSleep((int)((groupmass * velmag) / 10)); | 3144 | //ScriptSleep((int)((groupmass * velmag) / 10)); |
@@ -2863,35 +3153,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2863 | public void llLookAt(LSL_Vector target, double strength, double damping) | 3153 | public void llLookAt(LSL_Vector target, double strength, double damping) |
2864 | { | 3154 | { |
2865 | m_host.AddScriptLPS(1); | 3155 | m_host.AddScriptLPS(1); |
2866 | // Determine where we are looking from | ||
2867 | LSL_Vector from = llGetPos(); | ||
2868 | 3156 | ||
2869 | // Work out the normalised vector from the source to the target | 3157 | // Get the normalized vector to the target |
2870 | LSL_Vector delta = llVecNorm(target - from); | 3158 | LSL_Vector d1 = llVecNorm(target - llGetPos()); |
2871 | LSL_Vector angle = new LSL_Vector(0,0,0); | ||
2872 | 3159 | ||
2873 | // Calculate the yaw | 3160 | // Get the bearing (yaw) |
2874 | // subtracting PI_BY_TWO is required to compensate for the odd SL co-ordinate system | 3161 | LSL_Vector a1 = new LSL_Vector(0,0,0); |
2875 | angle.x = llAtan2(delta.z, delta.y) - ScriptBaseClass.PI_BY_TWO; | 3162 | a1.z = llAtan2(d1.y, d1.x); |
2876 | 3163 | ||
2877 | // Calculate pitch | 3164 | // Get the elevation (pitch) |
2878 | angle.y = llAtan2(delta.x, llSqrt((delta.y * delta.y) + (delta.z * delta.z))); | 3165 | LSL_Vector a2 = new LSL_Vector(0,0,0); |
3166 | a2.y= -llAtan2(d1.z, llSqrt((d1.x * d1.x) + (d1.y * d1.y))); | ||
2879 | 3167 | ||
2880 | // we need to convert from a vector describing | 3168 | LSL_Rotation r1 = llEuler2Rot(a1); |
2881 | // the angles of rotation in radians into rotation value | 3169 | LSL_Rotation r2 = llEuler2Rot(a2); |
2882 | LSL_Rotation rot = llEuler2Rot(angle); | 3170 | LSL_Rotation r3 = new LSL_Rotation(0.000000, 0.707107, 0.000000, 0.707107); |
2883 | |||
2884 | // Per discussion with Melanie, for non-physical objects llLookAt appears to simply | ||
2885 | // set the rotation of the object, copy that behavior | ||
2886 | PhysicsActor pa = m_host.PhysActor; | ||
2887 | 3171 | ||
2888 | if (strength == 0 || pa == null || !pa.IsPhysical) | 3172 | if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical) |
2889 | { | 3173 | { |
2890 | llSetRot(rot); | 3174 | // Do nothing if either value is 0 (this has been checked in SL) |
3175 | if (strength <= 0.0 || damping <= 0.0) | ||
3176 | return; | ||
3177 | |||
3178 | llSetRot(r3 * r2 * r1); | ||
2891 | } | 3179 | } |
2892 | else | 3180 | else |
2893 | { | 3181 | { |
2894 | m_host.StartLookAt(rot, (float)strength, (float)damping); | 3182 | if (strength == 0) |
3183 | { | ||
3184 | llSetRot(r3 * r2 * r1); | ||
3185 | return; | ||
3186 | } | ||
3187 | |||
3188 | m_host.StartLookAt((Quaternion)(r3 * r2 * r1), (float)strength, (float)damping); | ||
2895 | } | 3189 | } |
2896 | } | 3190 | } |
2897 | 3191 | ||
@@ -2937,17 +3231,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2937 | } | 3231 | } |
2938 | else | 3232 | else |
2939 | { | 3233 | { |
2940 | if (m_host.IsRoot) | 3234 | // new SL always returns object mass |
2941 | { | 3235 | // if (m_host.IsRoot) |
3236 | // { | ||
2942 | return m_host.ParentGroup.GetMass(); | 3237 | return m_host.ParentGroup.GetMass(); |
2943 | } | 3238 | // } |
2944 | else | 3239 | // else |
2945 | { | 3240 | // { |
2946 | return m_host.GetMass(); | 3241 | // return m_host.GetMass(); |
2947 | } | 3242 | // } |
2948 | } | 3243 | } |
2949 | } | 3244 | } |
2950 | 3245 | ||
3246 | |||
3247 | public LSL_Float llGetMassMKS() | ||
3248 | { | ||
3249 | return 100f * llGetMass(); | ||
3250 | } | ||
3251 | |||
2951 | public void llCollisionFilter(string name, string id, int accept) | 3252 | public void llCollisionFilter(string name, string id, int accept) |
2952 | { | 3253 | { |
2953 | m_host.AddScriptLPS(1); | 3254 | m_host.AddScriptLPS(1); |
@@ -2995,8 +3296,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2995 | { | 3296 | { |
2996 | // Unregister controls from Presence | 3297 | // Unregister controls from Presence |
2997 | presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID); | 3298 | presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID); |
2998 | // Remove Take Control permission. | ||
2999 | m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS; | ||
3000 | } | 3299 | } |
3001 | } | 3300 | } |
3002 | } | 3301 | } |
@@ -3022,7 +3321,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3022 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; | 3321 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; |
3023 | 3322 | ||
3024 | if (attachmentsModule != null) | 3323 | if (attachmentsModule != null) |
3025 | return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, false); | 3324 | return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, false); |
3026 | else | 3325 | else |
3027 | return false; | 3326 | return false; |
3028 | } | 3327 | } |
@@ -3052,9 +3351,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3052 | { | 3351 | { |
3053 | m_host.AddScriptLPS(1); | 3352 | m_host.AddScriptLPS(1); |
3054 | 3353 | ||
3055 | // if (m_host.ParentGroup.RootPart.AttachmentPoint == 0) | ||
3056 | // return; | ||
3057 | |||
3058 | if (m_item.PermsGranter != m_host.OwnerID) | 3354 | if (m_item.PermsGranter != m_host.OwnerID) |
3059 | return; | 3355 | return; |
3060 | 3356 | ||
@@ -3097,6 +3393,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3097 | 3393 | ||
3098 | public void llInstantMessage(string user, string message) | 3394 | public void llInstantMessage(string user, string message) |
3099 | { | 3395 | { |
3396 | UUID result; | ||
3397 | if (!UUID.TryParse(user, out result)) | ||
3398 | { | ||
3399 | ShoutError("An invalid key was passed to llInstantMessage"); | ||
3400 | ScriptSleep(2000); | ||
3401 | return; | ||
3402 | } | ||
3403 | |||
3404 | |||
3100 | m_host.AddScriptLPS(1); | 3405 | m_host.AddScriptLPS(1); |
3101 | 3406 | ||
3102 | // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. | 3407 | // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. |
@@ -3111,14 +3416,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3111 | UUID friendTransactionID = UUID.Random(); | 3416 | UUID friendTransactionID = UUID.Random(); |
3112 | 3417 | ||
3113 | //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); | 3418 | //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); |
3114 | 3419 | ||
3115 | GridInstantMessage msg = new GridInstantMessage(); | 3420 | GridInstantMessage msg = new GridInstantMessage(); |
3116 | msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; | 3421 | msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; |
3117 | msg.toAgentID = new Guid(user); // toAgentID.Guid; | 3422 | msg.toAgentID = new Guid(user); // toAgentID.Guid; |
3118 | msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here | 3423 | msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here |
3119 | // m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); | 3424 | // m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); |
3120 | // m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); | 3425 | // m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); |
3121 | msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; | 3426 | // DateTime dt = DateTime.UtcNow; |
3427 | // | ||
3428 | // // Ticks from UtcNow, but make it look like local. Evil, huh? | ||
3429 | // dt = DateTime.SpecifyKind(dt, DateTimeKind.Local); | ||
3430 | // | ||
3431 | // try | ||
3432 | // { | ||
3433 | // // Convert that to the PST timezone | ||
3434 | // TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles"); | ||
3435 | // dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo); | ||
3436 | // } | ||
3437 | // catch | ||
3438 | // { | ||
3439 | // // No logging here, as it could be VERY spammy | ||
3440 | // } | ||
3441 | // | ||
3442 | // // And make it look local again to fool the unix time util | ||
3443 | // dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc); | ||
3444 | |||
3445 | msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); | ||
3446 | |||
3122 | //if (client != null) | 3447 | //if (client != null) |
3123 | //{ | 3448 | //{ |
3124 | msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; | 3449 | msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName; |
@@ -3132,12 +3457,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3132 | msg.message = message.Substring(0, 1024); | 3457 | msg.message = message.Substring(0, 1024); |
3133 | else | 3458 | else |
3134 | msg.message = message; | 3459 | msg.message = message; |
3135 | msg.dialog = (byte)19; // messgage from script ??? // dialog; | 3460 | msg.dialog = (byte)19; // MessageFromObject |
3136 | msg.fromGroup = false;// fromGroup; | 3461 | msg.fromGroup = false;// fromGroup; |
3137 | msg.offline = (byte)0; //offline; | 3462 | msg.offline = (byte)0; //offline; |
3138 | msg.ParentEstateID = 0; //ParentEstateID; | 3463 | msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID; |
3139 | msg.Position = new Vector3(m_host.AbsolutePosition); | 3464 | msg.Position = new Vector3(m_host.AbsolutePosition); |
3140 | msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; | 3465 | msg.RegionID = World.RegionInfo.RegionID.Guid; |
3141 | msg.binaryBucket | 3466 | msg.binaryBucket |
3142 | = Util.StringToBytes256( | 3467 | = Util.StringToBytes256( |
3143 | "{0}/{1}/{2}/{3}", | 3468 | "{0}/{1}/{2}/{3}", |
@@ -3165,7 +3490,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3165 | } | 3490 | } |
3166 | 3491 | ||
3167 | emailModule.SendEmail(m_host.UUID, address, subject, message); | 3492 | emailModule.SendEmail(m_host.UUID, address, subject, message); |
3168 | llSleep(EMAIL_PAUSE_TIME); | 3493 | ScriptSleep(EMAIL_PAUSE_TIME * 1000); |
3169 | } | 3494 | } |
3170 | 3495 | ||
3171 | public void llGetNextEmail(string address, string subject) | 3496 | public void llGetNextEmail(string address, string subject) |
@@ -3411,7 +3736,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3411 | implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | | 3736 | implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | |
3412 | ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | | 3737 | ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | |
3413 | ScriptBaseClass.PERMISSION_CONTROL_CAMERA | | 3738 | ScriptBaseClass.PERMISSION_CONTROL_CAMERA | |
3739 | ScriptBaseClass.PERMISSION_TRACK_CAMERA | | ||
3414 | ScriptBaseClass.PERMISSION_ATTACH; | 3740 | ScriptBaseClass.PERMISSION_ATTACH; |
3741 | |||
3415 | } | 3742 | } |
3416 | else | 3743 | else |
3417 | { | 3744 | { |
@@ -3446,11 +3773,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3446 | 3773 | ||
3447 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms | 3774 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms |
3448 | { | 3775 | { |
3449 | lock (m_host.TaskInventory) | 3776 | m_host.TaskInventory.LockItemsForWrite(true); |
3450 | { | 3777 | m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; |
3451 | m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; | 3778 | m_host.TaskInventory[m_item.ItemID].PermsMask = perm; |
3452 | m_host.TaskInventory[m_item.ItemID].PermsMask = perm; | 3779 | m_host.TaskInventory.LockItemsForWrite(false); |
3453 | } | ||
3454 | 3780 | ||
3455 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( | 3781 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( |
3456 | "run_time_permissions", new Object[] { | 3782 | "run_time_permissions", new Object[] { |
@@ -3493,11 +3819,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3493 | 3819 | ||
3494 | if (!m_waitingForScriptAnswer) | 3820 | if (!m_waitingForScriptAnswer) |
3495 | { | 3821 | { |
3496 | lock (m_host.TaskInventory) | 3822 | m_host.TaskInventory.LockItemsForWrite(true); |
3497 | { | 3823 | m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; |
3498 | m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID; | 3824 | m_host.TaskInventory[m_item.ItemID].PermsMask = 0; |
3499 | m_host.TaskInventory[m_item.ItemID].PermsMask = 0; | 3825 | m_host.TaskInventory.LockItemsForWrite(false); |
3500 | } | ||
3501 | 3826 | ||
3502 | presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; | 3827 | presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; |
3503 | m_waitingForScriptAnswer=true; | 3828 | m_waitingForScriptAnswer=true; |
@@ -3526,14 +3851,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3526 | if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) | 3851 | if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) |
3527 | llReleaseControls(); | 3852 | llReleaseControls(); |
3528 | 3853 | ||
3529 | lock (m_host.TaskInventory) | 3854 | m_host.TaskInventory.LockItemsForWrite(true); |
3530 | { | 3855 | m_host.TaskInventory[m_item.ItemID].PermsMask = answer; |
3531 | m_host.TaskInventory[m_item.ItemID].PermsMask = answer; | 3856 | m_host.TaskInventory.LockItemsForWrite(false); |
3532 | } | 3857 | |
3533 | 3858 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( | |
3534 | m_ScriptEngine.PostScriptEvent( | 3859 | "run_time_permissions", new Object[] { |
3535 | m_item.ItemID, | 3860 | new LSL_Integer(answer) }, |
3536 | new EventParams("run_time_permissions", new Object[] { new LSL_Integer(answer) }, new DetectParams[0])); | 3861 | new DetectParams[0])); |
3537 | } | 3862 | } |
3538 | 3863 | ||
3539 | public LSL_String llGetPermissionsKey() | 3864 | public LSL_String llGetPermissionsKey() |
@@ -3572,14 +3897,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3572 | public void llSetLinkColor(int linknumber, LSL_Vector color, int face) | 3897 | public void llSetLinkColor(int linknumber, LSL_Vector color, int face) |
3573 | { | 3898 | { |
3574 | List<SceneObjectPart> parts = GetLinkParts(linknumber); | 3899 | List<SceneObjectPart> parts = GetLinkParts(linknumber); |
3575 | 3900 | if (parts.Count > 0) | |
3576 | foreach (SceneObjectPart part in parts) | 3901 | { |
3577 | part.SetFaceColorAlpha(face, color, null); | 3902 | try |
3903 | { | ||
3904 | foreach (SceneObjectPart part in parts) | ||
3905 | part.SetFaceColorAlpha(face, color, null); | ||
3906 | } | ||
3907 | finally | ||
3908 | { | ||
3909 | } | ||
3910 | } | ||
3578 | } | 3911 | } |
3579 | 3912 | ||
3580 | public void llCreateLink(string target, int parent) | 3913 | public void llCreateLink(string target, int parent) |
3581 | { | 3914 | { |
3582 | m_host.AddScriptLPS(1); | 3915 | m_host.AddScriptLPS(1); |
3916 | |||
3583 | UUID targetID; | 3917 | UUID targetID; |
3584 | 3918 | ||
3585 | if (!UUID.TryParse(target, out targetID)) | 3919 | if (!UUID.TryParse(target, out targetID)) |
@@ -3685,10 +4019,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3685 | // Restructuring Multiple Prims. | 4019 | // Restructuring Multiple Prims. |
3686 | List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); | 4020 | List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts); |
3687 | parts.Remove(parentPrim.RootPart); | 4021 | parts.Remove(parentPrim.RootPart); |
3688 | foreach (SceneObjectPart part in parts) | 4022 | if (parts.Count > 0) |
3689 | { | 4023 | { |
3690 | parentPrim.DelinkFromGroup(part.LocalId, true); | 4024 | try |
4025 | { | ||
4026 | foreach (SceneObjectPart part in parts) | ||
4027 | { | ||
4028 | parentPrim.DelinkFromGroup(part.LocalId, true); | ||
4029 | } | ||
4030 | } | ||
4031 | finally | ||
4032 | { | ||
4033 | } | ||
3691 | } | 4034 | } |
4035 | |||
3692 | parentPrim.HasGroupChanged = true; | 4036 | parentPrim.HasGroupChanged = true; |
3693 | parentPrim.ScheduleGroupForFullUpdate(); | 4037 | parentPrim.ScheduleGroupForFullUpdate(); |
3694 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); | 4038 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); |
@@ -3697,12 +4041,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3697 | { | 4041 | { |
3698 | SceneObjectPart newRoot = parts[0]; | 4042 | SceneObjectPart newRoot = parts[0]; |
3699 | parts.Remove(newRoot); | 4043 | parts.Remove(newRoot); |
3700 | foreach (SceneObjectPart part in parts) | 4044 | |
4045 | try | ||
3701 | { | 4046 | { |
3702 | // Required for linking | 4047 | foreach (SceneObjectPart part in parts) |
3703 | part.ClearUpdateSchedule(); | 4048 | { |
3704 | newRoot.ParentGroup.LinkToGroup(part.ParentGroup); | 4049 | part.ClearUpdateSchedule(); |
4050 | newRoot.ParentGroup.LinkToGroup(part.ParentGroup); | ||
4051 | } | ||
3705 | } | 4052 | } |
4053 | finally | ||
4054 | { | ||
4055 | } | ||
4056 | |||
4057 | |||
3706 | newRoot.ParentGroup.HasGroupChanged = true; | 4058 | newRoot.ParentGroup.HasGroupChanged = true; |
3707 | newRoot.ParentGroup.ScheduleGroupForFullUpdate(); | 4059 | newRoot.ParentGroup.ScheduleGroupForFullUpdate(); |
3708 | } | 4060 | } |
@@ -3722,6 +4074,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3722 | public void llBreakAllLinks() | 4074 | public void llBreakAllLinks() |
3723 | { | 4075 | { |
3724 | m_host.AddScriptLPS(1); | 4076 | m_host.AddScriptLPS(1); |
4077 | |||
4078 | TaskInventoryItem item = m_item; | ||
4079 | |||
4080 | if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 | ||
4081 | && !m_automaticLinkPermission) | ||
4082 | { | ||
4083 | ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); | ||
4084 | return; | ||
4085 | } | ||
4086 | |||
3725 | SceneObjectGroup parentPrim = m_host.ParentGroup; | 4087 | SceneObjectGroup parentPrim = m_host.ParentGroup; |
3726 | if (parentPrim.AttachmentPoint != 0) | 4088 | if (parentPrim.AttachmentPoint != 0) |
3727 | return; // Fail silently if attached | 4089 | return; // Fail silently if attached |
@@ -3741,25 +4103,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3741 | public LSL_String llGetLinkKey(int linknum) | 4103 | public LSL_String llGetLinkKey(int linknum) |
3742 | { | 4104 | { |
3743 | m_host.AddScriptLPS(1); | 4105 | m_host.AddScriptLPS(1); |
3744 | List<UUID> keytable = new List<UUID>(); | ||
3745 | // parse for sitting avatare-uuids | ||
3746 | World.ForEachRootScenePresence(delegate(ScenePresence presence) | ||
3747 | { | ||
3748 | if (presence.ParentID != 0 && m_host.ParentGroup.ContainsPart(presence.ParentID)) | ||
3749 | keytable.Add(presence.UUID); | ||
3750 | }); | ||
3751 | |||
3752 | int totalprims = m_host.ParentGroup.PrimCount + keytable.Count; | ||
3753 | if (linknum > m_host.ParentGroup.PrimCount && linknum <= totalprims) | ||
3754 | { | ||
3755 | return keytable[totalprims - linknum].ToString(); | ||
3756 | } | ||
3757 | |||
3758 | if (linknum == 1 && m_host.ParentGroup.PrimCount == 1 && keytable.Count == 1) | ||
3759 | { | ||
3760 | return m_host.UUID.ToString(); | ||
3761 | } | ||
3762 | |||
3763 | SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); | 4106 | SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); |
3764 | if (part != null) | 4107 | if (part != null) |
3765 | { | 4108 | { |
@@ -3767,6 +4110,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3767 | } | 4110 | } |
3768 | else | 4111 | else |
3769 | { | 4112 | { |
4113 | if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1)) | ||
4114 | { | ||
4115 | linknum -= (m_host.ParentGroup.PrimCount) + 1; | ||
4116 | |||
4117 | if (linknum < 0) | ||
4118 | return UUID.Zero.ToString(); | ||
4119 | |||
4120 | List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET); | ||
4121 | if (avatars.Count > linknum) | ||
4122 | { | ||
4123 | return avatars[linknum].UUID.ToString(); | ||
4124 | } | ||
4125 | } | ||
3770 | return UUID.Zero.ToString(); | 4126 | return UUID.Zero.ToString(); |
3771 | } | 4127 | } |
3772 | } | 4128 | } |
@@ -3866,17 +4222,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3866 | m_host.AddScriptLPS(1); | 4222 | m_host.AddScriptLPS(1); |
3867 | int count = 0; | 4223 | int count = 0; |
3868 | 4224 | ||
3869 | lock (m_host.TaskInventory) | 4225 | m_host.TaskInventory.LockItemsForRead(true); |
4226 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | ||
3870 | { | 4227 | { |
3871 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | 4228 | if (inv.Value.Type == type || type == -1) |
3872 | { | 4229 | { |
3873 | if (inv.Value.Type == type || type == -1) | 4230 | count = count + 1; |
3874 | { | ||
3875 | count = count + 1; | ||
3876 | } | ||
3877 | } | 4231 | } |
3878 | } | 4232 | } |
3879 | 4233 | ||
4234 | m_host.TaskInventory.LockItemsForRead(false); | ||
3880 | return count; | 4235 | return count; |
3881 | } | 4236 | } |
3882 | 4237 | ||
@@ -3885,16 +4240,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3885 | m_host.AddScriptLPS(1); | 4240 | m_host.AddScriptLPS(1); |
3886 | ArrayList keys = new ArrayList(); | 4241 | ArrayList keys = new ArrayList(); |
3887 | 4242 | ||
3888 | lock (m_host.TaskInventory) | 4243 | m_host.TaskInventory.LockItemsForRead(true); |
4244 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | ||
3889 | { | 4245 | { |
3890 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | 4246 | if (inv.Value.Type == type || type == -1) |
3891 | { | 4247 | { |
3892 | if (inv.Value.Type == type || type == -1) | 4248 | keys.Add(inv.Value.Name); |
3893 | { | ||
3894 | keys.Add(inv.Value.Name); | ||
3895 | } | ||
3896 | } | 4249 | } |
3897 | } | 4250 | } |
4251 | m_host.TaskInventory.LockItemsForRead(false); | ||
3898 | 4252 | ||
3899 | if (keys.Count == 0) | 4253 | if (keys.Count == 0) |
3900 | { | 4254 | { |
@@ -3932,7 +4286,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3932 | if (item == null) | 4286 | if (item == null) |
3933 | { | 4287 | { |
3934 | llSay(0, String.Format("Could not find object '{0}'", inventory)); | 4288 | llSay(0, String.Format("Could not find object '{0}'", inventory)); |
3935 | throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); | 4289 | return; |
4290 | // throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); | ||
3936 | } | 4291 | } |
3937 | 4292 | ||
3938 | UUID objId = item.ItemID; | 4293 | UUID objId = item.ItemID; |
@@ -3960,33 +4315,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3960 | return; | 4315 | return; |
3961 | } | 4316 | } |
3962 | } | 4317 | } |
4318 | |||
3963 | // destination is an avatar | 4319 | // destination is an avatar |
3964 | InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); | 4320 | InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId); |
3965 | 4321 | ||
3966 | if (agentItem == null) | 4322 | if (agentItem == null) |
3967 | return; | 4323 | return; |
3968 | 4324 | ||
3969 | if (m_TransferModule != null) | 4325 | byte[] bucket = new byte[1]; |
3970 | { | 4326 | bucket[0] = (byte)item.Type; |
3971 | byte[] bucket = new byte[] { (byte)item.Type }; | 4327 | //byte[] objBytes = agentItem.ID.GetBytes(); |
4328 | //Array.Copy(objBytes, 0, bucket, 1, 16); | ||
4329 | |||
4330 | GridInstantMessage msg = new GridInstantMessage(World, | ||
4331 | m_host.OwnerID, m_host.Name, destId, | ||
4332 | (byte)InstantMessageDialog.TaskInventoryOffered, | ||
4333 | false, item.Name+". "+m_host.Name+" is located at "+ | ||
4334 | World.RegionInfo.RegionName+" "+ | ||
4335 | m_host.AbsolutePosition.ToString(), | ||
4336 | agentItem.ID, true, m_host.AbsolutePosition, | ||
4337 | bucket); | ||
3972 | 4338 | ||
3973 | GridInstantMessage msg = new GridInstantMessage(World, | 4339 | ScenePresence sp; |
3974 | m_host.UUID, m_host.Name + ", an object owned by " + | ||
3975 | resolveName(m_host.OwnerID) + ",", destId, | ||
3976 | (byte)InstantMessageDialog.TaskInventoryOffered, | ||
3977 | false, item.Name + "\n" + m_host.Name + " is located at " + | ||
3978 | World.RegionInfo.RegionName+" "+ | ||
3979 | m_host.AbsolutePosition.ToString(), | ||
3980 | agentItem.ID, true, m_host.AbsolutePosition, | ||
3981 | bucket); | ||
3982 | 4340 | ||
3983 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 4341 | if (World.TryGetScenePresence(destId, out sp)) |
4342 | { | ||
4343 | sp.ControllingClient.SendInstantMessage(msg); | ||
3984 | } | 4344 | } |
3985 | 4345 | else | |
4346 | { | ||
4347 | if (m_TransferModule != null) | ||
4348 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | ||
4349 | } | ||
4350 | |||
4351 | //This delay should only occur when giving inventory to avatars. | ||
3986 | ScriptSleep(3000); | 4352 | ScriptSleep(3000); |
3987 | } | 4353 | } |
3988 | } | 4354 | } |
3989 | 4355 | ||
4356 | [DebuggerNonUserCode] | ||
3990 | public void llRemoveInventory(string name) | 4357 | public void llRemoveInventory(string name) |
3991 | { | 4358 | { |
3992 | m_host.AddScriptLPS(1); | 4359 | m_host.AddScriptLPS(1); |
@@ -4030,109 +4397,115 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4030 | { | 4397 | { |
4031 | m_host.AddScriptLPS(1); | 4398 | m_host.AddScriptLPS(1); |
4032 | 4399 | ||
4033 | UUID uuid = (UUID)id; | 4400 | UUID uuid; |
4034 | PresenceInfo pinfo = null; | 4401 | if (UUID.TryParse(id, out uuid)) |
4035 | UserAccount account; | ||
4036 | |||
4037 | UserInfoCacheEntry ce; | ||
4038 | if (!m_userInfoCache.TryGetValue(uuid, out ce)) | ||
4039 | { | 4402 | { |
4040 | account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); | 4403 | PresenceInfo pinfo = null; |
4041 | if (account == null) | 4404 | UserAccount account; |
4405 | |||
4406 | UserInfoCacheEntry ce; | ||
4407 | if (!m_userInfoCache.TryGetValue(uuid, out ce)) | ||
4042 | { | 4408 | { |
4043 | m_userInfoCache[uuid] = null; // Cache negative | 4409 | account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); |
4044 | return UUID.Zero.ToString(); | 4410 | if (account == null) |
4045 | } | 4411 | { |
4412 | m_userInfoCache[uuid] = null; // Cache negative | ||
4413 | return UUID.Zero.ToString(); | ||
4414 | } | ||
4046 | 4415 | ||
4047 | 4416 | ||
4048 | PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); | 4417 | PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); |
4049 | if (pinfos != null && pinfos.Length > 0) | 4418 | if (pinfos != null && pinfos.Length > 0) |
4050 | { | ||
4051 | foreach (PresenceInfo p in pinfos) | ||
4052 | { | 4419 | { |
4053 | if (p.RegionID != UUID.Zero) | 4420 | foreach (PresenceInfo p in pinfos) |
4054 | { | 4421 | { |
4055 | pinfo = p; | 4422 | if (p.RegionID != UUID.Zero) |
4423 | { | ||
4424 | pinfo = p; | ||
4425 | } | ||
4056 | } | 4426 | } |
4057 | } | 4427 | } |
4058 | } | ||
4059 | 4428 | ||
4060 | ce = new UserInfoCacheEntry(); | 4429 | ce = new UserInfoCacheEntry(); |
4061 | ce.time = Util.EnvironmentTickCount(); | 4430 | ce.time = Util.EnvironmentTickCount(); |
4062 | ce.account = account; | 4431 | ce.account = account; |
4063 | ce.pinfo = pinfo; | 4432 | ce.pinfo = pinfo; |
4064 | } | 4433 | m_userInfoCache[uuid] = ce; |
4065 | else | 4434 | } |
4066 | { | 4435 | else |
4067 | if (ce == null) | 4436 | { |
4068 | return UUID.Zero.ToString(); | 4437 | if (ce == null) |
4438 | return UUID.Zero.ToString(); | ||
4069 | 4439 | ||
4070 | account = ce.account; | 4440 | account = ce.account; |
4071 | pinfo = ce.pinfo; | 4441 | pinfo = ce.pinfo; |
4072 | } | 4442 | } |
4073 | 4443 | ||
4074 | if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) | 4444 | if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000) |
4075 | { | ||
4076 | PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); | ||
4077 | if (pinfos != null && pinfos.Length > 0) | ||
4078 | { | 4445 | { |
4079 | foreach (PresenceInfo p in pinfos) | 4446 | PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); |
4447 | if (pinfos != null && pinfos.Length > 0) | ||
4080 | { | 4448 | { |
4081 | if (p.RegionID != UUID.Zero) | 4449 | foreach (PresenceInfo p in pinfos) |
4082 | { | 4450 | { |
4083 | pinfo = p; | 4451 | if (p.RegionID != UUID.Zero) |
4452 | { | ||
4453 | pinfo = p; | ||
4454 | } | ||
4084 | } | 4455 | } |
4085 | } | 4456 | } |
4086 | } | 4457 | else |
4087 | else | 4458 | pinfo = null; |
4088 | pinfo = null; | ||
4089 | 4459 | ||
4090 | ce.time = Util.EnvironmentTickCount(); | 4460 | ce.time = Util.EnvironmentTickCount(); |
4091 | ce.pinfo = pinfo; | 4461 | ce.pinfo = pinfo; |
4092 | } | 4462 | } |
4093 | 4463 | ||
4094 | string reply = String.Empty; | 4464 | string reply = String.Empty; |
4095 | 4465 | ||
4096 | switch (data) | 4466 | switch (data) |
4097 | { | 4467 | { |
4098 | case 1: // DATA_ONLINE (0|1) | 4468 | case 1: // DATA_ONLINE (0|1) |
4099 | if (pinfo != null && pinfo.RegionID != UUID.Zero) | 4469 | if (pinfo != null && pinfo.RegionID != UUID.Zero) |
4100 | reply = "1"; | 4470 | reply = "1"; |
4101 | else | 4471 | else |
4102 | reply = "0"; | 4472 | reply = "0"; |
4103 | break; | 4473 | break; |
4104 | case 2: // DATA_NAME (First Last) | 4474 | case 2: // DATA_NAME (First Last) |
4105 | reply = account.FirstName + " " + account.LastName; | 4475 | reply = account.FirstName + " " + account.LastName; |
4106 | break; | 4476 | break; |
4107 | case 3: // DATA_BORN (YYYY-MM-DD) | 4477 | case 3: // DATA_BORN (YYYY-MM-DD) |
4108 | DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); | 4478 | DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); |
4109 | born = born.AddSeconds(account.Created); | 4479 | born = born.AddSeconds(account.Created); |
4110 | reply = born.ToString("yyyy-MM-dd"); | 4480 | reply = born.ToString("yyyy-MM-dd"); |
4111 | break; | 4481 | break; |
4112 | case 4: // DATA_RATING (0,0,0,0,0,0) | 4482 | case 4: // DATA_RATING (0,0,0,0,0,0) |
4113 | reply = "0,0,0,0,0,0"; | 4483 | reply = "0,0,0,0,0,0"; |
4114 | break; | 4484 | break; |
4115 | case 7: // DATA_USERLEVEL (integer) | 4485 | case 8: // DATA_PAYINFO (0|1|2|3) |
4116 | reply = account.UserLevel.ToString(); | 4486 | reply = "0"; |
4117 | break; | 4487 | break; |
4118 | case 8: // DATA_PAYINFO (0|1|2|3) | 4488 | default: |
4119 | reply = "0"; | 4489 | return UUID.Zero.ToString(); // Raise no event |
4120 | break; | 4490 | } |
4121 | default: | ||
4122 | return UUID.Zero.ToString(); // Raise no event | ||
4123 | } | ||
4124 | 4491 | ||
4125 | UUID rq = UUID.Random(); | 4492 | UUID rq = UUID.Random(); |
4126 | 4493 | ||
4127 | UUID tid = AsyncCommands. | 4494 | UUID tid = AsyncCommands. |
4128 | DataserverPlugin.RegisterRequest(m_host.LocalId, | 4495 | DataserverPlugin.RegisterRequest(m_host.LocalId, |
4129 | m_item.ItemID, rq.ToString()); | 4496 | m_item.ItemID, rq.ToString()); |
4130 | 4497 | ||
4131 | AsyncCommands. | 4498 | AsyncCommands. |
4132 | DataserverPlugin.DataserverReply(rq.ToString(), reply); | 4499 | DataserverPlugin.DataserverReply(rq.ToString(), reply); |
4133 | 4500 | ||
4134 | ScriptSleep(100); | 4501 | ScriptSleep(100); |
4135 | return tid.ToString(); | 4502 | return tid.ToString(); |
4503 | } | ||
4504 | else | ||
4505 | { | ||
4506 | ShoutError("Invalid UUID passed to llRequestAgentData."); | ||
4507 | } | ||
4508 | return ""; | ||
4136 | } | 4509 | } |
4137 | 4510 | ||
4138 | public LSL_String llRequestInventoryData(string name) | 4511 | public LSL_String llRequestInventoryData(string name) |
@@ -4189,13 +4562,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4189 | if (UUID.TryParse(agent, out agentId)) | 4562 | if (UUID.TryParse(agent, out agentId)) |
4190 | { | 4563 | { |
4191 | ScenePresence presence = World.GetScenePresence(agentId); | 4564 | ScenePresence presence = World.GetScenePresence(agentId); |
4192 | if (presence != null) | 4565 | if (presence != null && presence.PresenceType != PresenceType.Npc) |
4193 | { | 4566 | { |
4567 | // agent must not be a god | ||
4568 | if (presence.UserLevel >= 200) return; | ||
4569 | |||
4194 | // agent must be over the owners land | 4570 | // agent must be over the owners land |
4195 | if (m_host.OwnerID == World.LandChannel.GetLandObject( | 4571 | if (m_host.OwnerID == World.LandChannel.GetLandObject( |
4196 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | 4572 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) |
4197 | { | 4573 | { |
4198 | World.TeleportClientHome(agentId, presence.ControllingClient); | 4574 | if (!World.TeleportClientHome(agentId, presence.ControllingClient)) |
4575 | { | ||
4576 | // They can't be teleported home for some reason | ||
4577 | GridRegion regionInfo = World.GridService.GetRegionByUUID(UUID.Zero, new UUID("2b02daac-e298-42fa-9a75-f488d37896e6")); | ||
4578 | if (regionInfo != null) | ||
4579 | { | ||
4580 | World.RequestTeleportLocation( | ||
4581 | presence.ControllingClient, regionInfo.RegionHandle, new Vector3(128, 128, 23), Vector3.Zero, | ||
4582 | (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); | ||
4583 | } | ||
4584 | } | ||
4199 | } | 4585 | } |
4200 | } | 4586 | } |
4201 | } | 4587 | } |
@@ -4302,7 +4688,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4302 | UUID av = new UUID(); | 4688 | UUID av = new UUID(); |
4303 | if (!UUID.TryParse(agent,out av)) | 4689 | if (!UUID.TryParse(agent,out av)) |
4304 | { | 4690 | { |
4305 | LSLError("First parameter to llDialog needs to be a key"); | 4691 | //LSLError("First parameter to llDialog needs to be a key"); |
4306 | return; | 4692 | return; |
4307 | } | 4693 | } |
4308 | 4694 | ||
@@ -4334,7 +4720,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4334 | public void llCollisionSound(string impact_sound, double impact_volume) | 4720 | public void llCollisionSound(string impact_sound, double impact_volume) |
4335 | { | 4721 | { |
4336 | m_host.AddScriptLPS(1); | 4722 | m_host.AddScriptLPS(1); |
4337 | 4723 | ||
4724 | if(impact_sound == "") | ||
4725 | { | ||
4726 | m_host.CollisionSoundVolume = (float)impact_volume; | ||
4727 | m_host.CollisionSound = m_host.invalidCollisionSoundUUID; | ||
4728 | m_host.CollisionSoundType = 0; | ||
4729 | return; | ||
4730 | } | ||
4338 | // TODO: Parameter check logic required. | 4731 | // TODO: Parameter check logic required. |
4339 | UUID soundId = UUID.Zero; | 4732 | UUID soundId = UUID.Zero; |
4340 | if (!UUID.TryParse(impact_sound, out soundId)) | 4733 | if (!UUID.TryParse(impact_sound, out soundId)) |
@@ -4347,6 +4740,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4347 | 4740 | ||
4348 | m_host.CollisionSound = soundId; | 4741 | m_host.CollisionSound = soundId; |
4349 | m_host.CollisionSoundVolume = (float)impact_volume; | 4742 | m_host.CollisionSoundVolume = (float)impact_volume; |
4743 | m_host.CollisionSoundType = 1; | ||
4350 | } | 4744 | } |
4351 | 4745 | ||
4352 | public LSL_String llGetAnimation(string id) | 4746 | public LSL_String llGetAnimation(string id) |
@@ -4360,14 +4754,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4360 | 4754 | ||
4361 | if (m_host.RegionHandle == presence.RegionHandle) | 4755 | if (m_host.RegionHandle == presence.RegionHandle) |
4362 | { | 4756 | { |
4363 | Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames; | ||
4364 | |||
4365 | if (presence != null) | 4757 | if (presence != null) |
4366 | { | 4758 | { |
4367 | AnimationSet currentAnims = presence.Animator.Animations; | 4759 | if (presence.SitGround) |
4368 | string currentAnimationState = String.Empty; | 4760 | return "Sitting on Ground"; |
4369 | if (animationstateNames.TryGetValue(currentAnims.DefaultAnimation.AnimID, out currentAnimationState)) | 4761 | if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero) |
4370 | return currentAnimationState; | 4762 | return "Sitting"; |
4763 | |||
4764 | string movementAnimation = presence.Animator.CurrentMovementAnimation; | ||
4765 | string lslMovementAnimation; | ||
4766 | |||
4767 | if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation)) | ||
4768 | return lslMovementAnimation; | ||
4371 | } | 4769 | } |
4372 | } | 4770 | } |
4373 | 4771 | ||
@@ -4514,7 +4912,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4514 | { | 4912 | { |
4515 | float distance = (PusheePos - m_host.AbsolutePosition).Length(); | 4913 | float distance = (PusheePos - m_host.AbsolutePosition).Length(); |
4516 | float distance_term = distance * distance * distance; // Script Energy | 4914 | float distance_term = distance * distance * distance; // Script Energy |
4517 | float pusher_mass = m_host.GetMass(); | 4915 | // use total object mass and not part |
4916 | float pusher_mass = m_host.ParentGroup.GetMass(); | ||
4518 | 4917 | ||
4519 | float PUSH_ATTENUATION_DISTANCE = 17f; | 4918 | float PUSH_ATTENUATION_DISTANCE = 17f; |
4520 | float PUSH_ATTENUATION_SCALE = 5f; | 4919 | float PUSH_ATTENUATION_SCALE = 5f; |
@@ -4764,6 +5163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4764 | { | 5163 | { |
4765 | return item.AssetID.ToString(); | 5164 | return item.AssetID.ToString(); |
4766 | } | 5165 | } |
5166 | m_host.TaskInventory.LockItemsForRead(false); | ||
4767 | 5167 | ||
4768 | return UUID.Zero.ToString(); | 5168 | return UUID.Zero.ToString(); |
4769 | } | 5169 | } |
@@ -4897,7 +5297,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4897 | public LSL_Vector llGetCenterOfMass() | 5297 | public LSL_Vector llGetCenterOfMass() |
4898 | { | 5298 | { |
4899 | m_host.AddScriptLPS(1); | 5299 | m_host.AddScriptLPS(1); |
4900 | Vector3 center = m_host.GetGeometricCenter(); | 5300 | Vector3 center = m_host.GetCenterOfMass(); |
4901 | return new LSL_Vector(center.X,center.Y,center.Z); | 5301 | return new LSL_Vector(center.X,center.Y,center.Z); |
4902 | } | 5302 | } |
4903 | 5303 | ||
@@ -4916,14 +5316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4916 | { | 5316 | { |
4917 | m_host.AddScriptLPS(1); | 5317 | m_host.AddScriptLPS(1); |
4918 | 5318 | ||
4919 | if (src == null) | 5319 | return src.Length; |
4920 | { | ||
4921 | return 0; | ||
4922 | } | ||
4923 | else | ||
4924 | { | ||
4925 | return src.Length; | ||
4926 | } | ||
4927 | } | 5320 | } |
4928 | 5321 | ||
4929 | public LSL_Integer llList2Integer(LSL_List src, int index) | 5322 | public LSL_Integer llList2Integer(LSL_List src, int index) |
@@ -4994,7 +5387,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4994 | else if (src.Data[index] is LSL_Float) | 5387 | else if (src.Data[index] is LSL_Float) |
4995 | return Convert.ToDouble(((LSL_Float)src.Data[index]).value); | 5388 | return Convert.ToDouble(((LSL_Float)src.Data[index]).value); |
4996 | else if (src.Data[index] is LSL_String) | 5389 | else if (src.Data[index] is LSL_String) |
4997 | return Convert.ToDouble(((LSL_String)src.Data[index]).m_string); | 5390 | { |
5391 | string str = ((LSL_String) src.Data[index]).m_string; | ||
5392 | Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)"); | ||
5393 | if (m != Match.Empty) | ||
5394 | { | ||
5395 | str = m.Value; | ||
5396 | double d = 0.0; | ||
5397 | if (!Double.TryParse(str, out d)) | ||
5398 | return 0.0; | ||
5399 | |||
5400 | return d; | ||
5401 | } | ||
5402 | return 0.0; | ||
5403 | } | ||
4998 | return Convert.ToDouble(src.Data[index]); | 5404 | return Convert.ToDouble(src.Data[index]); |
4999 | } | 5405 | } |
5000 | catch (FormatException) | 5406 | catch (FormatException) |
@@ -5304,7 +5710,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5304 | } | 5710 | } |
5305 | } | 5711 | } |
5306 | } | 5712 | } |
5307 | else { | 5713 | else |
5714 | { | ||
5308 | object[] array = new object[src.Length]; | 5715 | object[] array = new object[src.Length]; |
5309 | Array.Copy(src.Data, 0, array, 0, src.Length); | 5716 | Array.Copy(src.Data, 0, array, 0, src.Length); |
5310 | result = new LSL_List(array); | 5717 | result = new LSL_List(array); |
@@ -5411,7 +5818,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5411 | public LSL_Integer llGetRegionAgentCount() | 5818 | public LSL_Integer llGetRegionAgentCount() |
5412 | { | 5819 | { |
5413 | m_host.AddScriptLPS(1); | 5820 | m_host.AddScriptLPS(1); |
5414 | return new LSL_Integer(World.GetRootAgentCount()); | 5821 | |
5822 | int count = 0; | ||
5823 | World.ForEachRootScenePresence(delegate(ScenePresence sp) { | ||
5824 | count++; | ||
5825 | }); | ||
5826 | |||
5827 | return new LSL_Integer(count); | ||
5415 | } | 5828 | } |
5416 | 5829 | ||
5417 | public LSL_Vector llGetRegionCorner() | 5830 | public LSL_Vector llGetRegionCorner() |
@@ -5644,6 +6057,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5644 | flags |= ScriptBaseClass.AGENT_AWAY; | 6057 | flags |= ScriptBaseClass.AGENT_AWAY; |
5645 | } | 6058 | } |
5646 | 6059 | ||
6060 | UUID busy = new UUID("efcf670c-2d18-8128-973a-034ebc806b67"); | ||
6061 | UUID[] anims = agent.Animator.GetAnimationArray(); | ||
6062 | if (Array.Exists<UUID>(anims, a => { return a == busy; })) | ||
6063 | { | ||
6064 | flags |= ScriptBaseClass.AGENT_BUSY; | ||
6065 | } | ||
6066 | |||
5647 | // seems to get unset, even if in mouselook, when avatar is sitting on a prim??? | 6067 | // seems to get unset, even if in mouselook, when avatar is sitting on a prim??? |
5648 | if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0) | 6068 | if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0) |
5649 | { | 6069 | { |
@@ -5691,6 +6111,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5691 | flags |= ScriptBaseClass.AGENT_SITTING; | 6111 | flags |= ScriptBaseClass.AGENT_SITTING; |
5692 | } | 6112 | } |
5693 | 6113 | ||
6114 | if (agent.Appearance.VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MALE] > 0) | ||
6115 | { | ||
6116 | flags |= ScriptBaseClass.AGENT_MALE; | ||
6117 | } | ||
6118 | |||
5694 | return flags; | 6119 | return flags; |
5695 | } | 6120 | } |
5696 | 6121 | ||
@@ -5837,10 +6262,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5837 | m_host.AddScriptLPS(1); | 6262 | m_host.AddScriptLPS(1); |
5838 | 6263 | ||
5839 | List<SceneObjectPart> parts = GetLinkParts(linknumber); | 6264 | List<SceneObjectPart> parts = GetLinkParts(linknumber); |
5840 | 6265 | if (parts.Count > 0) | |
5841 | foreach (var part in parts) | ||
5842 | { | 6266 | { |
5843 | SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); | 6267 | try |
6268 | { | ||
6269 | foreach (var part in parts) | ||
6270 | { | ||
6271 | SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); | ||
6272 | } | ||
6273 | } | ||
6274 | finally | ||
6275 | { | ||
6276 | } | ||
5844 | } | 6277 | } |
5845 | } | 6278 | } |
5846 | 6279 | ||
@@ -5892,13 +6325,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5892 | 6325 | ||
5893 | if (m_host.OwnerID == land.LandData.OwnerID) | 6326 | if (m_host.OwnerID == land.LandData.OwnerID) |
5894 | { | 6327 | { |
5895 | World.TeleportClientHome(agentID, presence.ControllingClient); | 6328 | Vector3 pos = World.GetNearestAllowedPosition(presence, land); |
6329 | presence.TeleportWithMomentum(pos, null); | ||
6330 | presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); | ||
5896 | } | 6331 | } |
5897 | } | 6332 | } |
5898 | } | 6333 | } |
5899 | ScriptSleep(5000); | 6334 | ScriptSleep(5000); |
5900 | } | 6335 | } |
5901 | 6336 | ||
6337 | public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers) | ||
6338 | { | ||
6339 | return ParseString2List(str, separators, in_spacers, false); | ||
6340 | } | ||
6341 | |||
5902 | public LSL_Integer llOverMyLand(string id) | 6342 | public LSL_Integer llOverMyLand(string id) |
5903 | { | 6343 | { |
5904 | m_host.AddScriptLPS(1); | 6344 | m_host.AddScriptLPS(1); |
@@ -5957,20 +6397,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5957 | return agentSize; | 6397 | return agentSize; |
5958 | } | 6398 | } |
5959 | 6399 | ||
5960 | public LSL_Integer llSameGroup(string agent) | 6400 | public LSL_Integer llSameGroup(string id) |
5961 | { | 6401 | { |
5962 | m_host.AddScriptLPS(1); | 6402 | m_host.AddScriptLPS(1); |
5963 | UUID agentId = new UUID(); | 6403 | UUID uuid = new UUID(); |
5964 | if (!UUID.TryParse(agent, out agentId)) | 6404 | if (!UUID.TryParse(id, out uuid)) |
5965 | return new LSL_Integer(0); | ||
5966 | ScenePresence presence = World.GetScenePresence(agentId); | ||
5967 | if (presence == null || presence.IsChildAgent) // Return flase for child agents | ||
5968 | return new LSL_Integer(0); | 6405 | return new LSL_Integer(0); |
5969 | IClientAPI client = presence.ControllingClient; | 6406 | |
5970 | if (m_host.GroupID == client.ActiveGroupId) | 6407 | // Check if it's a group key |
6408 | if (uuid == m_host.ParentGroup.RootPart.GroupID) | ||
5971 | return new LSL_Integer(1); | 6409 | return new LSL_Integer(1); |
5972 | else | 6410 | |
6411 | // We got passed a UUID.Zero | ||
6412 | if (uuid == UUID.Zero) | ||
5973 | return new LSL_Integer(0); | 6413 | return new LSL_Integer(0); |
6414 | |||
6415 | // Handle the case where id names an avatar | ||
6416 | ScenePresence presence = World.GetScenePresence(uuid); | ||
6417 | if (presence != null) | ||
6418 | { | ||
6419 | if (presence.IsChildAgent) | ||
6420 | return new LSL_Integer(0); | ||
6421 | |||
6422 | IClientAPI client = presence.ControllingClient; | ||
6423 | if (m_host.ParentGroup.RootPart.GroupID == client.ActiveGroupId) | ||
6424 | return new LSL_Integer(1); | ||
6425 | |||
6426 | return new LSL_Integer(0); | ||
6427 | } | ||
6428 | |||
6429 | // Handle object case | ||
6430 | SceneObjectPart part = World.GetSceneObjectPart(uuid); | ||
6431 | if (part != null) | ||
6432 | { | ||
6433 | // This will handle both deed and non-deed and also the no | ||
6434 | // group case | ||
6435 | if (part.ParentGroup.RootPart.GroupID == m_host.ParentGroup.RootPart.GroupID) | ||
6436 | return new LSL_Integer(1); | ||
6437 | |||
6438 | return new LSL_Integer(0); | ||
6439 | } | ||
6440 | |||
6441 | return new LSL_Integer(0); | ||
5974 | } | 6442 | } |
5975 | 6443 | ||
5976 | public void llUnSit(string id) | 6444 | public void llUnSit(string id) |
@@ -6095,7 +6563,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6095 | return m_host.ParentGroup.AttachmentPoint; | 6563 | return m_host.ParentGroup.AttachmentPoint; |
6096 | } | 6564 | } |
6097 | 6565 | ||
6098 | public LSL_Integer llGetFreeMemory() | 6566 | public virtual LSL_Integer llGetFreeMemory() |
6099 | { | 6567 | { |
6100 | m_host.AddScriptLPS(1); | 6568 | m_host.AddScriptLPS(1); |
6101 | // Make scripts designed for LSO happy | 6569 | // Make scripts designed for LSO happy |
@@ -6212,7 +6680,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6212 | SetParticleSystem(m_host, rules); | 6680 | SetParticleSystem(m_host, rules); |
6213 | } | 6681 | } |
6214 | 6682 | ||
6215 | private void SetParticleSystem(SceneObjectPart part, LSL_List rules) { | 6683 | private void SetParticleSystem(SceneObjectPart part, LSL_List rules) |
6684 | { | ||
6216 | 6685 | ||
6217 | 6686 | ||
6218 | if (rules.Length == 0) | 6687 | if (rules.Length == 0) |
@@ -6526,6 +6995,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6526 | 6995 | ||
6527 | protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot) | 6996 | protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot) |
6528 | { | 6997 | { |
6998 | // LSL quaternions can normalize to 0, normal Quaternions can't. | ||
6999 | if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0) | ||
7000 | rot.s = 1; // ZERO_ROTATION = 0,0,0,1 | ||
7001 | |||
6529 | part.SitTargetPosition = offset; | 7002 | part.SitTargetPosition = offset; |
6530 | part.SitTargetOrientation = rot; | 7003 | part.SitTargetOrientation = rot; |
6531 | part.ParentGroup.HasGroupChanged = true; | 7004 | part.ParentGroup.HasGroupChanged = true; |
@@ -6681,13 +7154,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6681 | UUID av = new UUID(); | 7154 | UUID av = new UUID(); |
6682 | if (!UUID.TryParse(avatar,out av)) | 7155 | if (!UUID.TryParse(avatar,out av)) |
6683 | { | 7156 | { |
6684 | LSLError("First parameter to llDialog needs to be a key"); | 7157 | //LSLError("First parameter to llDialog needs to be a key"); |
6685 | return; | 7158 | return; |
6686 | } | 7159 | } |
6687 | if (buttons.Length < 1) | 7160 | if (buttons.Length < 1) |
6688 | { | 7161 | { |
6689 | LSLError("No less than 1 button can be shown"); | 7162 | buttons.Add("OK"); |
6690 | return; | ||
6691 | } | 7163 | } |
6692 | if (buttons.Length > 12) | 7164 | if (buttons.Length > 12) |
6693 | { | 7165 | { |
@@ -6704,7 +7176,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6704 | } | 7176 | } |
6705 | if (buttons.Data[i].ToString().Length > 24) | 7177 | if (buttons.Data[i].ToString().Length > 24) |
6706 | { | 7178 | { |
6707 | LSLError("button label cannot be longer than 24 characters"); | 7179 | llWhisper(ScriptBaseClass.DEBUG_CHANNEL, "button label cannot be longer than 24 characters"); |
6708 | return; | 7180 | return; |
6709 | } | 7181 | } |
6710 | buts[i] = buttons.Data[i].ToString(); | 7182 | buts[i] = buttons.Data[i].ToString(); |
@@ -6771,9 +7243,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6771 | return; | 7243 | return; |
6772 | } | 7244 | } |
6773 | 7245 | ||
6774 | // the rest of the permission checks are done in RezScript, so check the pin there as well | 7246 | SceneObjectPart dest = World.GetSceneObjectPart(destId); |
6775 | World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); | 7247 | if (dest != null) |
7248 | { | ||
7249 | if ((item.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID) | ||
7250 | { | ||
7251 | // the rest of the permission checks are done in RezScript, so check the pin there as well | ||
7252 | World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); | ||
6776 | 7253 | ||
7254 | if ((item.BasePermissions & (uint)PermissionMask.Copy) == 0) | ||
7255 | m_host.Inventory.RemoveInventoryItem(item.ItemID); | ||
7256 | } | ||
7257 | } | ||
6777 | // this will cause the delay even if the script pin or permissions were wrong - seems ok | 7258 | // this will cause the delay even if the script pin or permissions were wrong - seems ok |
6778 | ScriptSleep(3000); | 7259 | ScriptSleep(3000); |
6779 | } | 7260 | } |
@@ -6836,19 +7317,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6836 | public LSL_String llMD5String(string src, int nonce) | 7317 | public LSL_String llMD5String(string src, int nonce) |
6837 | { | 7318 | { |
6838 | m_host.AddScriptLPS(1); | 7319 | m_host.AddScriptLPS(1); |
6839 | return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString())); | 7320 | return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()), Encoding.UTF8); |
6840 | } | 7321 | } |
6841 | 7322 | ||
6842 | public LSL_String llSHA1String(string src) | 7323 | public LSL_String llSHA1String(string src) |
6843 | { | 7324 | { |
6844 | m_host.AddScriptLPS(1); | 7325 | m_host.AddScriptLPS(1); |
6845 | return Util.SHA1Hash(src).ToLower(); | 7326 | return Util.SHA1Hash(src, Encoding.UTF8).ToLower(); |
6846 | } | 7327 | } |
6847 | 7328 | ||
6848 | protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) | 7329 | protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve) |
6849 | { | 7330 | { |
6850 | float tempFloat; // Use in float expressions below to avoid byte cast precision issues. | 7331 | float tempFloat; // Use in float expressions below to avoid byte cast precision issues. |
6851 | ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); | 7332 | ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); |
7333 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
7334 | return shapeBlock; | ||
6852 | 7335 | ||
6853 | if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && | 7336 | if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && |
6854 | holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && | 7337 | holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && |
@@ -6953,6 +7436,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6953 | // Prim type box, cylinder and prism. | 7436 | // Prim type box, cylinder and prism. |
6954 | 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) | 7437 | 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) |
6955 | { | 7438 | { |
7439 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
7440 | return; | ||
7441 | |||
6956 | float tempFloat; // Use in float expressions below to avoid byte cast precision issues. | 7442 | float tempFloat; // Use in float expressions below to avoid byte cast precision issues. |
6957 | ObjectShapePacket.ObjectDataBlock shapeBlock; | 7443 | ObjectShapePacket.ObjectDataBlock shapeBlock; |
6958 | 7444 | ||
@@ -7006,6 +7492,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7006 | // Prim type sphere. | 7492 | // Prim type sphere. |
7007 | protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve) | 7493 | protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve) |
7008 | { | 7494 | { |
7495 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
7496 | return; | ||
7497 | |||
7009 | ObjectShapePacket.ObjectDataBlock shapeBlock; | 7498 | ObjectShapePacket.ObjectDataBlock shapeBlock; |
7010 | 7499 | ||
7011 | shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve); | 7500 | shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve); |
@@ -7047,6 +7536,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7047 | // Prim type torus, tube and ring. | 7536 | // Prim type torus, tube and ring. |
7048 | 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) | 7537 | 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) |
7049 | { | 7538 | { |
7539 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
7540 | return; | ||
7541 | |||
7050 | float tempFloat; // Use in float expressions below to avoid byte cast precision issues. | 7542 | float tempFloat; // Use in float expressions below to avoid byte cast precision issues. |
7051 | ObjectShapePacket.ObjectDataBlock shapeBlock; | 7543 | ObjectShapePacket.ObjectDataBlock shapeBlock; |
7052 | 7544 | ||
@@ -7182,6 +7674,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7182 | // Prim type sculpt. | 7674 | // Prim type sculpt. |
7183 | protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve) | 7675 | protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve) |
7184 | { | 7676 | { |
7677 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
7678 | return; | ||
7679 | |||
7185 | ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); | 7680 | ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); |
7186 | UUID sculptId; | 7681 | UUID sculptId; |
7187 | 7682 | ||
@@ -7206,7 +7701,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7206 | type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag)) | 7701 | type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag)) |
7207 | { | 7702 | { |
7208 | // default | 7703 | // default |
7209 | type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; | 7704 | type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; |
7210 | } | 7705 | } |
7211 | 7706 | ||
7212 | part.Shape.SetSculptProperties((byte)type, sculptId); | 7707 | part.Shape.SetSculptProperties((byte)type, sculptId); |
@@ -7223,46 +7718,309 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7223 | ScriptSleep(200); | 7718 | ScriptSleep(200); |
7224 | } | 7719 | } |
7225 | 7720 | ||
7226 | public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) | 7721 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) |
7227 | { | 7722 | { |
7228 | m_host.AddScriptLPS(1); | 7723 | m_host.AddScriptLPS(1); |
7229 | 7724 | ||
7230 | setLinkPrimParams(linknumber, rules); | 7725 | setLinkPrimParams(linknumber, rules); |
7726 | } | ||
7727 | |||
7728 | private void setLinkPrimParams(int linknumber, LSL_List rules) | ||
7729 | { | ||
7730 | List<object> parts = new List<object>(); | ||
7731 | List<SceneObjectPart> prims = GetLinkParts(linknumber); | ||
7732 | List<ScenePresence> avatars = GetLinkAvatars(linknumber); | ||
7733 | foreach (SceneObjectPart p in prims) | ||
7734 | parts.Add(p); | ||
7735 | foreach (ScenePresence p in avatars) | ||
7736 | parts.Add(p); | ||
7737 | |||
7738 | LSL_List remaining = null; | ||
7739 | |||
7740 | if (parts.Count > 0) | ||
7741 | { | ||
7742 | foreach (object part in parts) | ||
7743 | { | ||
7744 | if (part is SceneObjectPart) | ||
7745 | remaining = SetPrimParams((SceneObjectPart)part, rules); | ||
7746 | else | ||
7747 | remaining = SetPrimParams((ScenePresence)part, rules); | ||
7748 | } | ||
7749 | |||
7750 | while((object)remaining != null && remaining.Length > 2) | ||
7751 | { | ||
7752 | linknumber = remaining.GetLSLIntegerItem(0); | ||
7753 | rules = remaining.GetSublist(1,-1); | ||
7754 | parts.Clear(); | ||
7755 | prims = GetLinkParts(linknumber); | ||
7756 | avatars = GetLinkAvatars(linknumber); | ||
7757 | foreach (SceneObjectPart p in prims) | ||
7758 | parts.Add(p); | ||
7759 | foreach (ScenePresence p in avatars) | ||
7760 | parts.Add(p); | ||
7761 | |||
7762 | foreach (object part in parts) | ||
7763 | { | ||
7764 | if (part is SceneObjectPart) | ||
7765 | remaining = SetPrimParams((SceneObjectPart)part, rules); | ||
7766 | else | ||
7767 | remaining = SetPrimParams((ScenePresence)part, rules); | ||
7768 | } | ||
7769 | } | ||
7770 | } | ||
7771 | } | ||
7772 | |||
7773 | private void SetPhysicsMaterial(SceneObjectPart part, int material_bits, | ||
7774 | float material_density, float material_friction, | ||
7775 | float material_restitution, float material_gravity_modifier) | ||
7776 | { | ||
7777 | ExtraPhysicsData physdata = new ExtraPhysicsData(); | ||
7778 | physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType; | ||
7779 | physdata.Density = part.Density; | ||
7780 | physdata.Friction = part.Friction; | ||
7781 | physdata.Bounce = part.Bounciness; | ||
7782 | physdata.GravitationModifier = part.GravityModifier; | ||
7783 | |||
7784 | if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0) | ||
7785 | physdata.Density = material_density; | ||
7786 | if ((material_bits & (int)ScriptBaseClass.FRICTION) != 0) | ||
7787 | physdata.Friction = material_friction; | ||
7788 | if ((material_bits & (int)ScriptBaseClass.RESTITUTION) != 0) | ||
7789 | physdata.Bounce = material_restitution; | ||
7790 | if ((material_bits & (int)ScriptBaseClass.GRAVITY_MULTIPLIER) != 0) | ||
7791 | physdata.GravitationModifier = material_gravity_modifier; | ||
7792 | |||
7793 | part.UpdateExtraPhysics(physdata); | ||
7794 | } | ||
7795 | |||
7796 | public void llSetPhysicsMaterial(int material_bits, | ||
7797 | float material_gravity_modifier, float material_restitution, | ||
7798 | float material_friction, float material_density) | ||
7799 | { | ||
7800 | SetPhysicsMaterial(m_host, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier); | ||
7801 | } | ||
7231 | 7802 | ||
7803 | public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) | ||
7804 | { | ||
7805 | llSetLinkPrimitiveParamsFast(linknumber, rules); | ||
7232 | ScriptSleep(200); | 7806 | ScriptSleep(200); |
7233 | } | 7807 | } |
7234 | 7808 | ||
7235 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) | 7809 | // vector up using libomv (c&p from sop ) |
7810 | // vector up rotated by r | ||
7811 | private Vector3 Zrot(Quaternion r) | ||
7236 | { | 7812 | { |
7237 | m_host.AddScriptLPS(1); | 7813 | double x, y, z, m; |
7238 | 7814 | ||
7239 | setLinkPrimParams(linknumber, rules); | 7815 | m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W; |
7816 | if (Math.Abs(1.0 - m) > 0.000001) | ||
7817 | { | ||
7818 | m = 1.0 / Math.Sqrt(m); | ||
7819 | r.X *= (float)m; | ||
7820 | r.Y *= (float)m; | ||
7821 | r.Z *= (float)m; | ||
7822 | r.W *= (float)m; | ||
7823 | } | ||
7824 | |||
7825 | x = 2 * (r.X * r.Z + r.Y * r.W); | ||
7826 | y = 2 * (-r.X * r.W + r.Y * r.Z); | ||
7827 | z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W; | ||
7828 | |||
7829 | return new Vector3((float)x, (float)y, (float)z); | ||
7240 | } | 7830 | } |
7241 | 7831 | ||
7242 | protected void setLinkPrimParams(int linknumber, LSL_List rules) | 7832 | protected LSL_List SetPrimParams(ScenePresence av, LSL_List rules) |
7243 | { | 7833 | { |
7244 | List<SceneObjectPart> parts = GetLinkParts(linknumber); | 7834 | //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset. |
7245 | 7835 | ||
7246 | LSL_List remaining = null; | 7836 | int idx = 0; |
7247 | 7837 | ||
7248 | foreach (SceneObjectPart part in parts) | 7838 | bool positionChanged = false; |
7249 | remaining = SetPrimParams(part, rules); | 7839 | Vector3 finalPos = Vector3.Zero; |
7250 | 7840 | ||
7251 | while(remaining != null && remaining.Length > 2) | 7841 | try |
7252 | { | 7842 | { |
7253 | linknumber = remaining.GetLSLIntegerItem(0); | 7843 | while (idx < rules.Length) |
7254 | rules = remaining.GetSublist(1,-1); | 7844 | { |
7255 | parts = GetLinkParts(linknumber); | 7845 | int code = rules.GetLSLIntegerItem(idx++); |
7846 | |||
7847 | int remain = rules.Length - idx; | ||
7848 | |||
7849 | switch (code) | ||
7850 | { | ||
7851 | case (int)ScriptBaseClass.PRIM_POSITION: | ||
7852 | case (int)ScriptBaseClass.PRIM_POS_LOCAL: | ||
7853 | { | ||
7854 | if (remain < 1) | ||
7855 | return null; | ||
7856 | |||
7857 | LSL_Vector v; | ||
7858 | v = rules.GetVector3Item(idx++); | ||
7859 | |||
7860 | SceneObjectPart part = World.GetSceneObjectPart(av.ParentID); | ||
7861 | if (part == null) | ||
7862 | break; | ||
7863 | |||
7864 | LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION; | ||
7865 | LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR; | ||
7866 | if (part.LinkNum > 1) | ||
7867 | { | ||
7868 | localRot = GetPartLocalRot(part); | ||
7869 | localPos = GetPartLocalPos(part); | ||
7870 | } | ||
7871 | |||
7872 | v -= localPos; | ||
7873 | v /= localRot; | ||
7874 | |||
7875 | LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f); | ||
7876 | |||
7877 | v = v + 2 * sitOffset; | ||
7878 | |||
7879 | av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z); | ||
7880 | av.SendAvatarDataToAllAgents(); | ||
7881 | |||
7882 | } | ||
7883 | break; | ||
7884 | |||
7885 | case (int)ScriptBaseClass.PRIM_ROT_LOCAL: | ||
7886 | case (int)ScriptBaseClass.PRIM_ROTATION: | ||
7887 | { | ||
7888 | if (remain < 1) | ||
7889 | return null; | ||
7890 | |||
7891 | LSL_Rotation r; | ||
7892 | r = rules.GetQuaternionItem(idx++); | ||
7893 | |||
7894 | SceneObjectPart part = World.GetSceneObjectPart(av.ParentID); | ||
7895 | if (part == null) | ||
7896 | break; | ||
7897 | |||
7898 | LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION; | ||
7899 | LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR; | ||
7900 | |||
7901 | if (part.LinkNum > 1) | ||
7902 | localRot = GetPartLocalRot(part); | ||
7903 | |||
7904 | r = r * llGetRootRotation() / localRot; | ||
7905 | av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); | ||
7906 | av.SendAvatarDataToAllAgents(); | ||
7907 | } | ||
7908 | break; | ||
7909 | |||
7910 | // parse rest doing nothing but number of parameters error check | ||
7911 | case (int)ScriptBaseClass.PRIM_SIZE: | ||
7912 | case (int)ScriptBaseClass.PRIM_MATERIAL: | ||
7913 | case (int)ScriptBaseClass.PRIM_PHANTOM: | ||
7914 | case (int)ScriptBaseClass.PRIM_PHYSICS: | ||
7915 | case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE: | ||
7916 | case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ: | ||
7917 | case (int)ScriptBaseClass.PRIM_NAME: | ||
7918 | case (int)ScriptBaseClass.PRIM_DESC: | ||
7919 | if (remain < 1) | ||
7920 | return null; | ||
7921 | idx++; | ||
7922 | break; | ||
7923 | |||
7924 | case (int)ScriptBaseClass.PRIM_GLOW: | ||
7925 | case (int)ScriptBaseClass.PRIM_FULLBRIGHT: | ||
7926 | case (int)ScriptBaseClass.PRIM_TEXGEN: | ||
7927 | if (remain < 2) | ||
7928 | return null; | ||
7929 | idx += 2; | ||
7930 | break; | ||
7931 | |||
7932 | case (int)ScriptBaseClass.PRIM_TYPE: | ||
7933 | if (remain < 3) | ||
7934 | return null; | ||
7935 | code = (int)rules.GetLSLIntegerItem(idx++); | ||
7936 | remain = rules.Length - idx; | ||
7937 | switch (code) | ||
7938 | { | ||
7939 | case (int)ScriptBaseClass.PRIM_TYPE_BOX: | ||
7940 | case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER: | ||
7941 | case (int)ScriptBaseClass.PRIM_TYPE_PRISM: | ||
7942 | if (remain < 6) | ||
7943 | return null; | ||
7944 | idx += 6; | ||
7945 | break; | ||
7946 | |||
7947 | case (int)ScriptBaseClass.PRIM_TYPE_SPHERE: | ||
7948 | if (remain < 5) | ||
7949 | return null; | ||
7950 | idx += 5; | ||
7951 | break; | ||
7952 | |||
7953 | case (int)ScriptBaseClass.PRIM_TYPE_TORUS: | ||
7954 | case (int)ScriptBaseClass.PRIM_TYPE_TUBE: | ||
7955 | case (int)ScriptBaseClass.PRIM_TYPE_RING: | ||
7956 | if (remain < 11) | ||
7957 | return null; | ||
7958 | idx += 11; | ||
7959 | break; | ||
7960 | |||
7961 | case (int)ScriptBaseClass.PRIM_TYPE_SCULPT: | ||
7962 | if (remain < 2) | ||
7963 | return null; | ||
7964 | idx += 2; | ||
7965 | break; | ||
7966 | } | ||
7967 | break; | ||
7968 | |||
7969 | case (int)ScriptBaseClass.PRIM_COLOR: | ||
7970 | case (int)ScriptBaseClass.PRIM_TEXT: | ||
7971 | case (int)ScriptBaseClass.PRIM_BUMP_SHINY: | ||
7972 | case (int)ScriptBaseClass.PRIM_OMEGA: | ||
7973 | if (remain < 3) | ||
7974 | return null; | ||
7975 | idx += 3; | ||
7976 | break; | ||
7977 | |||
7978 | case (int)ScriptBaseClass.PRIM_TEXTURE: | ||
7979 | case (int)ScriptBaseClass.PRIM_POINT_LIGHT: | ||
7980 | case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL: | ||
7981 | if (remain < 5) | ||
7982 | return null; | ||
7983 | idx += 5; | ||
7984 | break; | ||
7985 | |||
7986 | case (int)ScriptBaseClass.PRIM_FLEXIBLE: | ||
7987 | if (remain < 7) | ||
7988 | return null; | ||
7989 | |||
7990 | idx += 7; | ||
7991 | break; | ||
7992 | |||
7993 | case (int)ScriptBaseClass.PRIM_LINK_TARGET: | ||
7994 | if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless. | ||
7995 | return null; | ||
7256 | 7996 | ||
7257 | foreach (SceneObjectPart part in parts) | 7997 | return rules.GetSublist(idx, -1); |
7258 | remaining = SetPrimParams(part, rules); | 7998 | } |
7999 | } | ||
7259 | } | 8000 | } |
8001 | |||
8002 | finally | ||
8003 | { | ||
8004 | if (positionChanged) | ||
8005 | { | ||
8006 | av.OffsetPosition = finalPos; | ||
8007 | // av.SendAvatarDataToAllAgents(); | ||
8008 | av.SendTerseUpdateToAllClients(); | ||
8009 | positionChanged = false; | ||
8010 | } | ||
8011 | } | ||
8012 | return null; | ||
7260 | } | 8013 | } |
7261 | 8014 | ||
7262 | protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules) | 8015 | protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules) |
7263 | { | 8016 | { |
8017 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | ||
8018 | return null; | ||
8019 | |||
7264 | int idx = 0; | 8020 | int idx = 0; |
7265 | 8021 | ||
8022 | SceneObjectGroup parentgrp = part.ParentGroup; | ||
8023 | |||
7266 | bool positionChanged = false; | 8024 | bool positionChanged = false; |
7267 | LSL_Vector currentPosition = GetPartLocalPos(part); | 8025 | LSL_Vector currentPosition = GetPartLocalPos(part); |
7268 | 8026 | ||
@@ -7285,8 +8043,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7285 | return null; | 8043 | return null; |
7286 | 8044 | ||
7287 | v=rules.GetVector3Item(idx++); | 8045 | v=rules.GetVector3Item(idx++); |
7288 | positionChanged = true; | ||
7289 | currentPosition = GetSetPosTarget(part, v, currentPosition); | 8046 | currentPosition = GetSetPosTarget(part, v, currentPosition); |
8047 | positionChanged = true; | ||
7290 | 8048 | ||
7291 | break; | 8049 | break; |
7292 | case (int)ScriptBaseClass.PRIM_SIZE: | 8050 | case (int)ScriptBaseClass.PRIM_SIZE: |
@@ -7302,8 +8060,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7302 | return null; | 8060 | return null; |
7303 | 8061 | ||
7304 | LSL_Rotation q = rules.GetQuaternionItem(idx++); | 8062 | LSL_Rotation q = rules.GetQuaternionItem(idx++); |
8063 | SceneObjectPart rootPart = parentgrp.RootPart; | ||
7305 | // try to let this work as in SL... | 8064 | // try to let this work as in SL... |
7306 | if (part.ParentID == 0) | 8065 | if (rootPart == part) |
7307 | { | 8066 | { |
7308 | // special case: If we are root, rotate complete SOG to new rotation | 8067 | // special case: If we are root, rotate complete SOG to new rotation |
7309 | SetRot(part, q); | 8068 | SetRot(part, q); |
@@ -7311,7 +8070,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7311 | else | 8070 | else |
7312 | { | 8071 | { |
7313 | // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask. | 8072 | // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask. |
7314 | SceneObjectPart rootPart = part.ParentGroup.RootPart; | 8073 | // sounds like sl bug that we need to replicate |
7315 | SetRot(part, rootPart.RotationOffset * (Quaternion)q); | 8074 | SetRot(part, rootPart.RotationOffset * (Quaternion)q); |
7316 | } | 8075 | } |
7317 | 8076 | ||
@@ -7563,7 +8322,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7563 | return null; | 8322 | return null; |
7564 | 8323 | ||
7565 | string ph = rules.Data[idx++].ToString(); | 8324 | string ph = rules.Data[idx++].ToString(); |
7566 | m_host.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1")); | 8325 | parentgrp.ScriptSetPhantomStatus(ph.Equals("1")); |
7567 | 8326 | ||
7568 | break; | 8327 | break; |
7569 | 8328 | ||
@@ -7581,12 +8340,42 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7581 | part.ScriptSetPhysicsStatus(physics); | 8340 | part.ScriptSetPhysicsStatus(physics); |
7582 | break; | 8341 | break; |
7583 | 8342 | ||
8343 | case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE: | ||
8344 | if (remain < 1) | ||
8345 | return null; | ||
8346 | |||
8347 | int shape_type = rules.GetLSLIntegerItem(idx++); | ||
8348 | |||
8349 | ExtraPhysicsData physdata = new ExtraPhysicsData(); | ||
8350 | physdata.Density = part.Density; | ||
8351 | physdata.Bounce = part.Bounciness; | ||
8352 | physdata.GravitationModifier = part.GravityModifier; | ||
8353 | physdata.PhysShapeType = (PhysShapeType)shape_type; | ||
8354 | |||
8355 | part.UpdateExtraPhysics(physdata); | ||
8356 | |||
8357 | break; | ||
8358 | |||
8359 | case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL: | ||
8360 | if (remain < 5) | ||
8361 | return null; | ||
8362 | |||
8363 | int material_bits = rules.GetLSLIntegerItem(idx++); | ||
8364 | float material_density = (float)rules.GetLSLFloatItem(idx++); | ||
8365 | float material_friction = (float)rules.GetLSLFloatItem(idx++); | ||
8366 | float material_restitution = (float)rules.GetLSLFloatItem(idx++); | ||
8367 | float material_gravity_modifier = (float)rules.GetLSLFloatItem(idx++); | ||
8368 | |||
8369 | SetPhysicsMaterial(part, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier); | ||
8370 | |||
8371 | break; | ||
8372 | |||
7584 | case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ: | 8373 | case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ: |
7585 | if (remain < 1) | 8374 | if (remain < 1) |
7586 | return null; | 8375 | return null; |
7587 | string temp = rules.Data[idx++].ToString(); | 8376 | string temp = rules.Data[idx++].ToString(); |
7588 | 8377 | ||
7589 | m_host.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1")); | 8378 | parentgrp.ScriptSetTemporaryStatus(temp.Equals("1")); |
7590 | 8379 | ||
7591 | break; | 8380 | break; |
7592 | 8381 | ||
@@ -7658,7 +8447,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7658 | if (part.ParentGroup.RootPart == part) | 8447 | if (part.ParentGroup.RootPart == part) |
7659 | { | 8448 | { |
7660 | SceneObjectGroup parent = part.ParentGroup; | 8449 | SceneObjectGroup parent = part.ParentGroup; |
7661 | parent.UpdateGroupPosition(currentPosition); | 8450 | Util.FireAndForget(delegate(object x) { |
8451 | parent.UpdateGroupPosition(currentPosition); | ||
8452 | }); | ||
7662 | } | 8453 | } |
7663 | else | 8454 | else |
7664 | { | 8455 | { |
@@ -7703,10 +8494,91 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7703 | 8494 | ||
7704 | public LSL_String llXorBase64Strings(string str1, string str2) | 8495 | public LSL_String llXorBase64Strings(string str1, string str2) |
7705 | { | 8496 | { |
7706 | m_host.AddScriptLPS(1); | 8497 | string b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; |
7707 | Deprecated("llXorBase64Strings"); | 8498 | |
7708 | ScriptSleep(300); | 8499 | ScriptSleep(300); |
7709 | return String.Empty; | 8500 | m_host.AddScriptLPS(1); |
8501 | |||
8502 | if (str1 == String.Empty) | ||
8503 | return String.Empty; | ||
8504 | if (str2 == String.Empty) | ||
8505 | return str1; | ||
8506 | |||
8507 | int len = str2.Length; | ||
8508 | if ((len % 4) != 0) // LL is EVIL!!!! | ||
8509 | { | ||
8510 | while (str2.EndsWith("=")) | ||
8511 | str2 = str2.Substring(0, str2.Length - 1); | ||
8512 | |||
8513 | len = str2.Length; | ||
8514 | int mod = len % 4; | ||
8515 | |||
8516 | if (mod == 1) | ||
8517 | str2 = str2.Substring(0, str2.Length - 1); | ||
8518 | else if (mod == 2) | ||
8519 | str2 += "=="; | ||
8520 | else if (mod == 3) | ||
8521 | str2 += "="; | ||
8522 | } | ||
8523 | |||
8524 | byte[] data1; | ||
8525 | byte[] data2; | ||
8526 | try | ||
8527 | { | ||
8528 | data1 = Convert.FromBase64String(str1); | ||
8529 | data2 = Convert.FromBase64String(str2); | ||
8530 | } | ||
8531 | catch (Exception) | ||
8532 | { | ||
8533 | return new LSL_String(String.Empty); | ||
8534 | } | ||
8535 | |||
8536 | // For cases where the decoded length of s2 is greater | ||
8537 | // than the decoded length of s1, simply perform a normal | ||
8538 | // decode and XOR | ||
8539 | // | ||
8540 | if (data2.Length >= data1.Length) | ||
8541 | { | ||
8542 | for (int pos = 0 ; pos < data1.Length ; pos++ ) | ||
8543 | data1[pos] ^= data2[pos]; | ||
8544 | |||
8545 | return Convert.ToBase64String(data1); | ||
8546 | } | ||
8547 | |||
8548 | // Remove padding | ||
8549 | while (str1.EndsWith("=")) | ||
8550 | str1 = str1.Substring(0, str1.Length - 1); | ||
8551 | while (str2.EndsWith("=")) | ||
8552 | str2 = str2.Substring(0, str2.Length - 1); | ||
8553 | |||
8554 | byte[] d1 = new byte[str1.Length]; | ||
8555 | byte[] d2 = new byte[str2.Length]; | ||
8556 | |||
8557 | for (int i = 0 ; i < str1.Length ; i++) | ||
8558 | { | ||
8559 | int idx = b64.IndexOf(str1.Substring(i, 1)); | ||
8560 | if (idx == -1) | ||
8561 | idx = 0; | ||
8562 | d1[i] = (byte)idx; | ||
8563 | } | ||
8564 | |||
8565 | for (int i = 0 ; i < str2.Length ; i++) | ||
8566 | { | ||
8567 | int idx = b64.IndexOf(str2.Substring(i, 1)); | ||
8568 | if (idx == -1) | ||
8569 | idx = 0; | ||
8570 | d2[i] = (byte)idx; | ||
8571 | } | ||
8572 | |||
8573 | string output = String.Empty; | ||
8574 | |||
8575 | for (int pos = 0 ; pos < d1.Length ; pos++) | ||
8576 | output += b64[d1[pos] ^ d2[pos % d2.Length]]; | ||
8577 | |||
8578 | while (output.Length % 3 > 0) | ||
8579 | output += "="; | ||
8580 | |||
8581 | return output; | ||
7710 | } | 8582 | } |
7711 | 8583 | ||
7712 | public void llRemoteDataSetRegion() | 8584 | public void llRemoteDataSetRegion() |
@@ -7830,13 +8702,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7830 | public LSL_Integer llGetNumberOfPrims() | 8702 | public LSL_Integer llGetNumberOfPrims() |
7831 | { | 8703 | { |
7832 | m_host.AddScriptLPS(1); | 8704 | m_host.AddScriptLPS(1); |
7833 | int avatarCount = 0; | 8705 | int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count; |
7834 | World.ForEachRootScenePresence(delegate(ScenePresence presence) | 8706 | |
7835 | { | ||
7836 | if (presence.ParentID != 0 && m_host.ParentGroup.ContainsPart(presence.ParentID)) | ||
7837 | avatarCount++; | ||
7838 | }); | ||
7839 | |||
7840 | return m_host.ParentGroup.PrimCount + avatarCount; | 8707 | return m_host.ParentGroup.PrimCount + avatarCount; |
7841 | } | 8708 | } |
7842 | 8709 | ||
@@ -7852,55 +8719,98 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7852 | m_host.AddScriptLPS(1); | 8719 | m_host.AddScriptLPS(1); |
7853 | UUID objID = UUID.Zero; | 8720 | UUID objID = UUID.Zero; |
7854 | LSL_List result = new LSL_List(); | 8721 | LSL_List result = new LSL_List(); |
8722 | |||
8723 | // If the ID is not valid, return null result | ||
7855 | if (!UUID.TryParse(obj, out objID)) | 8724 | if (!UUID.TryParse(obj, out objID)) |
7856 | { | 8725 | { |
7857 | result.Add(new LSL_Vector()); | 8726 | result.Add(new LSL_Vector()); |
7858 | result.Add(new LSL_Vector()); | 8727 | result.Add(new LSL_Vector()); |
7859 | return result; | 8728 | return result; |
7860 | } | 8729 | } |
8730 | |||
8731 | // Check if this is an attached prim. If so, replace | ||
8732 | // the UUID with the avatar UUID and report it's bounding box | ||
8733 | SceneObjectPart part = World.GetSceneObjectPart(objID); | ||
8734 | if (part != null && part.ParentGroup.IsAttachment) | ||
8735 | objID = part.ParentGroup.AttachedAvatar; | ||
8736 | |||
8737 | // Find out if this is an avatar ID. If so, return it's box | ||
7861 | ScenePresence presence = World.GetScenePresence(objID); | 8738 | ScenePresence presence = World.GetScenePresence(objID); |
7862 | if (presence != null) | 8739 | if (presence != null) |
7863 | { | 8740 | { |
7864 | if (presence.ParentID == 0) // not sat on an object | 8741 | // As per LSL Wiki, there is no difference between sitting |
8742 | // and standing avatar since server 1.36 | ||
8743 | LSL_Vector lower; | ||
8744 | LSL_Vector upper; | ||
8745 | if (presence.Animator.Animations.DefaultAnimation.AnimID | ||
8746 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | ||
7865 | { | 8747 | { |
7866 | LSL_Vector lower; | 8748 | // This is for ground sitting avatars |
7867 | LSL_Vector upper; | 8749 | float height = presence.Appearance.AvatarHeight / 2.66666667f; |
7868 | if (presence.Animator.Animations.DefaultAnimation.AnimID | 8750 | lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f); |
7869 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 8751 | upper = new LSL_Vector(0.3375f, 0.45f, 0.0f); |
7870 | { | ||
7871 | // This is for ground sitting avatars | ||
7872 | float height = presence.Appearance.AvatarHeight / 2.66666667f; | ||
7873 | lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f); | ||
7874 | upper = new LSL_Vector(0.3375f, 0.45f, 0.0f); | ||
7875 | } | ||
7876 | else | ||
7877 | { | ||
7878 | // This is for standing/flying avatars | ||
7879 | float height = presence.Appearance.AvatarHeight / 2.0f; | ||
7880 | lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f); | ||
7881 | upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f); | ||
7882 | } | ||
7883 | result.Add(lower); | ||
7884 | result.Add(upper); | ||
7885 | return result; | ||
7886 | } | 8752 | } |
7887 | else | 8753 | else |
7888 | { | 8754 | { |
7889 | // sitting on an object so we need the bounding box of that | 8755 | // This is for standing/flying avatars |
7890 | // which should include the avatar so set the UUID to the | 8756 | float height = presence.Appearance.AvatarHeight / 2.0f; |
7891 | // UUID of the object the avatar is sat on and allow it to fall through | 8757 | lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f); |
7892 | // to processing an object | 8758 | upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f); |
7893 | SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID); | ||
7894 | objID = p.UUID; | ||
7895 | } | 8759 | } |
8760 | |||
8761 | // Adjust to the documented error offsets (see LSL Wiki) | ||
8762 | lower += new LSL_Vector(0.05f, 0.05f, 0.05f); | ||
8763 | upper -= new LSL_Vector(0.05f, 0.05f, 0.05f); | ||
8764 | |||
8765 | if (lower.x > upper.x) | ||
8766 | lower.x = upper.x; | ||
8767 | if (lower.y > upper.y) | ||
8768 | lower.y = upper.y; | ||
8769 | if (lower.z > upper.z) | ||
8770 | lower.z = upper.z; | ||
8771 | |||
8772 | result.Add(lower); | ||
8773 | result.Add(upper); | ||
8774 | return result; | ||
7896 | } | 8775 | } |
7897 | SceneObjectPart part = World.GetSceneObjectPart(objID); | 8776 | |
8777 | part = World.GetSceneObjectPart(objID); | ||
7898 | // Currently only works for single prims without a sitting avatar | 8778 | // Currently only works for single prims without a sitting avatar |
7899 | if (part != null) | 8779 | if (part != null) |
7900 | { | 8780 | { |
7901 | Vector3 halfSize = part.Scale / 2.0f; | 8781 | float minX; |
7902 | LSL_Vector lower = (new LSL_Vector(halfSize)) * -1.0f; | 8782 | float maxX; |
7903 | LSL_Vector upper = new LSL_Vector(halfSize); | 8783 | float minY; |
8784 | float maxY; | ||
8785 | float minZ; | ||
8786 | float maxZ; | ||
8787 | |||
8788 | // This BBox is in sim coordinates, with the offset being | ||
8789 | // a contained point. | ||
8790 | Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup }, | ||
8791 | out minX, out maxX, out minY, out maxY, out minZ, out maxZ); | ||
8792 | |||
8793 | minX -= offsets[0].X; | ||
8794 | maxX -= offsets[0].X; | ||
8795 | minY -= offsets[0].Y; | ||
8796 | maxY -= offsets[0].Y; | ||
8797 | minZ -= offsets[0].Z; | ||
8798 | maxZ -= offsets[0].Z; | ||
8799 | |||
8800 | LSL_Vector lower; | ||
8801 | LSL_Vector upper; | ||
8802 | |||
8803 | // Adjust to the documented error offsets (see LSL Wiki) | ||
8804 | lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f); | ||
8805 | upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f); | ||
8806 | |||
8807 | if (lower.x > upper.x) | ||
8808 | lower.x = upper.x; | ||
8809 | if (lower.y > upper.y) | ||
8810 | lower.y = upper.y; | ||
8811 | if (lower.z > upper.z) | ||
8812 | lower.z = upper.z; | ||
8813 | |||
7904 | result.Add(lower); | 8814 | result.Add(lower); |
7905 | result.Add(upper); | 8815 | result.Add(upper); |
7906 | return result; | 8816 | return result; |
@@ -7914,7 +8824,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7914 | 8824 | ||
7915 | public LSL_Vector llGetGeometricCenter() | 8825 | public LSL_Vector llGetGeometricCenter() |
7916 | { | 8826 | { |
7917 | return new LSL_Vector(m_host.GetGeometricCenter().X, m_host.GetGeometricCenter().Y, m_host.GetGeometricCenter().Z); | 8827 | Vector3 tmp = m_host.GetGeometricCenter(); |
8828 | return new LSL_Vector(tmp.X, tmp.Y, tmp.Z); | ||
7918 | } | 8829 | } |
7919 | 8830 | ||
7920 | public LSL_List llGetPrimitiveParams(LSL_List rules) | 8831 | public LSL_List llGetPrimitiveParams(LSL_List rules) |
@@ -7927,16 +8838,291 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7927 | { | 8838 | { |
7928 | m_host.AddScriptLPS(1); | 8839 | m_host.AddScriptLPS(1); |
7929 | 8840 | ||
8841 | // acording to SL wiki this must indicate a single link number or link_root or link_this. | ||
8842 | // keep other options as before | ||
8843 | |||
7930 | List<SceneObjectPart> parts = GetLinkParts(linknumber); | 8844 | List<SceneObjectPart> parts = GetLinkParts(linknumber); |
8845 | List<ScenePresence> avatars = GetLinkAvatars(linknumber); | ||
7931 | 8846 | ||
7932 | LSL_List res = new LSL_List(); | 8847 | LSL_List res = new LSL_List(); |
7933 | 8848 | ||
7934 | foreach (var part in parts) | 8849 | if (parts.Count > 0) |
8850 | { | ||
8851 | foreach (var part in parts) | ||
8852 | { | ||
8853 | LSL_List partRes = GetLinkPrimitiveParams(part, rules); | ||
8854 | res += partRes; | ||
8855 | } | ||
8856 | } | ||
8857 | if (avatars.Count > 0) | ||
7935 | { | 8858 | { |
7936 | LSL_List partRes = GetLinkPrimitiveParams(part, rules); | 8859 | foreach (ScenePresence avatar in avatars) |
7937 | res += partRes; | 8860 | { |
8861 | LSL_List avaRes = GetLinkPrimitiveParams(avatar, rules); | ||
8862 | res += avaRes; | ||
8863 | } | ||
7938 | } | 8864 | } |
8865 | return res; | ||
8866 | } | ||
8867 | |||
8868 | public LSL_List GetLinkPrimitiveParams(ScenePresence avatar, LSL_List rules) | ||
8869 | { | ||
8870 | // avatars case | ||
8871 | // replies as SL wiki | ||
8872 | |||
8873 | LSL_List res = new LSL_List(); | ||
8874 | // SceneObjectPart sitPart = avatar.ParentPart; // most likelly it will be needed | ||
8875 | SceneObjectPart sitPart = World.GetSceneObjectPart(avatar.ParentID); // maybe better do this expensive search for it in case it's gone?? | ||
8876 | |||
8877 | int idx = 0; | ||
8878 | while (idx < rules.Length) | ||
8879 | { | ||
8880 | int code = (int)rules.GetLSLIntegerItem(idx++); | ||
8881 | int remain = rules.Length - idx; | ||
8882 | |||
8883 | switch (code) | ||
8884 | { | ||
8885 | case (int)ScriptBaseClass.PRIM_MATERIAL: | ||
8886 | res.Add(new LSL_Integer((int)SOPMaterialData.SopMaterial.Flesh)); | ||
8887 | break; | ||
8888 | |||
8889 | case (int)ScriptBaseClass.PRIM_PHYSICS: | ||
8890 | res.Add(new LSL_Integer(0)); | ||
8891 | break; | ||
8892 | |||
8893 | case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ: | ||
8894 | res.Add(new LSL_Integer(0)); | ||
8895 | break; | ||
8896 | |||
8897 | case (int)ScriptBaseClass.PRIM_PHANTOM: | ||
8898 | res.Add(new LSL_Integer(0)); | ||
8899 | break; | ||
8900 | |||
8901 | case (int)ScriptBaseClass.PRIM_POSITION: | ||
8902 | |||
8903 | Vector3 pos = avatar.OffsetPosition; | ||
8904 | |||
8905 | Vector3 sitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f *2.0f); | ||
8906 | pos -= sitOffset; | ||
8907 | |||
8908 | if( sitPart != null) | ||
8909 | pos = sitPart.GetWorldPosition() + pos * sitPart.GetWorldRotation(); | ||
7939 | 8910 | ||
8911 | res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z)); | ||
8912 | break; | ||
8913 | |||
8914 | case (int)ScriptBaseClass.PRIM_SIZE: | ||
8915 | // as in llGetAgentSize above | ||
8916 | res.Add(new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight)); | ||
8917 | break; | ||
8918 | |||
8919 | case (int)ScriptBaseClass.PRIM_ROTATION: | ||
8920 | Quaternion rot = avatar.Rotation; | ||
8921 | if (sitPart != null) | ||
8922 | { | ||
8923 | rot = sitPart.GetWorldRotation() * rot; // apply sit part world rotation | ||
8924 | } | ||
8925 | |||
8926 | res.Add(new LSL_Rotation (rot.X, rot.Y, rot.Z, rot.W)); | ||
8927 | break; | ||
8928 | |||
8929 | case (int)ScriptBaseClass.PRIM_TYPE: | ||
8930 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX)); | ||
8931 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT)); | ||
8932 | res.Add(new LSL_Vector(0f,1.0f,0f)); | ||
8933 | res.Add(new LSL_Float(0.0f)); | ||
8934 | res.Add(new LSL_Vector(0, 0, 0)); | ||
8935 | res.Add(new LSL_Vector(1.0f,1.0f,0f)); | ||
8936 | res.Add(new LSL_Vector(0, 0, 0)); | ||
8937 | break; | ||
8938 | |||
8939 | case (int)ScriptBaseClass.PRIM_TEXTURE: | ||
8940 | if (remain < 1) | ||
8941 | return res; | ||
8942 | |||
8943 | int face = (int)rules.GetLSLIntegerItem(idx++); | ||
8944 | if (face == ScriptBaseClass.ALL_SIDES) | ||
8945 | { | ||
8946 | for (face = 0; face < 21; face++) | ||
8947 | { | ||
8948 | res.Add(new LSL_String("")); | ||
8949 | res.Add(new LSL_Vector(0,0,0)); | ||
8950 | res.Add(new LSL_Vector(0,0,0)); | ||
8951 | res.Add(new LSL_Float(0.0)); | ||
8952 | } | ||
8953 | } | ||
8954 | else | ||
8955 | { | ||
8956 | if (face >= 0 && face < 21) | ||
8957 | { | ||
8958 | res.Add(new LSL_String("")); | ||
8959 | res.Add(new LSL_Vector(0,0,0)); | ||
8960 | res.Add(new LSL_Vector(0,0,0)); | ||
8961 | res.Add(new LSL_Float(0.0)); | ||
8962 | } | ||
8963 | } | ||
8964 | break; | ||
8965 | |||
8966 | case (int)ScriptBaseClass.PRIM_COLOR: | ||
8967 | if (remain < 1) | ||
8968 | return res; | ||
8969 | |||
8970 | face = (int)rules.GetLSLIntegerItem(idx++); | ||
8971 | |||
8972 | if (face == ScriptBaseClass.ALL_SIDES) | ||
8973 | { | ||
8974 | for (face = 0; face < 21; face++) | ||
8975 | { | ||
8976 | res.Add(new LSL_Vector(0,0,0)); | ||
8977 | res.Add(new LSL_Float(0)); | ||
8978 | } | ||
8979 | } | ||
8980 | else | ||
8981 | { | ||
8982 | res.Add(new LSL_Vector(0,0,0)); | ||
8983 | res.Add(new LSL_Float(0)); | ||
8984 | } | ||
8985 | break; | ||
8986 | |||
8987 | case (int)ScriptBaseClass.PRIM_BUMP_SHINY: | ||
8988 | if (remain < 1) | ||
8989 | return res; | ||
8990 | face = (int)rules.GetLSLIntegerItem(idx++); | ||
8991 | |||
8992 | if (face == ScriptBaseClass.ALL_SIDES) | ||
8993 | { | ||
8994 | for (face = 0; face < 21; face++) | ||
8995 | { | ||
8996 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE)); | ||
8997 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE)); | ||
8998 | } | ||
8999 | } | ||
9000 | else | ||
9001 | { | ||
9002 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE)); | ||
9003 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE)); | ||
9004 | } | ||
9005 | break; | ||
9006 | |||
9007 | case (int)ScriptBaseClass.PRIM_FULLBRIGHT: | ||
9008 | if (remain < 1) | ||
9009 | return res; | ||
9010 | face = (int)rules.GetLSLIntegerItem(idx++); | ||
9011 | |||
9012 | if (face == ScriptBaseClass.ALL_SIDES) | ||
9013 | { | ||
9014 | for (face = 0; face < 21; face++) | ||
9015 | { | ||
9016 | res.Add(new LSL_Integer(ScriptBaseClass.FALSE)); | ||
9017 | } | ||
9018 | } | ||
9019 | else | ||
9020 | { | ||
9021 | res.Add(new LSL_Integer(ScriptBaseClass.FALSE)); | ||
9022 | } | ||
9023 | break; | ||
9024 | |||
9025 | case (int)ScriptBaseClass.PRIM_FLEXIBLE: | ||
9026 | res.Add(new LSL_Integer(0)); | ||
9027 | res.Add(new LSL_Integer(0));// softness | ||
9028 | res.Add(new LSL_Float(0.0f)); // gravity | ||
9029 | res.Add(new LSL_Float(0.0f)); // friction | ||
9030 | res.Add(new LSL_Float(0.0f)); // wind | ||
9031 | res.Add(new LSL_Float(0.0f)); // tension | ||
9032 | res.Add(new LSL_Vector(0f,0f,0f)); | ||
9033 | break; | ||
9034 | |||
9035 | case (int)ScriptBaseClass.PRIM_TEXGEN: | ||
9036 | // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR) | ||
9037 | if (remain < 1) | ||
9038 | return res; | ||
9039 | face = (int)rules.GetLSLIntegerItem(idx++); | ||
9040 | |||
9041 | if (face == ScriptBaseClass.ALL_SIDES) | ||
9042 | { | ||
9043 | for (face = 0; face < 21; face++) | ||
9044 | { | ||
9045 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT)); | ||
9046 | } | ||
9047 | } | ||
9048 | else | ||
9049 | { | ||
9050 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT)); | ||
9051 | } | ||
9052 | break; | ||
9053 | |||
9054 | case (int)ScriptBaseClass.PRIM_POINT_LIGHT: | ||
9055 | res.Add(new LSL_Integer(0)); | ||
9056 | res.Add(new LSL_Vector(0f,0f,0f)); | ||
9057 | res.Add(new LSL_Float(0f)); // intensity | ||
9058 | res.Add(new LSL_Float(0f)); // radius | ||
9059 | res.Add(new LSL_Float(0f)); // falloff | ||
9060 | break; | ||
9061 | |||
9062 | case (int)ScriptBaseClass.PRIM_GLOW: | ||
9063 | if (remain < 1) | ||
9064 | return res; | ||
9065 | face = (int)rules.GetLSLIntegerItem(idx++); | ||
9066 | |||
9067 | if (face == ScriptBaseClass.ALL_SIDES) | ||
9068 | { | ||
9069 | for (face = 0; face < 21; face++) | ||
9070 | { | ||
9071 | res.Add(new LSL_Float(0f)); | ||
9072 | } | ||
9073 | } | ||
9074 | else | ||
9075 | { | ||
9076 | res.Add(new LSL_Float(0f)); | ||
9077 | } | ||
9078 | break; | ||
9079 | |||
9080 | case (int)ScriptBaseClass.PRIM_TEXT: | ||
9081 | res.Add(new LSL_String("")); | ||
9082 | res.Add(new LSL_Vector(0f,0f,0f)); | ||
9083 | res.Add(new LSL_Float(1.0f)); | ||
9084 | break; | ||
9085 | |||
9086 | case (int)ScriptBaseClass.PRIM_NAME: | ||
9087 | res.Add(new LSL_String(avatar.Name)); | ||
9088 | break; | ||
9089 | |||
9090 | case (int)ScriptBaseClass.PRIM_DESC: | ||
9091 | res.Add(new LSL_String("")); | ||
9092 | break; | ||
9093 | |||
9094 | case (int)ScriptBaseClass.PRIM_ROT_LOCAL: | ||
9095 | Quaternion lrot = avatar.Rotation; | ||
9096 | |||
9097 | if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart) | ||
9098 | { | ||
9099 | lrot = sitPart.RotationOffset * lrot; // apply sit part rotation offset | ||
9100 | } | ||
9101 | res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W)); | ||
9102 | break; | ||
9103 | |||
9104 | case (int)ScriptBaseClass.PRIM_POS_LOCAL: | ||
9105 | Vector3 lpos = avatar.OffsetPosition; // pos relative to sit part | ||
9106 | Vector3 lsitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f * 2.0f); | ||
9107 | lpos -= lsitOffset; | ||
9108 | |||
9109 | if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart) | ||
9110 | { | ||
9111 | lpos = sitPart.OffsetPosition + (lpos * sitPart.RotationOffset); // make it relative to root prim | ||
9112 | } | ||
9113 | res.Add(new LSL_Vector(lpos.X,lpos.Y,lpos.Z)); | ||
9114 | break; | ||
9115 | |||
9116 | case (int)ScriptBaseClass.PRIM_LINK_TARGET: | ||
9117 | if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless. | ||
9118 | return res; | ||
9119 | LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++); | ||
9120 | LSL_List new_rules = rules.GetSublist(idx, -1); | ||
9121 | |||
9122 | res += llGetLinkPrimitiveParams((int)new_linknumber, new_rules); | ||
9123 | return res; | ||
9124 | } | ||
9125 | } | ||
7940 | return res; | 9126 | return res; |
7941 | } | 9127 | } |
7942 | 9128 | ||
@@ -7980,13 +9166,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7980 | LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X, | 9166 | LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X, |
7981 | part.AbsolutePosition.Y, | 9167 | part.AbsolutePosition.Y, |
7982 | part.AbsolutePosition.Z); | 9168 | part.AbsolutePosition.Z); |
7983 | // For some reason, the part.AbsolutePosition.* values do not change if the | ||
7984 | // linkset is rotated; they always reflect the child prim's world position | ||
7985 | // as though the linkset is unrotated. This is incompatible behavior with SL's | ||
7986 | // implementation, so will break scripts imported from there (not to mention it | ||
7987 | // makes it more difficult to determine a child prim's actual inworld position). | ||
7988 | if (part.ParentID != 0) | ||
7989 | v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition(); | ||
7990 | res.Add(v); | 9169 | res.Add(v); |
7991 | break; | 9170 | break; |
7992 | 9171 | ||
@@ -8157,56 +9336,92 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8157 | case (int)ScriptBaseClass.PRIM_BUMP_SHINY: | 9336 | case (int)ScriptBaseClass.PRIM_BUMP_SHINY: |
8158 | if (remain < 1) | 9337 | if (remain < 1) |
8159 | return res; | 9338 | return res; |
8160 | 9339 | face = (int)rules.GetLSLIntegerItem(idx++); | |
8161 | face=(int)rules.GetLSLIntegerItem(idx++); | ||
8162 | 9340 | ||
8163 | tex = part.Shape.Textures; | 9341 | tex = part.Shape.Textures; |
9342 | int shiny; | ||
8164 | if (face == ScriptBaseClass.ALL_SIDES) | 9343 | if (face == ScriptBaseClass.ALL_SIDES) |
8165 | { | 9344 | { |
8166 | for (face = 0; face < GetNumberOfSides(part); face++) | 9345 | for (face = 0; face < GetNumberOfSides(part); face++) |
8167 | { | 9346 | { |
8168 | Primitive.TextureEntryFace texface = tex.GetFace((uint)face); | 9347 | Shininess shinyness = tex.GetFace((uint)face).Shiny; |
8169 | // Convert Shininess to PRIM_SHINY_* | 9348 | if (shinyness == Shininess.High) |
8170 | res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); | 9349 | { |
8171 | // PRIM_BUMP_* | 9350 | shiny = ScriptBaseClass.PRIM_SHINY_HIGH; |
8172 | res.Add(new LSL_Integer((int)texface.Bump)); | 9351 | } |
9352 | else if (shinyness == Shininess.Medium) | ||
9353 | { | ||
9354 | shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM; | ||
9355 | } | ||
9356 | else if (shinyness == Shininess.Low) | ||
9357 | { | ||
9358 | shiny = ScriptBaseClass.PRIM_SHINY_LOW; | ||
9359 | } | ||
9360 | else | ||
9361 | { | ||
9362 | shiny = ScriptBaseClass.PRIM_SHINY_NONE; | ||
9363 | } | ||
9364 | res.Add(new LSL_Integer(shiny)); | ||
9365 | res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump)); | ||
8173 | } | 9366 | } |
8174 | } | 9367 | } |
8175 | else | 9368 | else |
8176 | { | 9369 | { |
8177 | if (face >= 0 && face < GetNumberOfSides(part)) | 9370 | Shininess shinyness = tex.GetFace((uint)face).Shiny; |
9371 | if (shinyness == Shininess.High) | ||
8178 | { | 9372 | { |
8179 | Primitive.TextureEntryFace texface = tex.GetFace((uint)face); | 9373 | shiny = ScriptBaseClass.PRIM_SHINY_HIGH; |
8180 | // Convert Shininess to PRIM_SHINY_* | 9374 | } |
8181 | res.Add(new LSL_Integer((uint)texface.Shiny >> 6)); | 9375 | else if (shinyness == Shininess.Medium) |
8182 | // PRIM_BUMP_* | 9376 | { |
8183 | res.Add(new LSL_Integer((int)texface.Bump)); | 9377 | shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM; |
9378 | } | ||
9379 | else if (shinyness == Shininess.Low) | ||
9380 | { | ||
9381 | shiny = ScriptBaseClass.PRIM_SHINY_LOW; | ||
9382 | } | ||
9383 | else | ||
9384 | { | ||
9385 | shiny = ScriptBaseClass.PRIM_SHINY_NONE; | ||
8184 | } | 9386 | } |
9387 | res.Add(new LSL_Integer(shiny)); | ||
9388 | res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump)); | ||
8185 | } | 9389 | } |
8186 | break; | 9390 | break; |
8187 | 9391 | ||
8188 | case (int)ScriptBaseClass.PRIM_FULLBRIGHT: | 9392 | case (int)ScriptBaseClass.PRIM_FULLBRIGHT: |
8189 | if (remain < 1) | 9393 | if (remain < 1) |
8190 | return res; | 9394 | return res; |
8191 | 9395 | face = (int)rules.GetLSLIntegerItem(idx++); | |
8192 | face=(int)rules.GetLSLIntegerItem(idx++); | ||
8193 | 9396 | ||
8194 | tex = part.Shape.Textures; | 9397 | tex = part.Shape.Textures; |
9398 | int fullbright; | ||
8195 | if (face == ScriptBaseClass.ALL_SIDES) | 9399 | if (face == ScriptBaseClass.ALL_SIDES) |
8196 | { | 9400 | { |
8197 | for (face = 0; face < GetNumberOfSides(part); face++) | 9401 | for (face = 0; face < GetNumberOfSides(part); face++) |
8198 | { | 9402 | { |
8199 | Primitive.TextureEntryFace texface = tex.GetFace((uint)face); | 9403 | if (tex.GetFace((uint)face).Fullbright == true) |
8200 | res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); | 9404 | { |
9405 | fullbright = ScriptBaseClass.TRUE; | ||
9406 | } | ||
9407 | else | ||
9408 | { | ||
9409 | fullbright = ScriptBaseClass.FALSE; | ||
9410 | } | ||
9411 | res.Add(new LSL_Integer(fullbright)); | ||
8201 | } | 9412 | } |
8202 | } | 9413 | } |
8203 | else | 9414 | else |
8204 | { | 9415 | { |
8205 | if (face >= 0 && face < GetNumberOfSides(part)) | 9416 | if (tex.GetFace((uint)face).Fullbright == true) |
8206 | { | 9417 | { |
8207 | Primitive.TextureEntryFace texface = tex.GetFace((uint)face); | 9418 | fullbright = ScriptBaseClass.TRUE; |
8208 | res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0)); | ||
8209 | } | 9419 | } |
9420 | else | ||
9421 | { | ||
9422 | fullbright = ScriptBaseClass.FALSE; | ||
9423 | } | ||
9424 | res.Add(new LSL_Integer(fullbright)); | ||
8210 | } | 9425 | } |
8211 | break; | 9426 | break; |
8212 | 9427 | ||
@@ -8228,27 +9443,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8228 | break; | 9443 | break; |
8229 | 9444 | ||
8230 | case (int)ScriptBaseClass.PRIM_TEXGEN: | 9445 | case (int)ScriptBaseClass.PRIM_TEXGEN: |
9446 | // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR) | ||
8231 | if (remain < 1) | 9447 | if (remain < 1) |
8232 | return res; | 9448 | return res; |
8233 | 9449 | face = (int)rules.GetLSLIntegerItem(idx++); | |
8234 | face=(int)rules.GetLSLIntegerItem(idx++); | ||
8235 | 9450 | ||
8236 | tex = part.Shape.Textures; | 9451 | tex = part.Shape.Textures; |
8237 | if (face == ScriptBaseClass.ALL_SIDES) | 9452 | if (face == ScriptBaseClass.ALL_SIDES) |
8238 | { | 9453 | { |
8239 | for (face = 0; face < GetNumberOfSides(part); face++) | 9454 | for (face = 0; face < GetNumberOfSides(part); face++) |
8240 | { | 9455 | { |
8241 | MappingType texgen = tex.GetFace((uint)face).TexMapType; | 9456 | if (tex.GetFace((uint)face).TexMapType == MappingType.Planar) |
8242 | // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc. | 9457 | { |
8243 | res.Add(new LSL_Integer((uint)texgen >> 1)); | 9458 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR)); |
9459 | } | ||
9460 | else | ||
9461 | { | ||
9462 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT)); | ||
9463 | } | ||
8244 | } | 9464 | } |
8245 | } | 9465 | } |
8246 | else | 9466 | else |
8247 | { | 9467 | { |
8248 | if (face >= 0 && face < GetNumberOfSides(part)) | 9468 | if (tex.GetFace((uint)face).TexMapType == MappingType.Planar) |
8249 | { | 9469 | { |
8250 | MappingType texgen = tex.GetFace((uint)face).TexMapType; | 9470 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR)); |
8251 | res.Add(new LSL_Integer((uint)texgen >> 1)); | 9471 | } |
9472 | else | ||
9473 | { | ||
9474 | res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT)); | ||
8252 | } | 9475 | } |
8253 | } | 9476 | } |
8254 | break; | 9477 | break; |
@@ -8271,25 +9494,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8271 | case (int)ScriptBaseClass.PRIM_GLOW: | 9494 | case (int)ScriptBaseClass.PRIM_GLOW: |
8272 | if (remain < 1) | 9495 | if (remain < 1) |
8273 | return res; | 9496 | return res; |
8274 | 9497 | face = (int)rules.GetLSLIntegerItem(idx++); | |
8275 | face=(int)rules.GetLSLIntegerItem(idx++); | ||
8276 | 9498 | ||
8277 | tex = part.Shape.Textures; | 9499 | tex = part.Shape.Textures; |
9500 | float primglow; | ||
8278 | if (face == ScriptBaseClass.ALL_SIDES) | 9501 | if (face == ScriptBaseClass.ALL_SIDES) |
8279 | { | 9502 | { |
8280 | for (face = 0; face < GetNumberOfSides(part); face++) | 9503 | for (face = 0; face < GetNumberOfSides(part); face++) |
8281 | { | 9504 | { |
8282 | Primitive.TextureEntryFace texface = tex.GetFace((uint)face); | 9505 | primglow = tex.GetFace((uint)face).Glow; |
8283 | res.Add(new LSL_Float(texface.Glow)); | 9506 | res.Add(new LSL_Float(primglow)); |
8284 | } | 9507 | } |
8285 | } | 9508 | } |
8286 | else | 9509 | else |
8287 | { | 9510 | { |
8288 | if (face >= 0 && face < GetNumberOfSides(part)) | 9511 | primglow = tex.GetFace((uint)face).Glow; |
8289 | { | 9512 | res.Add(new LSL_Float(primglow)); |
8290 | Primitive.TextureEntryFace texface = tex.GetFace((uint)face); | ||
8291 | res.Add(new LSL_Float(texface.Glow)); | ||
8292 | } | ||
8293 | } | 9513 | } |
8294 | break; | 9514 | break; |
8295 | 9515 | ||
@@ -8301,18 +9521,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8301 | textColor.B)); | 9521 | textColor.B)); |
8302 | res.Add(new LSL_Float(textColor.A)); | 9522 | res.Add(new LSL_Float(textColor.A)); |
8303 | break; | 9523 | break; |
9524 | |||
8304 | case (int)ScriptBaseClass.PRIM_NAME: | 9525 | case (int)ScriptBaseClass.PRIM_NAME: |
8305 | res.Add(new LSL_String(part.Name)); | 9526 | res.Add(new LSL_String(part.Name)); |
8306 | break; | 9527 | break; |
9528 | |||
8307 | case (int)ScriptBaseClass.PRIM_DESC: | 9529 | case (int)ScriptBaseClass.PRIM_DESC: |
8308 | res.Add(new LSL_String(part.Description)); | 9530 | res.Add(new LSL_String(part.Description)); |
8309 | break; | 9531 | break; |
9532 | |||
8310 | case (int)ScriptBaseClass.PRIM_ROT_LOCAL: | 9533 | case (int)ScriptBaseClass.PRIM_ROT_LOCAL: |
8311 | res.Add(new LSL_Rotation(part.RotationOffset.X, part.RotationOffset.Y, part.RotationOffset.Z, part.RotationOffset.W)); | 9534 | res.Add(new LSL_Rotation(part.RotationOffset.X, part.RotationOffset.Y, part.RotationOffset.Z, part.RotationOffset.W)); |
8312 | break; | 9535 | break; |
9536 | |||
8313 | case (int)ScriptBaseClass.PRIM_POS_LOCAL: | 9537 | case (int)ScriptBaseClass.PRIM_POS_LOCAL: |
8314 | res.Add(new LSL_Vector(GetPartLocalPos(part))); | 9538 | res.Add(new LSL_Vector(GetPartLocalPos(part))); |
8315 | break; | 9539 | break; |
9540 | case (int)ScriptBaseClass.PRIM_LINK_TARGET: | ||
9541 | if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless. | ||
9542 | return res; | ||
9543 | LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++); | ||
9544 | LSL_List new_rules = rules.GetSublist(idx, -1); | ||
9545 | LSL_List tres = llGetLinkPrimitiveParams((int)new_linknumber, new_rules); | ||
9546 | res += tres; | ||
9547 | return res; | ||
8316 | case (int)ScriptBaseClass.PRIM_SLICE: | 9548 | case (int)ScriptBaseClass.PRIM_SLICE: |
8317 | PrimType prim_type = part.GetPrimType(); | 9549 | PrimType prim_type = part.GetPrimType(); |
8318 | bool useProfileBeginEnd = (prim_type == PrimType.SPHERE || prim_type == PrimType.TORUS || prim_type == PrimType.TUBE || prim_type == PrimType.RING); | 9550 | bool useProfileBeginEnd = (prim_type == PrimType.SPHERE || prim_type == PrimType.TORUS || prim_type == PrimType.TUBE || prim_type == PrimType.RING); |
@@ -8914,8 +10146,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8914 | // The function returns an ordered list | 10146 | // The function returns an ordered list |
8915 | // representing the tokens found in the supplied | 10147 | // representing the tokens found in the supplied |
8916 | // sources string. If two successive tokenizers | 10148 | // sources string. If two successive tokenizers |
8917 | // are encountered, then a NULL entry is added | 10149 | // are encountered, then a null-string entry is |
8918 | // to the list. | 10150 | // added to the list. |
8919 | // | 10151 | // |
8920 | // It is a precondition that the source and | 10152 | // It is a precondition that the source and |
8921 | // toekizer lisst are non-null. If they are null, | 10153 | // toekizer lisst are non-null. If they are null, |
@@ -8923,7 +10155,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8923 | // while their lengths are being determined. | 10155 | // while their lengths are being determined. |
8924 | // | 10156 | // |
8925 | // A small amount of working memoryis required | 10157 | // A small amount of working memoryis required |
8926 | // of approximately 8*#tokenizers. | 10158 | // of approximately 8*#tokenizers + 8*srcstrlen. |
8927 | // | 10159 | // |
8928 | // There are many ways in which this function | 10160 | // There are many ways in which this function |
8929 | // can be implemented, this implementation is | 10161 | // can be implemented, this implementation is |
@@ -8939,155 +10171,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8939 | // and eliminates redundant tokenizers as soon | 10171 | // and eliminates redundant tokenizers as soon |
8940 | // as is possible. | 10172 | // as is possible. |
8941 | // | 10173 | // |
8942 | // The implementation tries to avoid any copying | 10174 | // The implementation tries to minimize temporary |
8943 | // of arrays or other objects. | 10175 | // garbage generation. |
8944 | // </remarks> | 10176 | // </remarks> |
8945 | 10177 | ||
8946 | private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls) | 10178 | public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers) |
8947 | { | 10179 | { |
8948 | int beginning = 0; | 10180 | return ParseString2List(src, separators, spacers, true); |
8949 | int srclen = src.Length; | 10181 | } |
8950 | int seplen = separators.Length; | ||
8951 | object[] separray = separators.Data; | ||
8952 | int spclen = spacers.Length; | ||
8953 | object[] spcarray = spacers.Data; | ||
8954 | int mlen = seplen+spclen; | ||
8955 | |||
8956 | int[] offset = new int[mlen+1]; | ||
8957 | bool[] active = new bool[mlen]; | ||
8958 | |||
8959 | int best; | ||
8960 | int j; | ||
8961 | |||
8962 | // Initial capacity reduces resize cost | ||
8963 | 10182 | ||
8964 | LSL_List tokens = new LSL_List(); | 10183 | private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls) |
10184 | { | ||
10185 | int srclen = src.Length; | ||
10186 | int seplen = separators.Length; | ||
10187 | object[] separray = separators.Data; | ||
10188 | int spclen = spacers.Length; | ||
10189 | object[] spcarray = spacers.Data; | ||
10190 | int dellen = 0; | ||
10191 | string[] delarray = new string[seplen+spclen]; | ||
8965 | 10192 | ||
8966 | // All entries are initially valid | 10193 | int outlen = 0; |
10194 | string[] outarray = new string[srclen*2+1]; | ||
8967 | 10195 | ||
8968 | for (int i = 0; i < mlen; i++) | 10196 | int i, j; |
8969 | active[i] = true; | 10197 | string d; |
8970 | 10198 | ||
8971 | offset[mlen] = srclen; | 10199 | m_host.AddScriptLPS(1); |
8972 | 10200 | ||
8973 | while (beginning < srclen) | 10201 | /* |
10202 | * Convert separator and spacer lists to C# strings. | ||
10203 | * Also filter out null strings so we don't hang. | ||
10204 | */ | ||
10205 | for (i = 0; i < seplen; i ++) | ||
8974 | { | 10206 | { |
10207 | d = separray[i].ToString(); | ||
10208 | if (d.Length > 0) | ||
10209 | { | ||
10210 | delarray[dellen++] = d; | ||
10211 | } | ||
10212 | } | ||
10213 | seplen = dellen; | ||
8975 | 10214 | ||
8976 | best = mlen; // as bad as it gets | 10215 | for (i = 0; i < spclen; i ++) |
10216 | { | ||
10217 | d = spcarray[i].ToString(); | ||
10218 | if (d.Length > 0) | ||
10219 | { | ||
10220 | delarray[dellen++] = d; | ||
10221 | } | ||
10222 | } | ||
8977 | 10223 | ||
8978 | // Scan for separators | 10224 | /* |
10225 | * Scan through source string from beginning to end. | ||
10226 | */ | ||
10227 | for (i = 0;;) | ||
10228 | { | ||
8979 | 10229 | ||
8980 | for (j = 0; j < seplen; j++) | 10230 | /* |
10231 | * Find earliest delimeter in src starting at i (if any). | ||
10232 | */ | ||
10233 | int earliestDel = -1; | ||
10234 | int earliestSrc = srclen; | ||
10235 | string earliestStr = null; | ||
10236 | for (j = 0; j < dellen; j ++) | ||
8981 | { | 10237 | { |
8982 | if (separray[j].ToString() == String.Empty) | 10238 | d = delarray[j]; |
8983 | active[j] = false; | 10239 | if (d != null) |
8984 | |||
8985 | if (active[j]) | ||
8986 | { | 10240 | { |
8987 | // scan all of the markers | 10241 | int index = src.IndexOf(d, i); |
8988 | if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1) | 10242 | if (index < 0) |
8989 | { | 10243 | { |
8990 | // not present at all | 10244 | delarray[j] = null; // delim nowhere in src, don't check it anymore |
8991 | active[j] = false; | ||
8992 | } | 10245 | } |
8993 | else | 10246 | else if (index < earliestSrc) |
8994 | { | 10247 | { |
8995 | // present and correct | 10248 | earliestSrc = index; // where delimeter starts in source string |
8996 | if (offset[j] < offset[best]) | 10249 | earliestDel = j; // where delimeter is in delarray[] |
8997 | { | 10250 | earliestStr = d; // the delimeter string from delarray[] |
8998 | // closest so far | 10251 | if (index == i) break; // can't do any better than found at beg of string |
8999 | best = j; | ||
9000 | if (offset[best] == beginning) | ||
9001 | break; | ||
9002 | } | ||
9003 | } | 10252 | } |
9004 | } | 10253 | } |
9005 | } | 10254 | } |
9006 | 10255 | ||
9007 | // Scan for spacers | 10256 | /* |
9008 | 10257 | * Output source string starting at i through start of earliest delimeter. | |
9009 | if (offset[best] != beginning) | 10258 | */ |
10259 | if (keepNulls || (earliestSrc > i)) | ||
9010 | { | 10260 | { |
9011 | for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) | 10261 | outarray[outlen++] = src.Substring(i, earliestSrc - i); |
9012 | { | ||
9013 | if (spcarray[j-seplen].ToString() == String.Empty) | ||
9014 | active[j] = false; | ||
9015 | |||
9016 | if (active[j]) | ||
9017 | { | ||
9018 | // scan all of the markers | ||
9019 | if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1) | ||
9020 | { | ||
9021 | // not present at all | ||
9022 | active[j] = false; | ||
9023 | } | ||
9024 | else | ||
9025 | { | ||
9026 | // present and correct | ||
9027 | if (offset[j] < offset[best]) | ||
9028 | { | ||
9029 | // closest so far | ||
9030 | best = j; | ||
9031 | } | ||
9032 | } | ||
9033 | } | ||
9034 | } | ||
9035 | } | 10262 | } |
9036 | 10263 | ||
9037 | // This is the normal exit from the scanning loop | 10264 | /* |
10265 | * If no delimeter found at or after i, we're done scanning. | ||
10266 | */ | ||
10267 | if (earliestDel < 0) break; | ||
9038 | 10268 | ||
9039 | if (best == mlen) | 10269 | /* |
10270 | * If delimeter was a spacer, output the spacer. | ||
10271 | */ | ||
10272 | if (earliestDel >= seplen) | ||
9040 | { | 10273 | { |
9041 | // no markers were found on this pass | 10274 | outarray[outlen++] = earliestStr; |
9042 | // so we're pretty much done | ||
9043 | if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0)) | ||
9044 | tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning))); | ||
9045 | break; | ||
9046 | } | 10275 | } |
9047 | 10276 | ||
9048 | // Otherwise we just add the newly delimited token | 10277 | /* |
9049 | // and recalculate where the search should continue. | 10278 | * Look at rest of src string following delimeter. |
9050 | if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0)) | 10279 | */ |
9051 | tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning))); | 10280 | i = earliestSrc + earliestStr.Length; |
9052 | |||
9053 | if (best < seplen) | ||
9054 | { | ||
9055 | beginning = offset[best] + (separray[best].ToString()).Length; | ||
9056 | } | ||
9057 | else | ||
9058 | { | ||
9059 | beginning = offset[best] + (spcarray[best - seplen].ToString()).Length; | ||
9060 | string str = spcarray[best - seplen].ToString(); | ||
9061 | if ((keepNulls) || ((!keepNulls) && (str.Length > 0))) | ||
9062 | tokens.Add(new LSL_String(str)); | ||
9063 | } | ||
9064 | } | 10281 | } |
9065 | 10282 | ||
9066 | // This an awkward an not very intuitive boundary case. If the | 10283 | /* |
9067 | // last substring is a tokenizer, then there is an implied trailing | 10284 | * Make up an exact-sized output array suitable for an LSL_List object. |
9068 | // null list entry. Hopefully the single comparison will not be too | 10285 | */ |
9069 | // arduous. Alternatively the 'break' could be replced with a return | 10286 | object[] outlist = new object[outlen]; |
9070 | // but that's shabby programming. | 10287 | for (i = 0; i < outlen; i ++) |
9071 | |||
9072 | if ((beginning == srclen) && (keepNulls)) | ||
9073 | { | 10288 | { |
9074 | if (srclen != 0) | 10289 | outlist[i] = new LSL_String(outarray[i]); |
9075 | tokens.Add(new LSL_String("")); | ||
9076 | } | 10290 | } |
9077 | 10291 | return new LSL_List(outlist); | |
9078 | return tokens; | ||
9079 | } | ||
9080 | |||
9081 | public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers) | ||
9082 | { | ||
9083 | m_host.AddScriptLPS(1); | ||
9084 | return this.ParseString(src, separators, spacers, false); | ||
9085 | } | ||
9086 | |||
9087 | public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers) | ||
9088 | { | ||
9089 | m_host.AddScriptLPS(1); | ||
9090 | return this.ParseString(src, separators, spacers, true); | ||
9091 | } | 10292 | } |
9092 | 10293 | ||
9093 | public LSL_Integer llGetObjectPermMask(int mask) | 10294 | public LSL_Integer llGetObjectPermMask(int mask) |
@@ -9182,6 +10383,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9182 | case 4: | 10383 | case 4: |
9183 | return (int)item.NextPermissions; | 10384 | return (int)item.NextPermissions; |
9184 | } | 10385 | } |
10386 | m_host.TaskInventory.LockItemsForRead(false); | ||
9185 | 10387 | ||
9186 | return -1; | 10388 | return -1; |
9187 | } | 10389 | } |
@@ -9372,9 +10574,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9372 | { | 10574 | { |
9373 | try | 10575 | try |
9374 | { | 10576 | { |
10577 | /* | ||
9375 | SceneObjectPart obj = World.GetSceneObjectPart(World.Entities[key].LocalId); | 10578 | SceneObjectPart obj = World.GetSceneObjectPart(World.Entities[key].LocalId); |
9376 | if (obj != null) | 10579 | if (obj != null) |
9377 | return (double)obj.GetMass(); | 10580 | return (double)obj.GetMass(); |
10581 | */ | ||
10582 | // return total object mass | ||
10583 | SceneObjectGroup obj = World.GetGroupByPrim(World.Entities[key].LocalId); | ||
10584 | if (obj != null) | ||
10585 | return obj.GetMass(); | ||
10586 | |||
9378 | // the object is null so the key is for an avatar | 10587 | // the object is null so the key is for an avatar |
9379 | ScenePresence avatar = World.GetScenePresence(key); | 10588 | ScenePresence avatar = World.GetScenePresence(key); |
9380 | if (avatar != null) | 10589 | if (avatar != null) |
@@ -9394,7 +10603,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9394 | } | 10603 | } |
9395 | 10604 | ||
9396 | /// <summary> | 10605 | /// <summary> |
9397 | /// illListReplaceList removes the sub-list defined by the inclusive indices | 10606 | /// llListReplaceList removes the sub-list defined by the inclusive indices |
9398 | /// start and end and inserts the src list in its place. The inclusive | 10607 | /// start and end and inserts the src list in its place. The inclusive |
9399 | /// nature of the indices means that at least one element must be deleted | 10608 | /// nature of the indices means that at least one element must be deleted |
9400 | /// if the indices are within the bounds of the existing list. I.e. 2,2 | 10609 | /// if the indices are within the bounds of the existing list. I.e. 2,2 |
@@ -9451,16 +10660,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9451 | // based upon end. Note that if end exceeds the upper | 10660 | // based upon end. Note that if end exceeds the upper |
9452 | // bound in this case, the entire destination list | 10661 | // bound in this case, the entire destination list |
9453 | // is removed. | 10662 | // is removed. |
9454 | else | 10663 | else if (start == 0) |
9455 | { | 10664 | { |
9456 | if (end + 1 < dest.Length) | 10665 | if (end + 1 < dest.Length) |
9457 | { | ||
9458 | return src + dest.GetSublist(end + 1, -1); | 10666 | return src + dest.GetSublist(end + 1, -1); |
9459 | } | ||
9460 | else | 10667 | else |
9461 | { | ||
9462 | return src; | 10668 | return src; |
9463 | } | 10669 | } |
10670 | else // Start < 0 | ||
10671 | { | ||
10672 | if (end + 1 < dest.Length) | ||
10673 | return dest.GetSublist(end + 1, -1); | ||
10674 | else | ||
10675 | return new LSL_List(); | ||
9464 | } | 10676 | } |
9465 | } | 10677 | } |
9466 | // Finally, if start > end, we strip away a prefix and | 10678 | // Finally, if start > end, we strip away a prefix and |
@@ -9511,17 +10723,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9511 | int width = 0; | 10723 | int width = 0; |
9512 | int height = 0; | 10724 | int height = 0; |
9513 | 10725 | ||
9514 | ParcelMediaCommandEnum? commandToSend = null; | 10726 | uint commandToSend = 0; |
9515 | float time = 0.0f; // default is from start | 10727 | float time = 0.0f; // default is from start |
9516 | 10728 | ||
9517 | ScenePresence presence = null; | 10729 | ScenePresence presence = null; |
9518 | 10730 | ||
9519 | for (int i = 0; i < commandList.Data.Length; i++) | 10731 | for (int i = 0; i < commandList.Data.Length; i++) |
9520 | { | 10732 | { |
9521 | ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; | 10733 | uint command = (uint)(commandList.GetLSLIntegerItem(i)); |
9522 | switch (command) | 10734 | switch (command) |
9523 | { | 10735 | { |
9524 | case ParcelMediaCommandEnum.Agent: | 10736 | case (uint)ParcelMediaCommandEnum.Agent: |
9525 | // we send only to one agent | 10737 | // we send only to one agent |
9526 | if ((i + 1) < commandList.Length) | 10738 | if ((i + 1) < commandList.Length) |
9527 | { | 10739 | { |
@@ -9538,25 +10750,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9538 | } | 10750 | } |
9539 | break; | 10751 | break; |
9540 | 10752 | ||
9541 | case ParcelMediaCommandEnum.Loop: | 10753 | case (uint)ParcelMediaCommandEnum.Loop: |
9542 | loop = 1; | 10754 | loop = 1; |
9543 | commandToSend = command; | 10755 | commandToSend = command; |
9544 | update = true; //need to send the media update packet to set looping | 10756 | update = true; //need to send the media update packet to set looping |
9545 | break; | 10757 | break; |
9546 | 10758 | ||
9547 | case ParcelMediaCommandEnum.Play: | 10759 | case (uint)ParcelMediaCommandEnum.Play: |
9548 | loop = 0; | 10760 | loop = 0; |
9549 | commandToSend = command; | 10761 | commandToSend = command; |
9550 | update = true; //need to send the media update packet to make sure it doesn't loop | 10762 | update = true; //need to send the media update packet to make sure it doesn't loop |
9551 | break; | 10763 | break; |
9552 | 10764 | ||
9553 | case ParcelMediaCommandEnum.Pause: | 10765 | case (uint)ParcelMediaCommandEnum.Pause: |
9554 | case ParcelMediaCommandEnum.Stop: | 10766 | case (uint)ParcelMediaCommandEnum.Stop: |
9555 | case ParcelMediaCommandEnum.Unload: | 10767 | case (uint)ParcelMediaCommandEnum.Unload: |
9556 | commandToSend = command; | 10768 | commandToSend = command; |
9557 | break; | 10769 | break; |
9558 | 10770 | ||
9559 | case ParcelMediaCommandEnum.Url: | 10771 | case (uint)ParcelMediaCommandEnum.Url: |
9560 | if ((i + 1) < commandList.Length) | 10772 | if ((i + 1) < commandList.Length) |
9561 | { | 10773 | { |
9562 | if (commandList.Data[i + 1] is LSL_String) | 10774 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9569,7 +10781,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9569 | } | 10781 | } |
9570 | break; | 10782 | break; |
9571 | 10783 | ||
9572 | case ParcelMediaCommandEnum.Texture: | 10784 | case (uint)ParcelMediaCommandEnum.Texture: |
9573 | if ((i + 1) < commandList.Length) | 10785 | if ((i + 1) < commandList.Length) |
9574 | { | 10786 | { |
9575 | if (commandList.Data[i + 1] is LSL_String) | 10787 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9582,7 +10794,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9582 | } | 10794 | } |
9583 | break; | 10795 | break; |
9584 | 10796 | ||
9585 | case ParcelMediaCommandEnum.Time: | 10797 | case (uint)ParcelMediaCommandEnum.Time: |
9586 | if ((i + 1) < commandList.Length) | 10798 | if ((i + 1) < commandList.Length) |
9587 | { | 10799 | { |
9588 | if (commandList.Data[i + 1] is LSL_Float) | 10800 | if (commandList.Data[i + 1] is LSL_Float) |
@@ -9594,7 +10806,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9594 | } | 10806 | } |
9595 | break; | 10807 | break; |
9596 | 10808 | ||
9597 | case ParcelMediaCommandEnum.AutoAlign: | 10809 | case (uint)ParcelMediaCommandEnum.AutoAlign: |
9598 | if ((i + 1) < commandList.Length) | 10810 | if ((i + 1) < commandList.Length) |
9599 | { | 10811 | { |
9600 | if (commandList.Data[i + 1] is LSL_Integer) | 10812 | if (commandList.Data[i + 1] is LSL_Integer) |
@@ -9608,7 +10820,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9608 | } | 10820 | } |
9609 | break; | 10821 | break; |
9610 | 10822 | ||
9611 | case ParcelMediaCommandEnum.Type: | 10823 | case (uint)ParcelMediaCommandEnum.Type: |
9612 | if ((i + 1) < commandList.Length) | 10824 | if ((i + 1) < commandList.Length) |
9613 | { | 10825 | { |
9614 | if (commandList.Data[i + 1] is LSL_String) | 10826 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9621,7 +10833,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9621 | } | 10833 | } |
9622 | break; | 10834 | break; |
9623 | 10835 | ||
9624 | case ParcelMediaCommandEnum.Desc: | 10836 | case (uint)ParcelMediaCommandEnum.Desc: |
9625 | if ((i + 1) < commandList.Length) | 10837 | if ((i + 1) < commandList.Length) |
9626 | { | 10838 | { |
9627 | if (commandList.Data[i + 1] is LSL_String) | 10839 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9634,7 +10846,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9634 | } | 10846 | } |
9635 | break; | 10847 | break; |
9636 | 10848 | ||
9637 | case ParcelMediaCommandEnum.Size: | 10849 | case (uint)ParcelMediaCommandEnum.Size: |
9638 | if ((i + 2) < commandList.Length) | 10850 | if ((i + 2) < commandList.Length) |
9639 | { | 10851 | { |
9640 | if (commandList.Data[i + 1] is LSL_Integer) | 10852 | if (commandList.Data[i + 1] is LSL_Integer) |
@@ -9704,7 +10916,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9704 | } | 10916 | } |
9705 | } | 10917 | } |
9706 | 10918 | ||
9707 | if (commandToSend != null) | 10919 | if (commandToSend != 0) |
9708 | { | 10920 | { |
9709 | // the commandList contained a start/stop/... command, too | 10921 | // the commandList contained a start/stop/... command, too |
9710 | if (presence == null) | 10922 | if (presence == null) |
@@ -9741,7 +10953,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9741 | 10953 | ||
9742 | if (aList.Data[i] != null) | 10954 | if (aList.Data[i] != null) |
9743 | { | 10955 | { |
9744 | switch ((ParcelMediaCommandEnum) aList.Data[i]) | 10956 | switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString())) |
9745 | { | 10957 | { |
9746 | case ParcelMediaCommandEnum.Url: | 10958 | case ParcelMediaCommandEnum.Url: |
9747 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); | 10959 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); |
@@ -9798,15 +11010,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9798 | 11010 | ||
9799 | if (quick_pay_buttons.Data.Length < 4) | 11011 | if (quick_pay_buttons.Data.Length < 4) |
9800 | { | 11012 | { |
9801 | LSLError("List must have at least 4 elements"); | 11013 | int x; |
9802 | return; | 11014 | for (x=quick_pay_buttons.Data.Length; x<= 4; x++) |
11015 | { | ||
11016 | quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE); | ||
11017 | } | ||
9803 | } | 11018 | } |
9804 | m_host.ParentGroup.RootPart.PayPrice[0]=price; | 11019 | int[] nPrice = new int[5]; |
9805 | 11020 | nPrice[0] = price; | |
9806 | m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; | 11021 | nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0); |
9807 | m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; | 11022 | nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1); |
9808 | m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; | 11023 | nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2); |
9809 | m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; | 11024 | nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3); |
11025 | m_host.ParentGroup.RootPart.PayPrice = nPrice; | ||
9810 | m_host.ParentGroup.HasGroupChanged = true; | 11026 | m_host.ParentGroup.HasGroupChanged = true; |
9811 | } | 11027 | } |
9812 | 11028 | ||
@@ -9823,7 +11039,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9823 | return new LSL_Vector(); | 11039 | return new LSL_Vector(); |
9824 | } | 11040 | } |
9825 | 11041 | ||
9826 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 11042 | // ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
11043 | ScenePresence presence = World.GetScenePresence(m_item.PermsGranter); | ||
9827 | if (presence != null) | 11044 | if (presence != null) |
9828 | { | 11045 | { |
9829 | LSL_Vector pos = new LSL_Vector(presence.CameraPosition.X, presence.CameraPosition.Y, presence.CameraPosition.Z); | 11046 | LSL_Vector pos = new LSL_Vector(presence.CameraPosition.X, presence.CameraPosition.Y, presence.CameraPosition.Z); |
@@ -9845,7 +11062,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9845 | return new LSL_Rotation(); | 11062 | return new LSL_Rotation(); |
9846 | } | 11063 | } |
9847 | 11064 | ||
9848 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 11065 | // ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
11066 | ScenePresence presence = World.GetScenePresence(m_item.PermsGranter); | ||
9849 | if (presence != null) | 11067 | if (presence != null) |
9850 | { | 11068 | { |
9851 | return new LSL_Rotation(presence.CameraRotation.X, presence.CameraRotation.Y, presence.CameraRotation.Z, presence.CameraRotation.W); | 11069 | return new LSL_Rotation(presence.CameraRotation.X, presence.CameraRotation.Y, presence.CameraRotation.Z, presence.CameraRotation.W); |
@@ -9905,14 +11123,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9905 | { | 11123 | { |
9906 | m_host.AddScriptLPS(1); | 11124 | m_host.AddScriptLPS(1); |
9907 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0); | 11125 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0); |
9908 | if (detectedParams == null) return; // only works on the first detected avatar | 11126 | if (detectedParams == null) |
9909 | 11127 | { | |
11128 | if (m_host.ParentGroup.IsAttachment == true) | ||
11129 | { | ||
11130 | detectedParams = new DetectParams(); | ||
11131 | detectedParams.Key = m_host.OwnerID; | ||
11132 | } | ||
11133 | else | ||
11134 | { | ||
11135 | return; | ||
11136 | } | ||
11137 | } | ||
11138 | |||
9910 | ScenePresence avatar = World.GetScenePresence(detectedParams.Key); | 11139 | ScenePresence avatar = World.GetScenePresence(detectedParams.Key); |
9911 | if (avatar != null) | 11140 | if (avatar != null) |
9912 | { | 11141 | { |
9913 | avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, | 11142 | avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, |
9914 | simname, pos, lookAt); | 11143 | simname, pos, lookAt); |
9915 | } | 11144 | } |
11145 | |||
9916 | ScriptSleep(1000); | 11146 | ScriptSleep(1000); |
9917 | } | 11147 | } |
9918 | 11148 | ||
@@ -10036,12 +11266,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10036 | 11266 | ||
10037 | SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); | 11267 | SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); |
10038 | object[] data = rules.Data; | 11268 | object[] data = rules.Data; |
10039 | for (int i = 0; i < data.Length; ++i) { | 11269 | for (int i = 0; i < data.Length; ++i) |
11270 | { | ||
10040 | int type = Convert.ToInt32(data[i++].ToString()); | 11271 | int type = Convert.ToInt32(data[i++].ToString()); |
10041 | if (i >= data.Length) break; // odd number of entries => ignore the last | 11272 | if (i >= data.Length) break; // odd number of entries => ignore the last |
10042 | 11273 | ||
10043 | // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) | 11274 | // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) |
10044 | switch (type) { | 11275 | switch (type) |
11276 | { | ||
10045 | case ScriptBaseClass.CAMERA_FOCUS: | 11277 | case ScriptBaseClass.CAMERA_FOCUS: |
10046 | case ScriptBaseClass.CAMERA_FOCUS_OFFSET: | 11278 | case ScriptBaseClass.CAMERA_FOCUS_OFFSET: |
10047 | case ScriptBaseClass.CAMERA_POSITION: | 11279 | case ScriptBaseClass.CAMERA_POSITION: |
@@ -10147,19 +11379,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10147 | public LSL_String llXorBase64StringsCorrect(string str1, string str2) | 11379 | public LSL_String llXorBase64StringsCorrect(string str1, string str2) |
10148 | { | 11380 | { |
10149 | m_host.AddScriptLPS(1); | 11381 | m_host.AddScriptLPS(1); |
10150 | string ret = String.Empty; | 11382 | |
10151 | string src1 = llBase64ToString(str1); | 11383 | if (str1 == String.Empty) |
10152 | string src2 = llBase64ToString(str2); | 11384 | return String.Empty; |
10153 | int c = 0; | 11385 | if (str2 == String.Empty) |
10154 | for (int i = 0; i < src1.Length; i++) | 11386 | return str1; |
11387 | |||
11388 | int len = str2.Length; | ||
11389 | if ((len % 4) != 0) // LL is EVIL!!!! | ||
10155 | { | 11390 | { |
10156 | ret += (char) (src1[i] ^ src2[c]); | 11391 | while (str2.EndsWith("=")) |
11392 | str2 = str2.Substring(0, str2.Length - 1); | ||
10157 | 11393 | ||
10158 | c++; | 11394 | len = str2.Length; |
10159 | if (c >= src2.Length) | 11395 | int mod = len % 4; |
10160 | c = 0; | 11396 | |
11397 | if (mod == 1) | ||
11398 | str2 = str2.Substring(0, str2.Length - 1); | ||
11399 | else if (mod == 2) | ||
11400 | str2 += "=="; | ||
11401 | else if (mod == 3) | ||
11402 | str2 += "="; | ||
10161 | } | 11403 | } |
10162 | return llStringToBase64(ret); | 11404 | |
11405 | byte[] data1; | ||
11406 | byte[] data2; | ||
11407 | try | ||
11408 | { | ||
11409 | data1 = Convert.FromBase64String(str1); | ||
11410 | data2 = Convert.FromBase64String(str2); | ||
11411 | } | ||
11412 | catch (Exception) | ||
11413 | { | ||
11414 | return new LSL_String(String.Empty); | ||
11415 | } | ||
11416 | |||
11417 | byte[] d2 = new Byte[data1.Length]; | ||
11418 | int pos = 0; | ||
11419 | |||
11420 | if (data1.Length <= data2.Length) | ||
11421 | { | ||
11422 | Array.Copy(data2, 0, d2, 0, data1.Length); | ||
11423 | } | ||
11424 | else | ||
11425 | { | ||
11426 | while (pos < data1.Length) | ||
11427 | { | ||
11428 | len = data1.Length - pos; | ||
11429 | if (len > data2.Length) | ||
11430 | len = data2.Length; | ||
11431 | |||
11432 | Array.Copy(data2, 0, d2, pos, len); | ||
11433 | pos += len; | ||
11434 | } | ||
11435 | } | ||
11436 | |||
11437 | for (pos = 0 ; pos < data1.Length ; pos++ ) | ||
11438 | data1[pos] ^= d2[pos]; | ||
11439 | |||
11440 | return Convert.ToBase64String(data1); | ||
10163 | } | 11441 | } |
10164 | 11442 | ||
10165 | public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) | 11443 | public LSL_String llHTTPRequest(string url, LSL_List parameters, string body) |
@@ -10212,16 +11490,72 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10212 | if (userAgent != null) | 11490 | if (userAgent != null) |
10213 | httpHeaders["User-Agent"] = userAgent; | 11491 | httpHeaders["User-Agent"] = userAgent; |
10214 | 11492 | ||
11493 | // See if the URL contains any header hacks | ||
11494 | string[] urlParts = url.Split(new char[] {'\n'}); | ||
11495 | if (urlParts.Length > 1) | ||
11496 | { | ||
11497 | // Iterate the passed headers and parse them | ||
11498 | for (int i = 1 ; i < urlParts.Length ; i++ ) | ||
11499 | { | ||
11500 | // The rest of those would be added to the body in SL. | ||
11501 | // Let's not do that. | ||
11502 | if (urlParts[i] == String.Empty) | ||
11503 | break; | ||
11504 | |||
11505 | // See if this could be a valid header | ||
11506 | string[] headerParts = urlParts[i].Split(new char[] {':'}, 2); | ||
11507 | if (headerParts.Length != 2) | ||
11508 | continue; | ||
11509 | |||
11510 | string headerName = headerParts[0].Trim(); | ||
11511 | string headerValue = headerParts[1].Trim(); | ||
11512 | |||
11513 | // Filter out headers that could be used to abuse | ||
11514 | // another system or cloak the request | ||
11515 | if (headerName.ToLower() == "x-secondlife-shard" || | ||
11516 | headerName.ToLower() == "x-secondlife-object-name" || | ||
11517 | headerName.ToLower() == "x-secondlife-object-key" || | ||
11518 | headerName.ToLower() == "x-secondlife-region" || | ||
11519 | headerName.ToLower() == "x-secondlife-local-position" || | ||
11520 | headerName.ToLower() == "x-secondlife-local-velocity" || | ||
11521 | headerName.ToLower() == "x-secondlife-local-rotation" || | ||
11522 | headerName.ToLower() == "x-secondlife-owner-name" || | ||
11523 | headerName.ToLower() == "x-secondlife-owner-key" || | ||
11524 | headerName.ToLower() == "connection" || | ||
11525 | headerName.ToLower() == "content-length" || | ||
11526 | headerName.ToLower() == "from" || | ||
11527 | headerName.ToLower() == "host" || | ||
11528 | headerName.ToLower() == "proxy-authorization" || | ||
11529 | headerName.ToLower() == "referer" || | ||
11530 | headerName.ToLower() == "trailer" || | ||
11531 | headerName.ToLower() == "transfer-encoding" || | ||
11532 | headerName.ToLower() == "via" || | ||
11533 | headerName.ToLower() == "authorization") | ||
11534 | continue; | ||
11535 | |||
11536 | httpHeaders[headerName] = headerValue; | ||
11537 | } | ||
11538 | |||
11539 | // Finally, strip any protocol specifier from the URL | ||
11540 | url = urlParts[0].Trim(); | ||
11541 | int idx = url.IndexOf(" HTTP/"); | ||
11542 | if (idx != -1) | ||
11543 | url = url.Substring(0, idx); | ||
11544 | } | ||
11545 | |||
10215 | string authregex = @"^(https?:\/\/)(\w+):(\w+)@(.*)$"; | 11546 | string authregex = @"^(https?:\/\/)(\w+):(\w+)@(.*)$"; |
10216 | Regex r = new Regex(authregex); | 11547 | Regex r = new Regex(authregex); |
10217 | int[] gnums = r.GetGroupNumbers(); | 11548 | int[] gnums = r.GetGroupNumbers(); |
10218 | Match m = r.Match(url); | 11549 | Match m = r.Match(url); |
10219 | if (m.Success) { | 11550 | if (m.Success) |
10220 | for (int i = 1; i < gnums.Length; i++) { | 11551 | { |
11552 | for (int i = 1; i < gnums.Length; i++) | ||
11553 | { | ||
10221 | //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; | 11554 | //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; |
10222 | //CaptureCollection cc = g.Captures; | 11555 | //CaptureCollection cc = g.Captures; |
10223 | } | 11556 | } |
10224 | if (m.Groups.Count == 5) { | 11557 | if (m.Groups.Count == 5) |
11558 | { | ||
10225 | httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); | 11559 | httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); |
10226 | url = m.Groups[1].ToString() + m.Groups[4].ToString(); | 11560 | url = m.Groups[1].ToString() + m.Groups[4].ToString(); |
10227 | } | 11561 | } |
@@ -10424,6 +11758,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10424 | 11758 | ||
10425 | LSL_List ret = new LSL_List(); | 11759 | LSL_List ret = new LSL_List(); |
10426 | UUID key = new UUID(); | 11760 | UUID key = new UUID(); |
11761 | |||
11762 | |||
10427 | if (UUID.TryParse(id, out key)) | 11763 | if (UUID.TryParse(id, out key)) |
10428 | { | 11764 | { |
10429 | ScenePresence av = World.GetScenePresence(key); | 11765 | ScenePresence av = World.GetScenePresence(key); |
@@ -10441,13 +11777,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10441 | ret.Add(new LSL_String("")); | 11777 | ret.Add(new LSL_String("")); |
10442 | break; | 11778 | break; |
10443 | case ScriptBaseClass.OBJECT_POS: | 11779 | case ScriptBaseClass.OBJECT_POS: |
10444 | ret.Add(new LSL_Vector((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z)); | 11780 | Vector3 avpos; |
11781 | |||
11782 | if (av.ParentID != 0 && av.ParentPart != null) | ||
11783 | { | ||
11784 | avpos = av.OffsetPosition; | ||
11785 | |||
11786 | Vector3 sitOffset = (Zrot(av.Rotation)) * (av.Appearance.AvatarHeight * 0.02638f *2.0f); | ||
11787 | avpos -= sitOffset; | ||
11788 | |||
11789 | avpos = av.ParentPart.GetWorldPosition() + avpos * av.ParentPart.GetWorldRotation(); | ||
11790 | } | ||
11791 | else | ||
11792 | avpos = av.AbsolutePosition; | ||
11793 | |||
11794 | ret.Add(new LSL_Vector((double)avpos.X, (double)avpos.Y, (double)avpos.Z)); | ||
10445 | break; | 11795 | break; |
10446 | case ScriptBaseClass.OBJECT_ROT: | 11796 | case ScriptBaseClass.OBJECT_ROT: |
10447 | ret.Add(new LSL_Rotation((double)av.Rotation.X, (double)av.Rotation.Y, (double)av.Rotation.Z, (double)av.Rotation.W)); | 11797 | Quaternion avrot = av.Rotation; |
11798 | if (av.ParentID != 0 && av.ParentPart != null) | ||
11799 | { | ||
11800 | avrot = av.ParentPart.GetWorldRotation() * avrot; | ||
11801 | } | ||
11802 | ret.Add(new LSL_Rotation((double)avrot.X, (double)avrot.Y, (double)avrot.Z, (double)avrot.W)); | ||
10448 | break; | 11803 | break; |
10449 | case ScriptBaseClass.OBJECT_VELOCITY: | 11804 | case ScriptBaseClass.OBJECT_VELOCITY: |
10450 | ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z)); | 11805 | Vector3 avvel = av.Velocity; |
11806 | ret.Add(new LSL_Vector((double)avvel.X, (double)avvel.Y, (double)avvel.Z)); | ||
10451 | break; | 11807 | break; |
10452 | case ScriptBaseClass.OBJECT_OWNER: | 11808 | case ScriptBaseClass.OBJECT_OWNER: |
10453 | ret.Add(new LSL_String(id)); | 11809 | ret.Add(new LSL_String(id)); |
@@ -10503,11 +11859,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10503 | case ScriptBaseClass.OBJECT_NAME: | 11859 | case ScriptBaseClass.OBJECT_NAME: |
10504 | ret.Add(new LSL_String(obj.Name)); | 11860 | ret.Add(new LSL_String(obj.Name)); |
10505 | break; | 11861 | break; |
10506 | case ScriptBaseClass.OBJECT_DESC: | 11862 | case ScriptBaseClass.OBJECT_DESC: |
10507 | ret.Add(new LSL_String(obj.Description)); | 11863 | ret.Add(new LSL_String(obj.Description)); |
10508 | break; | 11864 | break; |
10509 | case ScriptBaseClass.OBJECT_POS: | 11865 | case ScriptBaseClass.OBJECT_POS: |
10510 | ret.Add(new LSL_Vector(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z)); | 11866 | Vector3 opos = obj.AbsolutePosition; |
11867 | ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z)); | ||
10511 | break; | 11868 | break; |
10512 | case ScriptBaseClass.OBJECT_ROT: | 11869 | case ScriptBaseClass.OBJECT_ROT: |
10513 | { | 11870 | { |
@@ -10557,9 +11914,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10557 | // The value returned in SL for normal prims is prim count | 11914 | // The value returned in SL for normal prims is prim count |
10558 | ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount)); | 11915 | ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount)); |
10559 | break; | 11916 | break; |
10560 | // The following 3 costs I have intentionaly coded to return zero. They are part of | 11917 | |
10561 | // "Land Impact" calculations. These calculations are probably not applicable | 11918 | // costs below may need to be diferent for root parts, need to check |
10562 | // to OpenSim and are not yet complete in SL | ||
10563 | case ScriptBaseClass.OBJECT_SERVER_COST: | 11919 | case ScriptBaseClass.OBJECT_SERVER_COST: |
10564 | // The linden calculation is here | 11920 | // The linden calculation is here |
10565 | // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight | 11921 | // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight |
@@ -10567,16 +11923,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10567 | ret.Add(new LSL_Float(0)); | 11923 | ret.Add(new LSL_Float(0)); |
10568 | break; | 11924 | break; |
10569 | case ScriptBaseClass.OBJECT_STREAMING_COST: | 11925 | case ScriptBaseClass.OBJECT_STREAMING_COST: |
10570 | // The linden calculation is here | 11926 | // The value returned in SL for normal prims is prim count * 0.06 |
10571 | // http://wiki.secondlife.com/wiki/Mesh/Mesh_Streaming_Cost | 11927 | ret.Add(new LSL_Float(obj.StreamingCost)); |
10572 | // The value returned in SL for normal prims looks like the prim count * 0.06 | ||
10573 | ret.Add(new LSL_Float(0)); | ||
10574 | break; | 11928 | break; |
10575 | case ScriptBaseClass.OBJECT_PHYSICS_COST: | 11929 | case ScriptBaseClass.OBJECT_PHYSICS_COST: |
10576 | // The linden calculation is here | 11930 | // The value returned in SL for normal prims is prim count |
10577 | // http://wiki.secondlife.com/wiki/Mesh/Mesh_physics | 11931 | ret.Add(new LSL_Float(obj.PhysicsCost)); |
10578 | // The value returned in SL for normal prims looks like the prim count | ||
10579 | ret.Add(new LSL_Float(0)); | ||
10580 | break; | 11932 | break; |
10581 | default: | 11933 | default: |
10582 | // Invalid or unhandled constant. | 11934 | // Invalid or unhandled constant. |
@@ -10774,15 +12126,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10774 | return GetLinkPrimitiveParams(obj, rules); | 12126 | return GetLinkPrimitiveParams(obj, rules); |
10775 | } | 12127 | } |
10776 | 12128 | ||
10777 | public void print(string str) | 12129 | public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link) |
10778 | { | 12130 | { |
10779 | // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print | 12131 | List<SceneObjectPart> parts = GetLinkParts(link); |
10780 | IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "OSSL"); | 12132 | if (parts.Count < 1) |
10781 | if (ossl != null) | 12133 | return 0; |
10782 | { | 12134 | |
10783 | ossl.CheckThreatLevel(ThreatLevel.High, "print"); | 12135 | return GetNumberOfSides(parts[0]); |
10784 | m_log.Info("LSL print():" + str); | ||
10785 | } | ||
10786 | } | 12136 | } |
10787 | 12137 | ||
10788 | private string Name2Username(string name) | 12138 | private string Name2Username(string name) |
@@ -10827,7 +12177,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10827 | 12177 | ||
10828 | return rq.ToString(); | 12178 | return rq.ToString(); |
10829 | } | 12179 | } |
10830 | 12180 | /* | |
12181 | private void SayShoutTimerElapsed(Object sender, ElapsedEventArgs args) | ||
12182 | { | ||
12183 | m_SayShoutCount = 0; | ||
12184 | } | ||
12185 | */ | ||
10831 | private struct Tri | 12186 | private struct Tri |
10832 | { | 12187 | { |
10833 | public Vector3 p1; | 12188 | public Vector3 p1; |
@@ -10967,9 +12322,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10967 | 12322 | ||
10968 | ContactResult result = new ContactResult (); | 12323 | ContactResult result = new ContactResult (); |
10969 | result.ConsumerID = group.LocalId; | 12324 | result.ConsumerID = group.LocalId; |
10970 | result.Depth = intersection.distance; | 12325 | // result.Depth = intersection.distance; |
10971 | result.Normal = intersection.normal; | 12326 | result.Normal = intersection.normal; |
10972 | result.Pos = intersection.ipoint; | 12327 | result.Pos = intersection.ipoint; |
12328 | result.Depth = Vector3.Mag(rayStart - result.Pos); | ||
10973 | 12329 | ||
10974 | contacts.Add(result); | 12330 | contacts.Add(result); |
10975 | }); | 12331 | }); |
@@ -11102,6 +12458,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11102 | 12458 | ||
11103 | return contacts[0]; | 12459 | return contacts[0]; |
11104 | } | 12460 | } |
12461 | /* | ||
12462 | // not done: | ||
12463 | private ContactResult[] testRay2NonPhysicalPhantom(Vector3 rayStart, Vector3 raydir, float raylenght) | ||
12464 | { | ||
12465 | ContactResult[] contacts = null; | ||
12466 | World.ForEachSOG(delegate(SceneObjectGroup group) | ||
12467 | { | ||
12468 | if (m_host.ParentGroup == group) | ||
12469 | return; | ||
12470 | |||
12471 | if (group.IsAttachment) | ||
12472 | return; | ||
12473 | |||
12474 | if(group.RootPart.PhysActor != null) | ||
12475 | return; | ||
12476 | |||
12477 | contacts = group.RayCastGroupPartsOBBNonPhysicalPhantom(rayStart, raydir, raylenght); | ||
12478 | }); | ||
12479 | return contacts; | ||
12480 | } | ||
12481 | */ | ||
11105 | 12482 | ||
11106 | public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) | 12483 | public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) |
11107 | { | 12484 | { |
@@ -11143,32 +12520,96 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11143 | bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); | 12520 | bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); |
11144 | 12521 | ||
11145 | 12522 | ||
11146 | if (checkTerrain) | 12523 | if (World.SuportsRayCastFiltered()) |
11147 | { | 12524 | { |
11148 | ContactResult? groundContact = GroundIntersection(rayStart, rayEnd); | 12525 | if (dist == 0) |
11149 | if (groundContact != null) | 12526 | return list; |
11150 | results.Add((ContactResult)groundContact); | ||
11151 | } | ||
11152 | 12527 | ||
11153 | if (checkAgents) | 12528 | RayFilterFlags rayfilter = RayFilterFlags.ClosestAndBackCull; |
11154 | { | 12529 | if (checkTerrain) |
11155 | ContactResult[] agentHits = AvatarIntersection(rayStart, rayEnd); | 12530 | rayfilter |= RayFilterFlags.land; |
11156 | foreach (ContactResult r in agentHits) | 12531 | // if (checkAgents) |
11157 | results.Add(r); | 12532 | // rayfilter |= RayFilterFlags.agent; |
11158 | } | 12533 | if (checkPhysical) |
12534 | rayfilter |= RayFilterFlags.physical; | ||
12535 | if (checkNonPhysical) | ||
12536 | rayfilter |= RayFilterFlags.nonphysical; | ||
12537 | if (detectPhantom) | ||
12538 | rayfilter |= RayFilterFlags.LSLPhanton; | ||
12539 | |||
12540 | Vector3 direction = dir * ( 1/dist); | ||
11159 | 12541 | ||
11160 | if (checkPhysical || checkNonPhysical || detectPhantom) | 12542 | if(rayfilter == 0) |
12543 | { | ||
12544 | list.Add(new LSL_Integer(0)); | ||
12545 | return list; | ||
12546 | } | ||
12547 | |||
12548 | // get some more contacts to sort ??? | ||
12549 | int physcount = 4 * count; | ||
12550 | if (physcount > 20) | ||
12551 | physcount = 20; | ||
12552 | |||
12553 | object physresults; | ||
12554 | physresults = World.RayCastFiltered(rayStart, direction, dist, physcount, rayfilter); | ||
12555 | |||
12556 | if (physresults == null) | ||
12557 | { | ||
12558 | list.Add(new LSL_Integer(-3)); // timeout error | ||
12559 | return list; | ||
12560 | } | ||
12561 | |||
12562 | results = (List<ContactResult>)physresults; | ||
12563 | |||
12564 | // for now physics doesn't detect sitted avatars so do it outside physics | ||
12565 | if (checkAgents) | ||
12566 | { | ||
12567 | ContactResult[] agentHits = AvatarIntersection(rayStart, rayEnd); | ||
12568 | foreach (ContactResult r in agentHits) | ||
12569 | results.Add(r); | ||
12570 | } | ||
12571 | |||
12572 | // TODO: Replace this with a better solution. ObjectIntersection can only | ||
12573 | // detect nonphysical phantoms. They are detected by virtue of being | ||
12574 | // nonphysical (e.g. no PhysActor) so will not conflict with detecting | ||
12575 | // physicsl phantoms as done by the physics scene | ||
12576 | // We don't want anything else but phantoms here. | ||
12577 | if (detectPhantom) | ||
12578 | { | ||
12579 | ContactResult[] objectHits = ObjectIntersection(rayStart, rayEnd, false, false, true); | ||
12580 | foreach (ContactResult r in objectHits) | ||
12581 | results.Add(r); | ||
12582 | } | ||
12583 | } | ||
12584 | else | ||
11161 | { | 12585 | { |
11162 | ContactResult[] objectHits = ObjectIntersection(rayStart, rayEnd, checkPhysical, checkNonPhysical, detectPhantom); | 12586 | if (checkTerrain) |
11163 | foreach (ContactResult r in objectHits) | 12587 | { |
11164 | results.Add(r); | 12588 | ContactResult? groundContact = GroundIntersection(rayStart, rayEnd); |
12589 | if (groundContact != null) | ||
12590 | results.Add((ContactResult)groundContact); | ||
12591 | } | ||
12592 | |||
12593 | if (checkAgents) | ||
12594 | { | ||
12595 | ContactResult[] agentHits = AvatarIntersection(rayStart, rayEnd); | ||
12596 | foreach (ContactResult r in agentHits) | ||
12597 | results.Add(r); | ||
12598 | } | ||
12599 | |||
12600 | if (checkPhysical || checkNonPhysical || detectPhantom) | ||
12601 | { | ||
12602 | ContactResult[] objectHits = ObjectIntersection(rayStart, rayEnd, checkPhysical, checkNonPhysical, detectPhantom); | ||
12603 | foreach (ContactResult r in objectHits) | ||
12604 | results.Add(r); | ||
12605 | } | ||
11165 | } | 12606 | } |
11166 | 12607 | ||
11167 | results.Sort(delegate(ContactResult a, ContactResult b) | 12608 | results.Sort(delegate(ContactResult a, ContactResult b) |
11168 | { | 12609 | { |
11169 | return a.Depth.CompareTo(b.Depth); | 12610 | return a.Depth.CompareTo(b.Depth); |
11170 | }); | 12611 | }); |
11171 | 12612 | ||
11172 | int values = 0; | 12613 | int values = 0; |
11173 | SceneObjectGroup thisgrp = m_host.ParentGroup; | 12614 | SceneObjectGroup thisgrp = m_host.ParentGroup; |
11174 | 12615 | ||
@@ -11261,7 +12702,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11261 | case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD: | 12702 | case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD: |
11262 | if (!isAccount) return 0; | 12703 | if (!isAccount) return 0; |
11263 | if (estate.HasAccess(id)) return 1; | 12704 | if (estate.HasAccess(id)) return 1; |
11264 | if (estate.IsBanned(id)) | 12705 | if (estate.IsBanned(id, World.GetUserFlags(id))) |
11265 | estate.RemoveBan(id); | 12706 | estate.RemoveBan(id); |
11266 | estate.AddEstateUser(id); | 12707 | estate.AddEstateUser(id); |
11267 | break; | 12708 | break; |
@@ -11280,14 +12721,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11280 | break; | 12721 | break; |
11281 | case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD: | 12722 | case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD: |
11282 | if (!isAccount) return 0; | 12723 | if (!isAccount) return 0; |
11283 | if (estate.IsBanned(id)) return 1; | 12724 | if (estate.IsBanned(id, World.GetUserFlags(id))) return 1; |
11284 | EstateBan ban = new EstateBan(); | 12725 | EstateBan ban = new EstateBan(); |
11285 | ban.EstateID = estate.EstateID; | 12726 | ban.EstateID = estate.EstateID; |
11286 | ban.BannedUserID = id; | 12727 | ban.BannedUserID = id; |
11287 | estate.AddBan(ban); | 12728 | estate.AddBan(ban); |
11288 | break; | 12729 | break; |
11289 | case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE: | 12730 | case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE: |
11290 | if (!isAccount || !estate.IsBanned(id)) return 0; | 12731 | if (!isAccount || !estate.IsBanned(id, World.GetUserFlags(id))) return 0; |
11291 | estate.RemoveBan(id); | 12732 | estate.RemoveBan(id); |
11292 | break; | 12733 | break; |
11293 | default: return 0; | 12734 | default: return 0; |
@@ -11316,7 +12757,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11316 | return 16384; | 12757 | return 16384; |
11317 | } | 12758 | } |
11318 | 12759 | ||
11319 | public LSL_Integer llGetUsedMemory() | 12760 | public virtual LSL_Integer llGetUsedMemory() |
11320 | { | 12761 | { |
11321 | m_host.AddScriptLPS(1); | 12762 | m_host.AddScriptLPS(1); |
11322 | // The value returned for LSO scripts in SL | 12763 | // The value returned for LSO scripts in SL |
@@ -11344,7 +12785,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11344 | public void llSetSoundQueueing(int queue) | 12785 | public void llSetSoundQueueing(int queue) |
11345 | { | 12786 | { |
11346 | m_host.AddScriptLPS(1); | 12787 | m_host.AddScriptLPS(1); |
11347 | NotImplemented("llSetSoundQueueing"); | ||
11348 | } | 12788 | } |
11349 | 12789 | ||
11350 | public void llCollisionSprite(string impact_sprite) | 12790 | public void llCollisionSprite(string impact_sprite) |
@@ -11356,10 +12796,270 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11356 | public void llGodLikeRezObject(string inventory, LSL_Vector pos) | 12796 | public void llGodLikeRezObject(string inventory, LSL_Vector pos) |
11357 | { | 12797 | { |
11358 | m_host.AddScriptLPS(1); | 12798 | m_host.AddScriptLPS(1); |
11359 | NotImplemented("llGodLikeRezObject"); | 12799 | |
12800 | if (!World.Permissions.IsGod(m_host.OwnerID)) | ||
12801 | NotImplemented("llGodLikeRezObject"); | ||
12802 | |||
12803 | AssetBase rezAsset = World.AssetService.Get(inventory); | ||
12804 | if (rezAsset == null) | ||
12805 | { | ||
12806 | llSay(0, "Asset not found"); | ||
12807 | return; | ||
12808 | } | ||
12809 | |||
12810 | SceneObjectGroup group = null; | ||
12811 | |||
12812 | try | ||
12813 | { | ||
12814 | string xmlData = Utils.BytesToString(rezAsset.Data); | ||
12815 | group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); | ||
12816 | } | ||
12817 | catch | ||
12818 | { | ||
12819 | llSay(0, "Asset not found"); | ||
12820 | return; | ||
12821 | } | ||
12822 | |||
12823 | if (group == null) | ||
12824 | { | ||
12825 | llSay(0, "Asset not found"); | ||
12826 | return; | ||
12827 | } | ||
12828 | |||
12829 | group.RootPart.AttachPoint = group.RootPart.Shape.State; | ||
12830 | group.RootPart.AttachOffset = group.AbsolutePosition; | ||
12831 | |||
12832 | group.ResetIDs(); | ||
12833 | |||
12834 | Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z); | ||
12835 | World.AddNewSceneObject(group, true, llpos, Quaternion.Identity, Vector3.Zero); | ||
12836 | group.CreateScriptInstances(0, true, World.DefaultScriptEngine, 3); | ||
12837 | group.ScheduleGroupForFullUpdate(); | ||
12838 | |||
12839 | // objects rezzed with this method are die_at_edge by default. | ||
12840 | group.RootPart.SetDieAtEdge(true); | ||
12841 | |||
12842 | group.ResumeScripts(); | ||
12843 | |||
12844 | m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams( | ||
12845 | "object_rez", new Object[] { | ||
12846 | new LSL_String( | ||
12847 | group.RootPart.UUID.ToString()) }, | ||
12848 | new DetectParams[0])); | ||
12849 | } | ||
12850 | |||
12851 | public LSL_String llTransferLindenDollars(string destination, int amount) | ||
12852 | { | ||
12853 | UUID txn = UUID.Random(); | ||
12854 | |||
12855 | Util.FireAndForget(delegate(object x) | ||
12856 | { | ||
12857 | int replycode = 0; | ||
12858 | string replydata = destination + "," + amount.ToString(); | ||
12859 | |||
12860 | try | ||
12861 | { | ||
12862 | TaskInventoryItem item = m_item; | ||
12863 | if (item == null) | ||
12864 | { | ||
12865 | replydata = "SERVICE_ERROR"; | ||
12866 | return; | ||
12867 | } | ||
12868 | |||
12869 | m_host.AddScriptLPS(1); | ||
12870 | |||
12871 | if (item.PermsGranter == UUID.Zero) | ||
12872 | { | ||
12873 | replydata = "MISSING_PERMISSION_DEBIT"; | ||
12874 | return; | ||
12875 | } | ||
12876 | |||
12877 | if ((item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0) | ||
12878 | { | ||
12879 | replydata = "MISSING_PERMISSION_DEBIT"; | ||
12880 | return; | ||
12881 | } | ||
12882 | |||
12883 | UUID toID = new UUID(); | ||
12884 | |||
12885 | if (!UUID.TryParse(destination, out toID)) | ||
12886 | { | ||
12887 | replydata = "INVALID_AGENT"; | ||
12888 | return; | ||
12889 | } | ||
12890 | |||
12891 | IMoneyModule money = World.RequestModuleInterface<IMoneyModule>(); | ||
12892 | |||
12893 | if (money == null) | ||
12894 | { | ||
12895 | replydata = "TRANSFERS_DISABLED"; | ||
12896 | return; | ||
12897 | } | ||
12898 | |||
12899 | bool result = money.ObjectGiveMoney( | ||
12900 | m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); | ||
12901 | |||
12902 | if (result) | ||
12903 | { | ||
12904 | replycode = 1; | ||
12905 | return; | ||
12906 | } | ||
12907 | |||
12908 | replydata = "LINDENDOLLAR_INSUFFICIENTFUNDS"; | ||
12909 | } | ||
12910 | finally | ||
12911 | { | ||
12912 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( | ||
12913 | "transaction_result", new Object[] { | ||
12914 | new LSL_String(txn.ToString()), | ||
12915 | new LSL_Integer(replycode), | ||
12916 | new LSL_String(replydata) }, | ||
12917 | new DetectParams[0])); | ||
12918 | } | ||
12919 | }); | ||
12920 | |||
12921 | return txn.ToString(); | ||
11360 | } | 12922 | } |
11361 | 12923 | ||
11362 | #endregion | 12924 | #endregion |
12925 | |||
12926 | public void llSetKeyframedMotion(LSL_List frames, LSL_List options) | ||
12927 | { | ||
12928 | SceneObjectGroup group = m_host.ParentGroup; | ||
12929 | |||
12930 | if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical) | ||
12931 | return; | ||
12932 | if (group.IsAttachment) | ||
12933 | return; | ||
12934 | |||
12935 | if (frames.Data.Length > 0) // We are getting a new motion | ||
12936 | { | ||
12937 | if (group.RootPart.KeyframeMotion != null) | ||
12938 | group.RootPart.KeyframeMotion.Stop(); | ||
12939 | group.RootPart.KeyframeMotion = null; | ||
12940 | |||
12941 | int idx = 0; | ||
12942 | |||
12943 | KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward; | ||
12944 | KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation; | ||
12945 | |||
12946 | while (idx < options.Data.Length) | ||
12947 | { | ||
12948 | int option = (int)options.GetLSLIntegerItem(idx++); | ||
12949 | int remain = options.Data.Length - idx; | ||
12950 | |||
12951 | switch (option) | ||
12952 | { | ||
12953 | case ScriptBaseClass.KFM_MODE: | ||
12954 | if (remain < 1) | ||
12955 | break; | ||
12956 | int modeval = (int)options.GetLSLIntegerItem(idx++); | ||
12957 | switch(modeval) | ||
12958 | { | ||
12959 | case ScriptBaseClass.KFM_FORWARD: | ||
12960 | mode = KeyframeMotion.PlayMode.Forward; | ||
12961 | break; | ||
12962 | case ScriptBaseClass.KFM_REVERSE: | ||
12963 | mode = KeyframeMotion.PlayMode.Reverse; | ||
12964 | break; | ||
12965 | case ScriptBaseClass.KFM_LOOP: | ||
12966 | mode = KeyframeMotion.PlayMode.Loop; | ||
12967 | break; | ||
12968 | case ScriptBaseClass.KFM_PING_PONG: | ||
12969 | mode = KeyframeMotion.PlayMode.PingPong; | ||
12970 | break; | ||
12971 | } | ||
12972 | break; | ||
12973 | case ScriptBaseClass.KFM_DATA: | ||
12974 | if (remain < 1) | ||
12975 | break; | ||
12976 | int dataval = (int)options.GetLSLIntegerItem(idx++); | ||
12977 | data = (KeyframeMotion.DataFormat)dataval; | ||
12978 | break; | ||
12979 | } | ||
12980 | } | ||
12981 | |||
12982 | group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data); | ||
12983 | |||
12984 | idx = 0; | ||
12985 | |||
12986 | int elemLength = 2; | ||
12987 | if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation)) | ||
12988 | elemLength = 3; | ||
12989 | |||
12990 | List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>(); | ||
12991 | while (idx < frames.Data.Length) | ||
12992 | { | ||
12993 | int remain = frames.Data.Length - idx; | ||
12994 | |||
12995 | if (remain < elemLength) | ||
12996 | break; | ||
12997 | |||
12998 | KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe(); | ||
12999 | frame.Position = null; | ||
13000 | frame.Rotation = null; | ||
13001 | |||
13002 | if ((data & KeyframeMotion.DataFormat.Translation) != 0) | ||
13003 | { | ||
13004 | LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++); | ||
13005 | frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z); | ||
13006 | } | ||
13007 | if ((data & KeyframeMotion.DataFormat.Rotation) != 0) | ||
13008 | { | ||
13009 | LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++); | ||
13010 | frame.Rotation = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s); | ||
13011 | } | ||
13012 | |||
13013 | float tempf = (float)frames.GetLSLFloatItem(idx++); | ||
13014 | frame.TimeMS = (int)(tempf * 1000.0f); | ||
13015 | |||
13016 | keyframes.Add(frame); | ||
13017 | } | ||
13018 | |||
13019 | group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray()); | ||
13020 | group.RootPart.KeyframeMotion.Start(); | ||
13021 | } | ||
13022 | else | ||
13023 | { | ||
13024 | if (group.RootPart.KeyframeMotion == null) | ||
13025 | return; | ||
13026 | |||
13027 | if (options.Data.Length == 0) | ||
13028 | { | ||
13029 | group.RootPart.KeyframeMotion.Stop(); | ||
13030 | return; | ||
13031 | } | ||
13032 | |||
13033 | int code = (int)options.GetLSLIntegerItem(0); | ||
13034 | |||
13035 | int idx = 0; | ||
13036 | |||
13037 | while (idx < options.Data.Length) | ||
13038 | { | ||
13039 | int option = (int)options.GetLSLIntegerItem(idx++); | ||
13040 | int remain = options.Data.Length - idx; | ||
13041 | |||
13042 | switch (option) | ||
13043 | { | ||
13044 | case ScriptBaseClass.KFM_COMMAND: | ||
13045 | int cmd = (int)options.GetLSLIntegerItem(idx++); | ||
13046 | switch (cmd) | ||
13047 | { | ||
13048 | case ScriptBaseClass.KFM_CMD_PLAY: | ||
13049 | group.RootPart.KeyframeMotion.Start(); | ||
13050 | break; | ||
13051 | case ScriptBaseClass.KFM_CMD_STOP: | ||
13052 | group.RootPart.KeyframeMotion.Stop(); | ||
13053 | break; | ||
13054 | case ScriptBaseClass.KFM_CMD_PAUSE: | ||
13055 | group.RootPart.KeyframeMotion.Pause(); | ||
13056 | break; | ||
13057 | } | ||
13058 | break; | ||
13059 | } | ||
13060 | } | ||
13061 | } | ||
13062 | } | ||
11363 | } | 13063 | } |
11364 | 13064 | ||
11365 | public class NotecardCache | 13065 | public class NotecardCache |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 1e8b51b..04c3184 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -138,6 +138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
138 | internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; | 138 | internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; |
139 | internal float m_ScriptDelayFactor = 1.0f; | 139 | internal float m_ScriptDelayFactor = 1.0f; |
140 | internal float m_ScriptDistanceFactor = 1.0f; | 140 | internal float m_ScriptDistanceFactor = 1.0f; |
141 | internal bool m_debuggerSafe = false; | ||
141 | internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); | 142 | internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); |
142 | 143 | ||
143 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item) | 144 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item) |
@@ -145,6 +146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
145 | m_ScriptEngine = ScriptEngine; | 146 | m_ScriptEngine = ScriptEngine; |
146 | m_host = host; | 147 | m_host = host; |
147 | m_item = item; | 148 | m_item = item; |
149 | m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false); | ||
148 | 150 | ||
149 | if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) | 151 | if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) |
150 | m_OSFunctionsEnabled = true; | 152 | m_OSFunctionsEnabled = true; |
@@ -206,7 +208,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
206 | 208 | ||
207 | internal void OSSLError(string msg) | 209 | internal void OSSLError(string msg) |
208 | { | 210 | { |
209 | throw new Exception("OSSL Runtime Error: " + msg); | 211 | if (m_debuggerSafe) |
212 | { | ||
213 | OSSLShoutError(msg); | ||
214 | } | ||
215 | else | ||
216 | { | ||
217 | throw new Exception("OSSL Runtime Error: " + msg); | ||
218 | } | ||
210 | } | 219 | } |
211 | 220 | ||
212 | /// <summary> | 221 | /// <summary> |
@@ -914,18 +923,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
914 | if (target != null) | 923 | if (target != null) |
915 | { | 924 | { |
916 | UUID animID=UUID.Zero; | 925 | UUID animID=UUID.Zero; |
917 | lock (m_host.TaskInventory) | 926 | m_host.TaskInventory.LockItemsForRead(true); |
927 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | ||
918 | { | 928 | { |
919 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | 929 | if (inv.Value.Name == animation) |
920 | { | 930 | { |
921 | if (inv.Value.Name == animation) | 931 | if (inv.Value.Type == (int)AssetType.Animation) |
922 | { | 932 | animID = inv.Value.AssetID; |
923 | if (inv.Value.Type == (int)AssetType.Animation) | 933 | continue; |
924 | animID = inv.Value.AssetID; | ||
925 | continue; | ||
926 | } | ||
927 | } | 934 | } |
928 | } | 935 | } |
936 | m_host.TaskInventory.LockItemsForRead(false); | ||
929 | if (animID == UUID.Zero) | 937 | if (animID == UUID.Zero) |
930 | target.Animator.AddAnimation(animation, m_host.UUID); | 938 | target.Animator.AddAnimation(animation, m_host.UUID); |
931 | else | 939 | else |
@@ -966,6 +974,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
966 | else | 974 | else |
967 | animID = UUID.Zero; | 975 | animID = UUID.Zero; |
968 | } | 976 | } |
977 | m_host.TaskInventory.LockItemsForRead(false); | ||
969 | 978 | ||
970 | if (animID == UUID.Zero) | 979 | if (animID == UUID.Zero) |
971 | target.Animator.RemoveAnimation(animation); | 980 | target.Animator.RemoveAnimation(animation); |
@@ -1799,6 +1808,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1799 | 1808 | ||
1800 | if (!UUID.TryParse(notecardNameOrUuid, out assetID)) | 1809 | if (!UUID.TryParse(notecardNameOrUuid, out assetID)) |
1801 | { | 1810 | { |
1811 | m_host.TaskInventory.LockItemsForRead(true); | ||
1802 | foreach (TaskInventoryItem item in m_host.TaskInventory.Values) | 1812 | foreach (TaskInventoryItem item in m_host.TaskInventory.Values) |
1803 | { | 1813 | { |
1804 | if (item.Type == 7 && item.Name == notecardNameOrUuid) | 1814 | if (item.Type == 7 && item.Name == notecardNameOrUuid) |
@@ -1806,6 +1816,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1806 | assetID = item.AssetID; | 1816 | assetID = item.AssetID; |
1807 | } | 1817 | } |
1808 | } | 1818 | } |
1819 | m_host.TaskInventory.LockItemsForRead(false); | ||
1809 | } | 1820 | } |
1810 | 1821 | ||
1811 | if (assetID == UUID.Zero) | 1822 | if (assetID == UUID.Zero) |
@@ -2277,7 +2288,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2277 | CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); | 2288 | CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); |
2278 | m_host.AddScriptLPS(1); | 2289 | m_host.AddScriptLPS(1); |
2279 | 2290 | ||
2280 | return NpcCreate(firstname, lastname, position, notecard, false, false); | 2291 | return NpcCreate(firstname, lastname, position, notecard, true, false); |
2281 | } | 2292 | } |
2282 | 2293 | ||
2283 | public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) | 2294 | public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) |
@@ -2288,24 +2299,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2288 | return NpcCreate( | 2299 | return NpcCreate( |
2289 | firstname, lastname, position, notecard, | 2300 | firstname, lastname, position, notecard, |
2290 | (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, | 2301 | (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, |
2291 | (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0); | 2302 | false); |
2303 | // (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0); | ||
2292 | } | 2304 | } |
2293 | 2305 | ||
2294 | private LSL_Key NpcCreate( | 2306 | private LSL_Key NpcCreate( |
2295 | string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent) | 2307 | string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent) |
2296 | { | 2308 | { |
2309 | if (!owned) | ||
2310 | OSSLError("Unowned NPCs are unsupported"); | ||
2311 | |||
2312 | string groupTitle = String.Empty; | ||
2313 | |||
2314 | if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z))) | ||
2315 | return new LSL_Key(UUID.Zero.ToString()); | ||
2316 | |||
2317 | if (firstname != String.Empty || lastname != String.Empty) | ||
2318 | { | ||
2319 | if (firstname != "Shown outfit:") | ||
2320 | groupTitle = "- NPC -"; | ||
2321 | } | ||
2322 | |||
2297 | INPCModule module = World.RequestModuleInterface<INPCModule>(); | 2323 | INPCModule module = World.RequestModuleInterface<INPCModule>(); |
2298 | if (module != null) | 2324 | if (module != null) |
2299 | { | 2325 | { |
2300 | AvatarAppearance appearance = null; | 2326 | AvatarAppearance appearance = null; |
2301 | 2327 | ||
2302 | UUID id; | 2328 | // UUID id; |
2303 | if (UUID.TryParse(notecard, out id)) | 2329 | // if (UUID.TryParse(notecard, out id)) |
2304 | { | 2330 | // { |
2305 | ScenePresence clonePresence = World.GetScenePresence(id); | 2331 | // ScenePresence clonePresence = World.GetScenePresence(id); |
2306 | if (clonePresence != null) | 2332 | // if (clonePresence != null) |
2307 | appearance = clonePresence.Appearance; | 2333 | // appearance = clonePresence.Appearance; |
2308 | } | 2334 | // } |
2309 | 2335 | ||
2310 | if (appearance == null) | 2336 | if (appearance == null) |
2311 | { | 2337 | { |
@@ -2333,6 +2359,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2333 | World, | 2359 | World, |
2334 | appearance); | 2360 | appearance); |
2335 | 2361 | ||
2362 | ScenePresence sp; | ||
2363 | if (World.TryGetScenePresence(x, out sp)) | ||
2364 | { | ||
2365 | sp.Grouptitle = groupTitle; | ||
2366 | sp.SendAvatarDataToAllAgents(); | ||
2367 | } | ||
2336 | return new LSL_Key(x.ToString()); | 2368 | return new LSL_Key(x.ToString()); |
2337 | } | 2369 | } |
2338 | 2370 | ||
@@ -2632,16 +2664,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2632 | CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); | 2664 | CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); |
2633 | m_host.AddScriptLPS(1); | 2665 | m_host.AddScriptLPS(1); |
2634 | 2666 | ||
2635 | INPCModule module = World.RequestModuleInterface<INPCModule>(); | 2667 | ManualResetEvent ev = new ManualResetEvent(false); |
2636 | if (module != null) | ||
2637 | { | ||
2638 | UUID npcId = new UUID(npc.m_string); | ||
2639 | 2668 | ||
2640 | if (!module.CheckPermissions(npcId, m_host.OwnerID)) | 2669 | Util.FireAndForget(delegate(object x) { |
2641 | return; | 2670 | try |
2671 | { | ||
2672 | INPCModule module = World.RequestModuleInterface<INPCModule>(); | ||
2673 | if (module != null) | ||
2674 | { | ||
2675 | UUID npcId = new UUID(npc.m_string); | ||
2642 | 2676 | ||
2643 | module.DeleteNPC(npcId, World); | 2677 | ILandObject l = World.LandChannel.GetLandObject(m_host.GroupPosition.X, m_host.GroupPosition.Y); |
2644 | } | 2678 | if (l == null || m_host.OwnerID != l.LandData.OwnerID) |
2679 | { | ||
2680 | if (!module.CheckPermissions(npcId, m_host.OwnerID)) | ||
2681 | return; | ||
2682 | } | ||
2683 | |||
2684 | module.DeleteNPC(npcId, World); | ||
2685 | } | ||
2686 | } | ||
2687 | finally | ||
2688 | { | ||
2689 | ev.Set(); | ||
2690 | } | ||
2691 | }); | ||
2692 | ev.WaitOne(); | ||
2645 | } | 2693 | } |
2646 | 2694 | ||
2647 | public void osNpcPlayAnimation(LSL_Key npc, string animation) | 2695 | public void osNpcPlayAnimation(LSL_Key npc, string animation) |
@@ -3334,4 +3382,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3334 | return new LSL_Key(m_host.ParentGroup.FromPartID.ToString()); | 3382 | return new LSL_Key(m_host.ParentGroup.FromPartID.ToString()); |
3335 | } | 3383 | } |
3336 | } | 3384 | } |
3337 | } \ No newline at end of file | 3385 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 24cceea..4dd795d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -70,7 +70,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
70 | private const int AGENT = 1; | 70 | private const int AGENT = 1; |
71 | private const int AGENT_BY_USERNAME = 0x10; | 71 | private const int AGENT_BY_USERNAME = 0x10; |
72 | private const int NPC = 0x20; | 72 | private const int NPC = 0x20; |
73 | private const int OS_NPC = 0x01000000; | ||
74 | private const int ACTIVE = 2; | 73 | private const int ACTIVE = 2; |
75 | private const int PASSIVE = 4; | 74 | private const int PASSIVE = 4; |
76 | private const int SCRIPTED = 8; | 75 | private const int SCRIPTED = 8; |
@@ -235,7 +234,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
235 | List<SensedEntity> sensedEntities = new List<SensedEntity>(); | 234 | List<SensedEntity> sensedEntities = new List<SensedEntity>(); |
236 | 235 | ||
237 | // Is the sensor type is AGENT and not SCRIPTED then include agents | 236 | // Is the sensor type is AGENT and not SCRIPTED then include agents |
238 | if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC | OS_NPC)) != 0 && (ts.type & SCRIPTED) == 0) | 237 | if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0) |
239 | { | 238 | { |
240 | sensedEntities.AddRange(doAgentSensor(ts)); | 239 | sensedEntities.AddRange(doAgentSensor(ts)); |
241 | } | 240 | } |
@@ -334,7 +333,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
334 | float dy; | 333 | float dy; |
335 | float dz; | 334 | float dz; |
336 | 335 | ||
337 | Quaternion q = SensePoint.GetWorldRotation(); | 336 | // Quaternion q = SensePoint.RotationOffset; |
337 | Quaternion q = SensePoint.GetWorldRotation(); // non-attached prim Sensor *always* uses World rotation! | ||
338 | if (SensePoint.ParentGroup.IsAttachment) | 338 | if (SensePoint.ParentGroup.IsAttachment) |
339 | { | 339 | { |
340 | // In attachments, rotate the sensor cone with the | 340 | // In attachments, rotate the sensor cone with the |
@@ -348,7 +348,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
348 | // Position of a sensor in a child prim attached to an avatar | 348 | // Position of a sensor in a child prim attached to an avatar |
349 | // will be still wrong. | 349 | // will be still wrong. |
350 | ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); | 350 | ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); |
351 | q = avatar.Rotation * q; | 351 | fromRegionPos = avatar.AbsolutePosition; |
352 | q = avatar.Rotation; | ||
352 | } | 353 | } |
353 | 354 | ||
354 | LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); | 355 | LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); |
@@ -475,7 +476,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
475 | // Position of a sensor in a child prim attached to an avatar | 476 | // Position of a sensor in a child prim attached to an avatar |
476 | // will be still wrong. | 477 | // will be still wrong. |
477 | ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); | 478 | ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); |
478 | q = avatar.Rotation * q; | 479 | if (avatar == null) |
480 | return sensedEntities; | ||
481 | fromRegionPos = avatar.AbsolutePosition; | ||
482 | q = avatar.Rotation; | ||
479 | } | 483 | } |
480 | 484 | ||
481 | LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); | 485 | LSL_Types.Quaternion r = new LSL_Types.Quaternion(q); |
@@ -491,7 +495,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
491 | // "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}", | 495 | // "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}", |
492 | // presence.Name, presence.PresenceType, ts.name, ts.type); | 496 | // presence.Name, presence.PresenceType, ts.name, ts.type); |
493 | 497 | ||
494 | if ((ts.type & NPC) == 0 && (ts.type & OS_NPC) == 0 && presence.PresenceType == PresenceType.Npc) | 498 | if ((ts.type & NPC) == 0 && presence.PresenceType == PresenceType.Npc) |
495 | { | 499 | { |
496 | INPC npcData = m_npcModule.GetNPC(presence.UUID, presence.Scene); | 500 | INPC npcData = m_npcModule.GetNPC(presence.UUID, presence.Scene); |
497 | if (npcData == null || !npcData.SenseAsAgent) | 501 | if (npcData == null || !npcData.SenseAsAgent) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs index bc63030..9ee6946 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs | |||
@@ -118,25 +118,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
118 | if (Timers.Count == 0) | 118 | if (Timers.Count == 0) |
119 | return; | 119 | return; |
120 | 120 | ||
121 | Dictionary<string, TimerClass>.ValueCollection tvals; | ||
121 | lock (TimerListLock) | 122 | lock (TimerListLock) |
122 | { | 123 | { |
123 | // Go through all timers | 124 | // Go through all timers |
124 | Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values; | 125 | tvals = Timers.Values; |
125 | foreach (TimerClass ts in tvals) | 126 | } |
127 | |||
128 | foreach (TimerClass ts in tvals) | ||
129 | { | ||
130 | // Time has passed? | ||
131 | if (ts.next < DateTime.Now.Ticks) | ||
126 | { | 132 | { |
127 | // Time has passed? | 133 | //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); |
128 | if (ts.next < DateTime.Now.Ticks) | 134 | // Add it to queue |
129 | { | 135 | m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, |
130 | //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); | 136 | new EventParams("timer", new Object[0], |
131 | // Add it to queue | 137 | new DetectParams[0])); |
132 | m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, | 138 | // set next interval |
133 | new EventParams("timer", new Object[0], | 139 | |
134 | new DetectParams[0])); | 140 | //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval); |
135 | // set next interval | 141 | ts.next = DateTime.Now.Ticks + ts.interval; |
136 | |||
137 | //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval); | ||
138 | ts.next = DateTime.Now.Ticks + ts.interval; | ||
139 | } | ||
140 | } | 142 | } |
141 | } | 143 | } |
142 | } | 144 | } |
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 | |||
28 | using System.Collections; | ||
29 | using OpenSim.Region.ScriptEngine.Interfaces; | ||
30 | |||
31 | using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
32 | using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | ||
33 | using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | ||
34 | using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; | ||
35 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
36 | using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
37 | using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; | ||
38 | |||
39 | namespace 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 3fb463b..af35258 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,12 @@ 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 | LSL_Integer llGiveMoney(string destination, int amount); | 211 | LSL_Integer llGiveMoney(string destination, int amount); |
212 | LSL_String llTransferLindenDollars(string destination, int amount); | ||
211 | void llGodLikeRezObject(string inventory, LSL_Vector pos); | 213 | void llGodLikeRezObject(string inventory, LSL_Vector pos); |
212 | LSL_Float llGround(LSL_Vector offset); | 214 | LSL_Float llGround(LSL_Vector offset); |
213 | LSL_Vector llGroundContour(LSL_Vector offset); | 215 | LSL_Vector llGroundContour(LSL_Vector offset); |
@@ -330,6 +332,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
330 | void llSensorRemove(); | 332 | void llSensorRemove(); |
331 | void llSensorRepeat(string name, string id, int type, double range, double arc, double rate); | 333 | void llSensorRepeat(string name, string id, int type, double range, double arc, double rate); |
332 | void llSetAlpha(double alpha, int face); | 334 | void llSetAlpha(double alpha, int face); |
335 | void llSetAngularVelocity(LSL_Vector angvelocity, int local); | ||
333 | void llSetBuoyancy(double buoyancy); | 336 | void llSetBuoyancy(double buoyancy); |
334 | void llSetCameraAtOffset(LSL_Vector offset); | 337 | void llSetCameraAtOffset(LSL_Vector offset); |
335 | void llSetCameraEyeOffset(LSL_Vector offset); | 338 | void llSetCameraEyeOffset(LSL_Vector offset); |
@@ -355,11 +358,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
355 | void llSetParcelMusicURL(string url); | 358 | void llSetParcelMusicURL(string url); |
356 | void llSetPayPrice(int price, LSL_List quick_pay_buttons); | 359 | void llSetPayPrice(int price, LSL_List quick_pay_buttons); |
357 | void llSetPos(LSL_Vector pos); | 360 | void llSetPos(LSL_Vector pos); |
361 | LSL_Integer llSetRegionPos(LSL_Vector pos); | ||
358 | LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules); | 362 | LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules); |
359 | void llSetPrimitiveParams(LSL_List rules); | 363 | void llSetPrimitiveParams(LSL_List rules); |
360 | void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules); | 364 | void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules); |
361 | void llSetPrimURL(string url); | 365 | void llSetPrimURL(string url); |
362 | LSL_Integer llSetRegionPos(LSL_Vector pos); | ||
363 | void llSetRemoteScriptAccessPin(int pin); | 366 | void llSetRemoteScriptAccessPin(int pin); |
364 | void llSetRot(LSL_Rotation rot); | 367 | void llSetRot(LSL_Rotation rot); |
365 | void llSetScale(LSL_Vector scale); | 368 | void llSetScale(LSL_Vector scale); |
@@ -379,6 +382,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
379 | void llSetVehicleRotationParam(int param, LSL_Rotation rot); | 382 | void llSetVehicleRotationParam(int param, LSL_Rotation rot); |
380 | void llSetVehicleType(int type); | 383 | void llSetVehicleType(int type); |
381 | void llSetVehicleVectorParam(int param, LSL_Vector vec); | 384 | void llSetVehicleVectorParam(int param, LSL_Vector vec); |
385 | void llSetVelocity(LSL_Vector velocity, int local); | ||
382 | void llShout(int channelID, string text); | 386 | void llShout(int channelID, string text); |
383 | LSL_Float llSin(double f); | 387 | LSL_Float llSin(double f); |
384 | void llSitTarget(LSL_Vector offset, LSL_Rotation rot); | 388 | void llSitTarget(LSL_Vector offset, LSL_Rotation rot); |
@@ -422,9 +426,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
422 | LSL_Vector llWind(LSL_Vector offset); | 426 | LSL_Vector llWind(LSL_Vector offset); |
423 | LSL_String llXorBase64Strings(string str1, string str2); | 427 | LSL_String llXorBase64Strings(string str1, string str2); |
424 | LSL_String llXorBase64StringsCorrect(string str1, string str2); | 428 | LSL_String llXorBase64StringsCorrect(string str1, string str2); |
425 | void print(string str); | 429 | LSL_Integer llGetLinkNumberOfSides(LSL_Integer link); |
430 | void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density); | ||
426 | 431 | ||
427 | void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); | 432 | void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); |
428 | LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); | 433 | LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); |
434 | void llSetKeyframedMotion(LSL_List frames, LSL_List options); | ||
429 | } | 435 | } |
430 | } | 436 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 1f000a3..8c34ed3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
85 | // Avatar Info Commands | 85 | // Avatar Info Commands |
86 | string osGetAgentIP(string agent); | 86 | string osGetAgentIP(string agent); |
87 | LSL_List osGetAgents(); | 87 | LSL_List osGetAgents(); |
88 | 88 | ||
89 | // Teleport commands | 89 | // Teleport commands |
90 | void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 90 | void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
91 | void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 91 | void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs new file mode 100644 index 0000000..4132dfa --- /dev/null +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs | |||
@@ -0,0 +1,71 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Runtime.Remoting.Lifetime; | ||
30 | using System.Threading; | ||
31 | using System.Reflection; | ||
32 | using System.Collections; | ||
33 | using System.Collections.Generic; | ||
34 | using OpenSim.Framework; | ||
35 | using OpenSim.Region.Framework.Interfaces; | ||
36 | using OpenSim.Region.ScriptEngine.Interfaces; | ||
37 | using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; | ||
38 | using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
39 | using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | ||
40 | using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | ||
41 | using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
42 | using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; | ||
43 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
44 | using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; | ||
45 | using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
46 | |||
47 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using System.Runtime.Remoting.Lifetime; | 32 | using System.Runtime.Remoting.Lifetime; |
32 | using OpenSim.Region.ScriptEngine.Shared; | 33 | using 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 cad8518..05ba222 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; |
@@ -95,6 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
95 | public const int AGENT_CROUCHING = 1024; | 94 | public const int AGENT_CROUCHING = 1024; |
96 | public const int AGENT_BUSY = 2048; | 95 | public const int AGENT_BUSY = 2048; |
97 | public const int AGENT_ALWAYS_RUN = 4096; | 96 | public const int AGENT_ALWAYS_RUN = 4096; |
97 | public const int AGENT_MALE = 8192; | ||
98 | 98 | ||
99 | //Particle Systems | 99 | //Particle Systems |
100 | public const int PSYS_PART_INTERP_COLOR_MASK = 1; | 100 | public const int PSYS_PART_INTERP_COLOR_MASK = 1; |
@@ -285,6 +285,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
285 | public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART | 285 | public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART |
286 | public const int CHANGED_MEDIA = 2048; | 286 | public const int CHANGED_MEDIA = 2048; |
287 | public const int CHANGED_ANIMATION = 16384; | 287 | public const int CHANGED_ANIMATION = 16384; |
288 | public const int CHANGED_POSITION = 32768; | ||
288 | public const int TYPE_INVALID = 0; | 289 | public const int TYPE_INVALID = 0; |
289 | public const int TYPE_INTEGER = 1; | 290 | public const int TYPE_INTEGER = 1; |
290 | public const int TYPE_FLOAT = 2; | 291 | public const int TYPE_FLOAT = 2; |
@@ -590,6 +591,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
590 | public const int PRIM_MEDIA_PERM_OWNER = 1; | 591 | public const int PRIM_MEDIA_PERM_OWNER = 1; |
591 | public const int PRIM_MEDIA_PERM_GROUP = 2; | 592 | public const int PRIM_MEDIA_PERM_GROUP = 2; |
592 | public const int PRIM_MEDIA_PERM_ANYONE = 4; | 593 | public const int PRIM_MEDIA_PERM_ANYONE = 4; |
594 | |||
595 | public const int PRIM_PHYSICS_SHAPE_TYPE = 30; | ||
596 | public const int PRIM_PHYSICS_SHAPE_PRIM = 0; | ||
597 | public const int PRIM_PHYSICS_SHAPE_CONVEX = 2; | ||
598 | public const int PRIM_PHYSICS_SHAPE_NONE = 1; | ||
599 | |||
600 | public const int PRIM_PHYSICS_MATERIAL = 31; | ||
601 | public const int DENSITY = 1; | ||
602 | public const int FRICTION = 2; | ||
603 | public const int RESTITUTION = 4; | ||
604 | public const int GRAVITY_MULTIPLIER = 8; | ||
593 | 605 | ||
594 | // extra constants for llSetPrimMediaParams | 606 | // extra constants for llSetPrimMediaParams |
595 | public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); | 607 | public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); |
@@ -662,6 +674,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
662 | 674 | ||
663 | public static readonly LSLInteger RCERR_UNKNOWN = -1; | 675 | public static readonly LSLInteger RCERR_UNKNOWN = -1; |
664 | public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; | 676 | public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; |
665 | public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3; | 677 | public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = -3; |
678 | |||
679 | public const int KFM_MODE = 1; | ||
680 | public const int KFM_LOOP = 1; | ||
681 | public const int KFM_REVERSE = 3; | ||
682 | public const int KFM_FORWARD = 0; | ||
683 | public const int KFM_PING_PONG = 2; | ||
684 | public const int KFM_DATA = 2; | ||
685 | public const int KFM_TRANSLATION = 2; | ||
686 | public const int KFM_ROTATION = 1; | ||
687 | public const int KFM_COMMAND = 0; | ||
688 | public const int KFM_CMD_PLAY = 0; | ||
689 | public const int KFM_CMD_STOP = 1; | ||
690 | public const int KFM_CMD_PAUSE = 2; | ||
666 | } | 691 | } |
667 | } | 692 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index c457880..89b6eff 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
29 | using System.Runtime.Remoting.Lifetime; | 30 | using System.Runtime.Remoting.Lifetime; |
30 | using System.Threading; | 31 | using System.Threading; |
31 | using System.Reflection; | 32 | using 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(); |
@@ -579,6 +586,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
579 | return m_LSL_Functions.llGetMass(); | 586 | return m_LSL_Functions.llGetMass(); |
580 | } | 587 | } |
581 | 588 | ||
589 | public LSL_Float llGetMassMKS() | ||
590 | { | ||
591 | return m_LSL_Functions.llGetMassMKS(); | ||
592 | } | ||
593 | |||
582 | public LSL_Integer llGetMemoryLimit() | 594 | public LSL_Integer llGetMemoryLimit() |
583 | { | 595 | { |
584 | return m_LSL_Functions.llGetMemoryLimit(); | 596 | return m_LSL_Functions.llGetMemoryLimit(); |
@@ -844,11 +856,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
844 | return m_LSL_Functions.llGetUnixTime(); | 856 | return m_LSL_Functions.llGetUnixTime(); |
845 | } | 857 | } |
846 | 858 | ||
847 | public LSL_Integer llGetUsedMemory() | ||
848 | { | ||
849 | return m_LSL_Functions.llGetUsedMemory(); | ||
850 | } | ||
851 | |||
852 | public LSL_Vector llGetVel() | 859 | public LSL_Vector llGetVel() |
853 | { | 860 | { |
854 | return m_LSL_Functions.llGetVel(); | 861 | return m_LSL_Functions.llGetVel(); |
@@ -874,6 +881,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
874 | return m_LSL_Functions.llGiveMoney(destination, amount); | 881 | return m_LSL_Functions.llGiveMoney(destination, amount); |
875 | } | 882 | } |
876 | 883 | ||
884 | public LSL_String llTransferLindenDollars(string destination, int amount) | ||
885 | { | ||
886 | return m_LSL_Functions.llTransferLindenDollars(destination, amount); | ||
887 | } | ||
888 | |||
877 | public void llGodLikeRezObject(string inventory, LSL_Vector pos) | 889 | public void llGodLikeRezObject(string inventory, LSL_Vector pos) |
878 | { | 890 | { |
879 | m_LSL_Functions.llGodLikeRezObject(inventory, pos); | 891 | m_LSL_Functions.llGodLikeRezObject(inventory, pos); |
@@ -1483,6 +1495,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1483 | m_LSL_Functions.llSetAlpha(alpha, face); | 1495 | m_LSL_Functions.llSetAlpha(alpha, face); |
1484 | } | 1496 | } |
1485 | 1497 | ||
1498 | public void llSetAngularVelocity(LSL_Vector angvelocity, int local) | ||
1499 | { | ||
1500 | m_LSL_Functions.llSetAngularVelocity(angvelocity, local); | ||
1501 | } | ||
1502 | |||
1486 | public void llSetBuoyancy(double buoyancy) | 1503 | public void llSetBuoyancy(double buoyancy) |
1487 | { | 1504 | { |
1488 | m_LSL_Functions.llSetBuoyancy(buoyancy); | 1505 | m_LSL_Functions.llSetBuoyancy(buoyancy); |
@@ -1603,6 +1620,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1603 | m_LSL_Functions.llSetPos(pos); | 1620 | m_LSL_Functions.llSetPos(pos); |
1604 | } | 1621 | } |
1605 | 1622 | ||
1623 | public LSL_Integer llSetRegionPos(LSL_Vector pos) | ||
1624 | { | ||
1625 | return m_LSL_Functions.llSetRegionPos(pos); | ||
1626 | } | ||
1627 | |||
1606 | public void llSetPrimitiveParams(LSL_List rules) | 1628 | public void llSetPrimitiveParams(LSL_List rules) |
1607 | { | 1629 | { |
1608 | m_LSL_Functions.llSetPrimitiveParams(rules); | 1630 | m_LSL_Functions.llSetPrimitiveParams(rules); |
@@ -1618,11 +1640,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1618 | m_LSL_Functions.llSetPrimURL(url); | 1640 | m_LSL_Functions.llSetPrimURL(url); |
1619 | } | 1641 | } |
1620 | 1642 | ||
1621 | public LSL_Integer llSetRegionPos(LSL_Vector pos) | ||
1622 | { | ||
1623 | return m_LSL_Functions.llSetRegionPos(pos); | ||
1624 | } | ||
1625 | |||
1626 | public void llSetRemoteScriptAccessPin(int pin) | 1643 | public void llSetRemoteScriptAccessPin(int pin) |
1627 | { | 1644 | { |
1628 | m_LSL_Functions.llSetRemoteScriptAccessPin(pin); | 1645 | m_LSL_Functions.llSetRemoteScriptAccessPin(pin); |
@@ -1718,6 +1735,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1718 | m_LSL_Functions.llSetVehicleVectorParam(param, vec); | 1735 | m_LSL_Functions.llSetVehicleVectorParam(param, vec); |
1719 | } | 1736 | } |
1720 | 1737 | ||
1738 | public void llSetVelocity(LSL_Vector velocity, int local) | ||
1739 | { | ||
1740 | m_LSL_Functions.llSetVelocity(velocity, local); | ||
1741 | } | ||
1742 | |||
1721 | public void llShout(int channelID, string text) | 1743 | public void llShout(int channelID, string text) |
1722 | { | 1744 | { |
1723 | m_LSL_Functions.llShout(channelID, text); | 1745 | m_LSL_Functions.llShout(channelID, text); |
@@ -1968,9 +1990,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1968 | return m_LSL_Functions.llClearLinkMedia(link, face); | 1990 | return m_LSL_Functions.llClearLinkMedia(link, face); |
1969 | } | 1991 | } |
1970 | 1992 | ||
1971 | public void print(string str) | 1993 | public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link) |
1994 | { | ||
1995 | return m_LSL_Functions.llGetLinkNumberOfSides(link); | ||
1996 | } | ||
1997 | |||
1998 | public void llSetKeyframedMotion(LSL_List frames, LSL_List options) | ||
1999 | { | ||
2000 | m_LSL_Functions.llSetKeyframedMotion(frames, options); | ||
2001 | } | ||
2002 | |||
2003 | public void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density) | ||
1972 | { | 2004 | { |
1973 | m_LSL_Functions.print(str); | 2005 | m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density); |
1974 | } | 2006 | } |
1975 | } | 2007 | } |
1976 | } | 2008 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs index 143b497..2e27f16 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs | |||
@@ -72,9 +72,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
72 | { | 72 | { |
73 | return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); | 73 | return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); |
74 | } | 74 | } |
75 | |||
75 | public void lsClearWindlightScene() | 76 | public void lsClearWindlightScene() |
76 | { | 77 | { |
77 | m_LS_Functions.lsClearWindlightScene(); | 78 | m_LS_Functions.lsClearWindlightScene(); |
78 | } | 79 | } |
80 | |||
81 | public LSL_List cmGetWindlightScene(LSL_List rules) | ||
82 | { | ||
83 | return m_LS_Functions.lsGetWindlightScene(rules); | ||
84 | } | ||
85 | |||
86 | public int cmSetWindlightScene(LSL_List rules) | ||
87 | { | ||
88 | return m_LS_Functions.lsSetWindlightScene(rules); | ||
89 | } | ||
90 | |||
91 | public int cmSetWindlightSceneTargeted(LSL_List rules, key target) | ||
92 | { | ||
93 | return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); | ||
94 | } | ||
95 | |||
96 | public void cmClearWindlightScene() | ||
97 | { | ||
98 | m_LS_Functions.lsClearWindlightScene(); | ||
99 | } | ||
79 | } | 100 | } |
80 | } | 101 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs index edbbc2a..b138da3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs | |||
@@ -33,6 +33,7 @@ using System.Threading; | |||
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using System.Collections; | 34 | using System.Collections; |
35 | using System.Collections.Generic; | 35 | using System.Collections.Generic; |
36 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
36 | using OpenSim.Region.ScriptEngine.Interfaces; | 37 | using OpenSim.Region.ScriptEngine.Interfaces; |
37 | using OpenSim.Region.ScriptEngine.Shared; | 38 | using OpenSim.Region.ScriptEngine.Shared; |
38 | using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; | 39 | using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; |
@@ -90,6 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
90 | return (int)m_Executor.GetStateEventFlags(state); | 91 | return (int)m_Executor.GetStateEventFlags(state); |
91 | } | 92 | } |
92 | 93 | ||
94 | [DebuggerNonUserCode] | ||
93 | public void ExecuteEvent(string state, string FunctionName, object[] args) | 95 | public void ExecuteEvent(string state, string FunctionName, object[] args) |
94 | { | 96 | { |
95 | m_Executor.ExecuteEvent(state, FunctionName, args); | 97 | m_Executor.ExecuteEvent(state, FunctionName, args); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index 5a58f73..22804f5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |||
@@ -35,6 +35,7 @@ using OpenMetaverse; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.CoreModules; | 36 | using OpenSim.Region.CoreModules; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Services.Interfaces; | ||
38 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
39 | 40 | ||
40 | namespace OpenSim.Region.ScriptEngine.Shared | 41 | namespace OpenSim.Region.ScriptEngine.Shared |
@@ -102,6 +103,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
102 | Type = 0; | 103 | Type = 0; |
103 | Velocity = new LSL_Types.Vector3(); | 104 | Velocity = new LSL_Types.Vector3(); |
104 | initializeSurfaceTouch(); | 105 | initializeSurfaceTouch(); |
106 | Country = String.Empty; | ||
105 | } | 107 | } |
106 | 108 | ||
107 | public UUID Key; | 109 | public UUID Key; |
@@ -133,6 +135,8 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
133 | private int touchFace; | 135 | private int touchFace; |
134 | public int TouchFace { get { return touchFace; } } | 136 | public int TouchFace { get { return touchFace; } } |
135 | 137 | ||
138 | public string Country; | ||
139 | |||
136 | // This can be done in two places including the constructor | 140 | // This can be done in two places including the constructor |
137 | // so be carefull what gets added here | 141 | // so be carefull what gets added here |
138 | private void initializeSurfaceTouch() | 142 | private void initializeSurfaceTouch() |
@@ -180,6 +184,10 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
180 | return; | 184 | return; |
181 | 185 | ||
182 | Name = presence.Firstname + " " + presence.Lastname; | 186 | Name = presence.Firstname + " " + presence.Lastname; |
187 | UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, Key); | ||
188 | if (account != null) | ||
189 | Country = account.UserCountry; | ||
190 | |||
183 | Owner = Key; | 191 | Owner = Key; |
184 | Position = new LSL_Types.Vector3(presence.AbsolutePosition); | 192 | Position = new LSL_Types.Vector3(presence.AbsolutePosition); |
185 | Rotation = new LSL_Types.Quaternion( | 193 | Rotation = new LSL_Types.Quaternion( |
@@ -189,22 +197,27 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
189 | presence.Rotation.W); | 197 | presence.Rotation.W); |
190 | Velocity = new LSL_Types.Vector3(presence.Velocity); | 198 | Velocity = new LSL_Types.Vector3(presence.Velocity); |
191 | 199 | ||
192 | if (presence.PresenceType != PresenceType.Npc) | 200 | Type = 0x01; // Avatar |
193 | { | 201 | if (presence.PresenceType == PresenceType.Npc) |
194 | Type = AGENT; | 202 | Type = 0x20; |
195 | } | 203 | |
196 | else | 204 | // Cope Impl. We don't use OS_NPC. |
197 | { | 205 | //if (presence.PresenceType != PresenceType.Npc) |
198 | Type = OS_NPC; | 206 | //{ |
199 | 207 | // Type = AGENT; | |
200 | INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); | 208 | //} |
201 | INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene); | 209 | //else |
202 | 210 | //{ | |
203 | if (npcData.SenseAsAgent) | 211 | // Type = OS_NPC; |
204 | { | 212 | |
205 | Type |= AGENT; | 213 | // INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); |
206 | } | 214 | // INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene); |
207 | } | 215 | |
216 | // if (npcData.SenseAsAgent) | ||
217 | // { | ||
218 | // Type |= AGENT; | ||
219 | // } | ||
220 | //} | ||
208 | 221 | ||
209 | if (presence.Velocity != Vector3.Zero) | 222 | if (presence.Velocity != Vector3.Zero) |
210 | Type |= ACTIVE; | 223 | Type |= ACTIVE; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 5793cc9..771db0c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -30,6 +30,7 @@ using System.Collections; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Globalization; | 31 | using System.Globalization; |
32 | using System.IO; | 32 | using System.IO; |
33 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
33 | using System.Reflection; | 34 | using System.Reflection; |
34 | using System.Runtime.Remoting; | 35 | using System.Runtime.Remoting; |
35 | using System.Runtime.Remoting.Lifetime; | 36 | using System.Runtime.Remoting.Lifetime; |
@@ -219,13 +220,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
219 | 220 | ||
220 | if (part != null) | 221 | if (part != null) |
221 | { | 222 | { |
222 | lock (part.TaskInventory) | 223 | part.TaskInventory.LockItemsForRead(true); |
224 | if (part.TaskInventory.ContainsKey(ItemID)) | ||
223 | { | 225 | { |
224 | if (part.TaskInventory.ContainsKey(ItemID)) | 226 | ScriptTask = part.TaskInventory[ItemID]; |
225 | { | ||
226 | ScriptTask = part.TaskInventory[ItemID]; | ||
227 | } | ||
228 | } | 227 | } |
228 | part.TaskInventory.LockItemsForRead(false); | ||
229 | } | 229 | } |
230 | 230 | ||
231 | ApiManager am = new ApiManager(); | 231 | ApiManager am = new ApiManager(); |
@@ -417,14 +417,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
417 | { | 417 | { |
418 | int permsMask; | 418 | int permsMask; |
419 | UUID permsGranter; | 419 | UUID permsGranter; |
420 | lock (part.TaskInventory) | 420 | part.TaskInventory.LockItemsForRead(true); |
421 | if (!part.TaskInventory.ContainsKey(ItemID)) | ||
421 | { | 422 | { |
422 | if (!part.TaskInventory.ContainsKey(ItemID)) | 423 | part.TaskInventory.LockItemsForRead(false); |
423 | return; | 424 | return; |
424 | |||
425 | permsGranter = part.TaskInventory[ItemID].PermsGranter; | ||
426 | permsMask = part.TaskInventory[ItemID].PermsMask; | ||
427 | } | 425 | } |
426 | permsGranter = part.TaskInventory[ItemID].PermsGranter; | ||
427 | permsMask = part.TaskInventory[ItemID].PermsMask; | ||
428 | part.TaskInventory.LockItemsForRead(false); | ||
428 | 429 | ||
429 | if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) | 430 | if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) |
430 | { | 431 | { |
@@ -552,6 +553,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
552 | return true; | 553 | return true; |
553 | } | 554 | } |
554 | 555 | ||
556 | [DebuggerNonUserCode] //Prevents the debugger from farting in this function | ||
555 | public void SetState(string state) | 557 | public void SetState(string state) |
556 | { | 558 | { |
557 | if (state == State) | 559 | if (state == State) |
@@ -563,7 +565,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
563 | new DetectParams[0])); | 565 | new DetectParams[0])); |
564 | PostEvent(new EventParams("state_entry", new Object[0], | 566 | PostEvent(new EventParams("state_entry", new Object[0], |
565 | new DetectParams[0])); | 567 | new DetectParams[0])); |
566 | 568 | ||
567 | throw new EventAbortException(); | 569 | throw new EventAbortException(); |
568 | } | 570 | } |
569 | 571 | ||
@@ -653,45 +655,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
653 | /// <returns></returns> | 655 | /// <returns></returns> |
654 | public object EventProcessor() | 656 | public object EventProcessor() |
655 | { | 657 | { |
658 | EventParams data = null; | ||
656 | // We check here as the thread stopping this instance from running may itself hold the m_Script lock. | 659 | // We check here as the thread stopping this instance from running may itself hold the m_Script lock. |
657 | if (!Running) | 660 | if (!Running) |
658 | return 0; | 661 | return 0; |
659 | 662 | ||
660 | lock (m_Script) | ||
661 | { | ||
662 | // m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName); | 663 | // m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName); |
663 | 664 | ||
664 | if (Suspended) | 665 | if (Suspended) |
665 | return 0; | 666 | return 0; |
666 | |||
667 | EventParams data = null; | ||
668 | 667 | ||
669 | lock (EventQueue) | 668 | lock (EventQueue) |
669 | { | ||
670 | data = (EventParams) EventQueue.Dequeue(); | ||
671 | if (data == null) // Shouldn't happen | ||
670 | { | 672 | { |
671 | data = (EventParams)EventQueue.Dequeue(); | 673 | if (EventQueue.Count > 0 && Running && !ShuttingDown) |
672 | if (data == null) // Shouldn't happen | ||
673 | { | 674 | { |
674 | if (EventQueue.Count > 0 && Running && !ShuttingDown) | 675 | m_CurrentWorkItem = Engine.QueueEventHandler(this); |
675 | { | ||
676 | m_CurrentWorkItem = Engine.QueueEventHandler(this); | ||
677 | } | ||
678 | else | ||
679 | { | ||
680 | m_CurrentWorkItem = null; | ||
681 | } | ||
682 | return 0; | ||
683 | } | 676 | } |
684 | 677 | else | |
685 | if (data.EventName == "timer") | ||
686 | m_TimerQueued = false; | ||
687 | if (data.EventName == "control") | ||
688 | { | 678 | { |
689 | if (m_ControlEventsInQueue > 0) | 679 | m_CurrentWorkItem = null; |
690 | m_ControlEventsInQueue--; | ||
691 | } | 680 | } |
692 | if (data.EventName == "collision") | 681 | return 0; |
693 | m_CollisionInQueue = false; | ||
694 | } | 682 | } |
683 | |||
684 | if (data.EventName == "timer") | ||
685 | m_TimerQueued = false; | ||
686 | if (data.EventName == "control") | ||
687 | { | ||
688 | if (m_ControlEventsInQueue > 0) | ||
689 | m_ControlEventsInQueue--; | ||
690 | } | ||
691 | if (data.EventName == "collision") | ||
692 | m_CollisionInQueue = false; | ||
693 | } | ||
694 | |||
695 | lock(m_Script) | ||
696 | { | ||
695 | 697 | ||
696 | // m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this); | 698 | // m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this); |
697 | 699 | ||
@@ -846,6 +848,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
846 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); | 848 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); |
847 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; | 849 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; |
848 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; | 850 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; |
851 | part.CollisionSound = UUID.Zero; | ||
849 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); | 852 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); |
850 | EventQueue.Clear(); | 853 | EventQueue.Clear(); |
851 | m_Script.ResetVars(); | 854 | m_Script.ResetVars(); |
@@ -860,6 +863,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
860 | new Object[0], new DetectParams[0])); | 863 | new Object[0], new DetectParams[0])); |
861 | } | 864 | } |
862 | 865 | ||
866 | [DebuggerNonUserCode] //Stops the VS debugger from farting in this function | ||
863 | public void ApiResetScript() | 867 | public void ApiResetScript() |
864 | { | 868 | { |
865 | // bool running = Running; | 869 | // bool running = Running; |
@@ -871,6 +875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
871 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); | 875 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); |
872 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; | 876 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; |
873 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; | 877 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; |
878 | part.CollisionSound = UUID.Zero; | ||
874 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); | 879 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); |
875 | 880 | ||
876 | EventQueue.Clear(); | 881 | EventQueue.Clear(); |
@@ -891,10 +896,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
891 | 896 | ||
892 | public Dictionary<string, object> GetVars() | 897 | public Dictionary<string, object> GetVars() |
893 | { | 898 | { |
894 | if (m_Script != null) | 899 | return m_Script.GetVars(); |
895 | return m_Script.GetVars(); | ||
896 | else | ||
897 | return new Dictionary<string, object>(); | ||
898 | } | 900 | } |
899 | 901 | ||
900 | public void SetVars(Dictionary<string, object> vars) | 902 | public void SetVars(Dictionary<string, object> vars) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 9d9df9c..c9c4753 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -102,19 +102,19 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
102 | 102 | ||
103 | public override string ToString() | 103 | public override string ToString() |
104 | { | 104 | { |
105 | string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", x, y, z); | 105 | string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", x, y, z); |
106 | return s; | 106 | return s; |
107 | } | 107 | } |
108 | 108 | ||
109 | public static explicit operator LSLString(Vector3 vec) | 109 | public static explicit operator LSLString(Vector3 vec) |
110 | { | 110 | { |
111 | string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); | 111 | string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z); |
112 | return new LSLString(s); | 112 | return new LSLString(s); |
113 | } | 113 | } |
114 | 114 | ||
115 | public static explicit operator string(Vector3 vec) | 115 | public static explicit operator string(Vector3 vec) |
116 | { | 116 | { |
117 | string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z); | 117 | string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z); |
118 | return s; | 118 | return s; |
119 | } | 119 | } |
120 | 120 | ||
@@ -389,19 +389,19 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
389 | 389 | ||
390 | public override string ToString() | 390 | public override string ToString() |
391 | { | 391 | { |
392 | string st=String.Format(Culture.FormatProvider, "<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", x, y, z, s); | 392 | string st=String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", x, y, z, s); |
393 | return st; | 393 | return st; |
394 | } | 394 | } |
395 | 395 | ||
396 | public static explicit operator string(Quaternion r) | 396 | public static explicit operator string(Quaternion r) |
397 | { | 397 | { |
398 | string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); | 398 | string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s); |
399 | return s; | 399 | return s; |
400 | } | 400 | } |
401 | 401 | ||
402 | public static explicit operator LSLString(Quaternion r) | 402 | public static explicit operator LSLString(Quaternion r) |
403 | { | 403 | { |
404 | string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s); | 404 | string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s); |
405 | return new LSLString(s); | 405 | return new LSLString(s); |
406 | } | 406 | } |
407 | 407 | ||
@@ -521,6 +521,8 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
521 | size += 64; | 521 | size += 64; |
522 | else if (o is int) | 522 | else if (o is int) |
523 | size += 4; | 523 | size += 4; |
524 | else if (o is uint) | ||
525 | size += 4; | ||
524 | else if (o is string) | 526 | else if (o is string) |
525 | size += ((string)o).Length; | 527 | size += ((string)o).Length; |
526 | else if (o is float) | 528 | else if (o is float) |
@@ -686,24 +688,16 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
686 | 688 | ||
687 | public static bool operator ==(list a, list b) | 689 | public static bool operator ==(list a, list b) |
688 | { | 690 | { |
689 | int la = -1; | 691 | int la = a.Length; |
690 | int lb = -1; | 692 | int lb = b.Length; |
691 | try { la = a.Length; } | ||
692 | catch (NullReferenceException) { } | ||
693 | try { lb = b.Length; } | ||
694 | catch (NullReferenceException) { } | ||
695 | 693 | ||
696 | return la == lb; | 694 | return la == lb; |
697 | } | 695 | } |
698 | 696 | ||
699 | public static bool operator !=(list a, list b) | 697 | public static bool operator !=(list a, list b) |
700 | { | 698 | { |
701 | int la = -1; | 699 | int la = a.Length; |
702 | int lb = -1; | 700 | int lb = b.Length; |
703 | try { la = a.Length; } | ||
704 | catch (NullReferenceException) { } | ||
705 | try {lb = b.Length;} | ||
706 | catch (NullReferenceException) { } | ||
707 | 701 | ||
708 | return la != lb; | 702 | return la != lb; |
709 | } | 703 | } |
@@ -937,7 +931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
937 | ret = Math.Sign(Quaternion.Mag(l) - Quaternion.Mag(r)); | 931 | ret = Math.Sign(Quaternion.Mag(l) - Quaternion.Mag(r)); |
938 | } | 932 | } |
939 | 933 | ||
940 | if (ascending == 0) | 934 | if (ascending != 1) |
941 | { | 935 | { |
942 | ret = 0 - ret; | 936 | ret = 0 - ret; |
943 | } | 937 | } |
@@ -970,6 +964,9 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
970 | stride = 1; | 964 | stride = 1; |
971 | } | 965 | } |
972 | 966 | ||
967 | if ((Data.Length % stride) != 0) | ||
968 | return new list(ret); | ||
969 | |||
973 | // we can optimize here in the case where stride == 1 and the list | 970 | // we can optimize here in the case where stride == 1 and the list |
974 | // consists of homogeneous types | 971 | // consists of homogeneous types |
975 | 972 | ||
@@ -989,7 +986,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
989 | if (homogeneous) | 986 | if (homogeneous) |
990 | { | 987 | { |
991 | Array.Sort(ret, new HomogeneousComparer()); | 988 | Array.Sort(ret, new HomogeneousComparer()); |
992 | if (ascending == 0) | 989 | if (ascending != 1) |
993 | { | 990 | { |
994 | Array.Reverse(ret); | 991 | Array.Reverse(ret); |
995 | } | 992 | } |
@@ -1137,7 +1134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1137 | { | 1134 | { |
1138 | list ret = new list(); | 1135 | list ret = new list(); |
1139 | double entry; | 1136 | double entry; |
1140 | for (int i = 0; i < src.Data.Length - 1; i++) | 1137 | for (int i = 0; i < src.Data.Length; i++) |
1141 | { | 1138 | { |
1142 | if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry)) | 1139 | if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry)) |
1143 | { | 1140 | { |