mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 00:46:02 +08:00
* 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.
This commit is contained in:
@@ -31,7 +31,7 @@ using System.Threading;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.Serialization;
|
||||
using libsecondlife;
|
||||
using OpenMetaverse;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Region.Environment;
|
||||
using OpenSim.Region.Environment.Scenes;
|
||||
@@ -70,24 +70,24 @@ namespace OpenSim.Region.ScriptEngine.Shared
|
||||
{
|
||||
public DetectParams()
|
||||
{
|
||||
Key = LLUUID.Zero;
|
||||
Key = UUID.Zero;
|
||||
OffsetPos = new LSL_Types.Vector3();
|
||||
LinkNum = 0;
|
||||
Group = LLUUID.Zero;
|
||||
Group = UUID.Zero;
|
||||
Name = String.Empty;
|
||||
Owner = LLUUID.Zero;
|
||||
Owner = UUID.Zero;
|
||||
Position = new LSL_Types.Vector3();
|
||||
Rotation = new LSL_Types.Quaternion();
|
||||
Type = 0;
|
||||
Velocity = new LSL_Types.Vector3();
|
||||
}
|
||||
|
||||
public LLUUID Key;
|
||||
public UUID Key;
|
||||
public LSL_Types.Vector3 OffsetPos;
|
||||
public int LinkNum;
|
||||
public LLUUID Group;
|
||||
public UUID Group;
|
||||
public string Name;
|
||||
public LLUUID Owner;
|
||||
public UUID Owner;
|
||||
public LSL_Types.Vector3 Position;
|
||||
public LSL_Types.Quaternion Rotation;
|
||||
public int Type;
|
||||
@@ -109,17 +109,17 @@ namespace OpenSim.Region.ScriptEngine.Shared
|
||||
presence.AbsolutePosition.Y,
|
||||
presence.AbsolutePosition.Z);
|
||||
Rotation = new LSL_Types.Quaternion(
|
||||
presence.Rotation.x,
|
||||
presence.Rotation.y,
|
||||
presence.Rotation.z,
|
||||
presence.Rotation.w);
|
||||
presence.Rotation.X,
|
||||
presence.Rotation.Y,
|
||||
presence.Rotation.Z,
|
||||
presence.Rotation.W);
|
||||
Velocity = new LSL_Types.Vector3(
|
||||
presence.Velocity.X,
|
||||
presence.Velocity.Y,
|
||||
presence.Velocity.Z);
|
||||
|
||||
Type = 0x01; // Avatar
|
||||
if (presence.Velocity != LLVector3.Zero)
|
||||
if (presence.Velocity != Vector3.Zero)
|
||||
Type |= 0x02; // Active
|
||||
|
||||
Group = presence.ControllingClient.ActiveGroupId;
|
||||
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
|
||||
Group = part.GroupID;
|
||||
Name = part.Name;
|
||||
Owner = part.OwnerID;
|
||||
if (part.Velocity == LLVector3.Zero)
|
||||
if (part.Velocity == Vector3.Zero)
|
||||
Type = 0x04; // Passive
|
||||
else
|
||||
Type = 0x02; // Passive
|
||||
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
|
||||
part.AbsolutePosition.Y,
|
||||
part.AbsolutePosition.Z);
|
||||
|
||||
LLQuaternion wr = part.GetWorldRotation();
|
||||
Quaternion wr = part.GetWorldRotation();
|
||||
Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W);
|
||||
|
||||
Velocity = new LSL_Types.Vector3(part.Velocity.X,
|
||||
|
||||
Reference in New Issue
Block a user