diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index d3222e7..8599e06 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |||
@@ -31,7 +31,7 @@ using System.Threading; | |||
31 | using System.Collections; | 31 | using System.Collections; |
32 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
33 | using System.Runtime.Serialization; | 33 | using System.Runtime.Serialization; |
34 | using libsecondlife; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Environment; | 36 | using OpenSim.Region.Environment; |
37 | using OpenSim.Region.Environment.Scenes; | 37 | using OpenSim.Region.Environment.Scenes; |
@@ -70,24 +70,24 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
70 | { | 70 | { |
71 | public DetectParams() | 71 | public DetectParams() |
72 | { | 72 | { |
73 | Key = LLUUID.Zero; | 73 | Key = UUID.Zero; |
74 | OffsetPos = new LSL_Types.Vector3(); | 74 | OffsetPos = new LSL_Types.Vector3(); |
75 | LinkNum = 0; | 75 | LinkNum = 0; |
76 | Group = LLUUID.Zero; | 76 | Group = UUID.Zero; |
77 | Name = String.Empty; | 77 | Name = String.Empty; |
78 | Owner = LLUUID.Zero; | 78 | Owner = UUID.Zero; |
79 | Position = new LSL_Types.Vector3(); | 79 | Position = new LSL_Types.Vector3(); |
80 | Rotation = new LSL_Types.Quaternion(); | 80 | Rotation = new LSL_Types.Quaternion(); |
81 | Type = 0; | 81 | Type = 0; |
82 | Velocity = new LSL_Types.Vector3(); | 82 | Velocity = new LSL_Types.Vector3(); |
83 | } | 83 | } |
84 | 84 | ||
85 | public LLUUID Key; | 85 | public UUID Key; |
86 | public LSL_Types.Vector3 OffsetPos; | 86 | public LSL_Types.Vector3 OffsetPos; |
87 | public int LinkNum; | 87 | public int LinkNum; |
88 | public LLUUID Group; | 88 | public UUID Group; |
89 | public string Name; | 89 | public string Name; |
90 | public LLUUID Owner; | 90 | public UUID Owner; |
91 | public LSL_Types.Vector3 Position; | 91 | public LSL_Types.Vector3 Position; |
92 | public LSL_Types.Quaternion Rotation; | 92 | public LSL_Types.Quaternion Rotation; |
93 | public int Type; | 93 | public int Type; |
@@ -109,17 +109,17 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
109 | presence.AbsolutePosition.Y, | 109 | presence.AbsolutePosition.Y, |
110 | presence.AbsolutePosition.Z); | 110 | presence.AbsolutePosition.Z); |
111 | Rotation = new LSL_Types.Quaternion( | 111 | Rotation = new LSL_Types.Quaternion( |
112 | presence.Rotation.x, | 112 | presence.Rotation.X, |
113 | presence.Rotation.y, | 113 | presence.Rotation.Y, |
114 | presence.Rotation.z, | 114 | presence.Rotation.Z, |
115 | presence.Rotation.w); | 115 | presence.Rotation.W); |
116 | Velocity = new LSL_Types.Vector3( | 116 | Velocity = new LSL_Types.Vector3( |
117 | presence.Velocity.X, | 117 | presence.Velocity.X, |
118 | presence.Velocity.Y, | 118 | presence.Velocity.Y, |
119 | presence.Velocity.Z); | 119 | presence.Velocity.Z); |
120 | 120 | ||
121 | Type = 0x01; // Avatar | 121 | Type = 0x01; // Avatar |
122 | if (presence.Velocity != LLVector3.Zero) | 122 | if (presence.Velocity != Vector3.Zero) |
123 | Type |= 0x02; // Active | 123 | Type |= 0x02; // Active |
124 | 124 | ||
125 | Group = presence.ControllingClient.ActiveGroupId; | 125 | Group = presence.ControllingClient.ActiveGroupId; |
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
134 | Group = part.GroupID; | 134 | Group = part.GroupID; |
135 | Name = part.Name; | 135 | Name = part.Name; |
136 | Owner = part.OwnerID; | 136 | Owner = part.OwnerID; |
137 | if (part.Velocity == LLVector3.Zero) | 137 | if (part.Velocity == Vector3.Zero) |
138 | Type = 0x04; // Passive | 138 | Type = 0x04; // Passive |
139 | else | 139 | else |
140 | Type = 0x02; // Passive | 140 | Type = 0x02; // Passive |
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
152 | part.AbsolutePosition.Y, | 152 | part.AbsolutePosition.Y, |
153 | part.AbsolutePosition.Z); | 153 | part.AbsolutePosition.Z); |
154 | 154 | ||
155 | LLQuaternion wr = part.GetWorldRotation(); | 155 | Quaternion wr = part.GetWorldRotation(); |
156 | Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); | 156 | Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); |
157 | 157 | ||
158 | Velocity = new LSL_Types.Vector3(part.Velocity.X, | 158 | Velocity = new LSL_Types.Vector3(part.Velocity.X, |