aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Helpers.cs28
1 files changed, 19 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 22804f5..9e5fb24 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -164,11 +164,11 @@ namespace OpenSim.Region.ScriptEngine.Shared
164 else 164 else
165 { 165 {
166 // Set the values from the touch data provided by the client 166 // Set the values from the touch data provided by the client
167 touchST = new LSL_Types.Vector3(value.STCoord); 167 touchST = new LSL_Types.Vector3(value.STCoord.X, value.STCoord.Y, value.STCoord.Z);
168 touchUV = new LSL_Types.Vector3(value.UVCoord); 168 touchUV = new LSL_Types.Vector3(value.UVCoord.X, value.UVCoord.Y, value.UVCoord.Z);
169 touchNormal = new LSL_Types.Vector3(value.Normal); 169 touchNormal = new LSL_Types.Vector3(value.Normal.X, value.Normal.Y, value.Normal.Z);
170 touchBinormal = new LSL_Types.Vector3(value.Binormal); 170 touchBinormal = new LSL_Types.Vector3(value.Binormal.X, value.Binormal.Y, value.Binormal.Z);
171 touchPos = new LSL_Types.Vector3(value.Position); 171 touchPos = new LSL_Types.Vector3(value.Position.X, value.Position.Y, value.Position.Z);
172 touchFace = value.FaceIndex; 172 touchFace = value.FaceIndex;
173 } 173 }
174 } 174 }
@@ -189,13 +189,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
189 Country = account.UserCountry; 189 Country = account.UserCountry;
190 190
191 Owner = Key; 191 Owner = Key;
192 Position = new LSL_Types.Vector3(presence.AbsolutePosition); 192 Position = new LSL_Types.Vector3(
193 presence.AbsolutePosition.X,
194 presence.AbsolutePosition.Y,
195 presence.AbsolutePosition.Z);
193 Rotation = new LSL_Types.Quaternion( 196 Rotation = new LSL_Types.Quaternion(
194 presence.Rotation.X, 197 presence.Rotation.X,
195 presence.Rotation.Y, 198 presence.Rotation.Y,
196 presence.Rotation.Z, 199 presence.Rotation.Z,
197 presence.Rotation.W); 200 presence.Rotation.W);
198 Velocity = new LSL_Types.Vector3(presence.Velocity); 201 Velocity = new LSL_Types.Vector3(
202 presence.Velocity.X,
203 presence.Velocity.Y,
204 presence.Velocity.Z);
199 205
200 Type = 0x01; // Avatar 206 Type = 0x01; // Avatar
201 if (presence.PresenceType == PresenceType.Npc) 207 if (presence.PresenceType == PresenceType.Npc)
@@ -248,12 +254,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
248 } 254 }
249 } 255 }
250 256
251 Position = new LSL_Types.Vector3(part.AbsolutePosition); 257 Position = new LSL_Types.Vector3(part.AbsolutePosition.X,
258 part.AbsolutePosition.Y,
259 part.AbsolutePosition.Z);
252 260
253 Quaternion wr = part.ParentGroup.GroupRotation; 261 Quaternion wr = part.ParentGroup.GroupRotation;
254 Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); 262 Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W);
255 263
256 Velocity = new LSL_Types.Vector3(part.Velocity); 264 Velocity = new LSL_Types.Vector3(part.Velocity.X,
265 part.Velocity.Y,
266 part.Velocity.Z);
257 } 267 }
258 } 268 }
259 269