mirror of
https://github.com/opensim/opensim.git
synced 2026-08-11 11:57:03 +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:
@@ -26,23 +26,23 @@
|
||||
*/
|
||||
|
||||
using System;
|
||||
using libsecondlife;
|
||||
using OpenMetaverse;
|
||||
|
||||
namespace OpenSim.Framework
|
||||
{
|
||||
public class AgentCircuitData
|
||||
{
|
||||
public LLUUID AgentID;
|
||||
public LLUUID BaseFolder;
|
||||
public UUID AgentID;
|
||||
public UUID BaseFolder;
|
||||
public string CapsPath = String.Empty;
|
||||
public bool child;
|
||||
public uint circuitcode;
|
||||
public string firstname;
|
||||
public LLUUID InventoryFolder;
|
||||
public UUID InventoryFolder;
|
||||
public string lastname;
|
||||
public LLUUID SecureSessionID;
|
||||
public LLUUID SessionID;
|
||||
public LLVector3 startpos;
|
||||
public UUID SecureSessionID;
|
||||
public UUID SessionID;
|
||||
public Vector3 startpos;
|
||||
|
||||
public AgentCircuitData()
|
||||
{
|
||||
@@ -50,16 +50,16 @@ namespace OpenSim.Framework
|
||||
|
||||
public AgentCircuitData(sAgentCircuitData cAgent)
|
||||
{
|
||||
AgentID = new LLUUID(cAgent.AgentID);
|
||||
SessionID = new LLUUID(cAgent.SessionID);
|
||||
SecureSessionID = new LLUUID(cAgent.SecureSessionID);
|
||||
startpos = new LLVector3(cAgent.startposx, cAgent.startposy, cAgent.startposz);
|
||||
AgentID = new UUID(cAgent.AgentID);
|
||||
SessionID = new UUID(cAgent.SessionID);
|
||||
SecureSessionID = new UUID(cAgent.SecureSessionID);
|
||||
startpos = new Vector3(cAgent.startposx, cAgent.startposy, cAgent.startposz);
|
||||
firstname = cAgent.firstname;
|
||||
lastname = cAgent.lastname;
|
||||
circuitcode = cAgent.circuitcode;
|
||||
child = cAgent.child;
|
||||
InventoryFolder = new LLUUID(cAgent.InventoryFolder);
|
||||
BaseFolder = new LLUUID(cAgent.BaseFolder);
|
||||
InventoryFolder = new UUID(cAgent.InventoryFolder);
|
||||
BaseFolder = new UUID(cAgent.BaseFolder);
|
||||
CapsPath = cAgent.CapsPath;
|
||||
}
|
||||
}
|
||||
@@ -87,9 +87,9 @@ namespace OpenSim.Framework
|
||||
|
||||
public sAgentCircuitData(AgentCircuitData cAgent)
|
||||
{
|
||||
AgentID = cAgent.AgentID.UUID;
|
||||
SessionID = cAgent.SessionID.UUID;
|
||||
SecureSessionID = cAgent.SecureSessionID.UUID;
|
||||
AgentID = cAgent.AgentID.Guid;
|
||||
SessionID = cAgent.SessionID.Guid;
|
||||
SecureSessionID = cAgent.SecureSessionID.Guid;
|
||||
startposx = cAgent.startpos.X;
|
||||
startposy = cAgent.startpos.Y;
|
||||
startposz = cAgent.startpos.Z;
|
||||
@@ -97,9 +97,9 @@ namespace OpenSim.Framework
|
||||
lastname = cAgent.lastname;
|
||||
circuitcode = cAgent.circuitcode;
|
||||
child = cAgent.child;
|
||||
InventoryFolder = cAgent.InventoryFolder.UUID;
|
||||
BaseFolder = cAgent.BaseFolder.UUID;
|
||||
InventoryFolder = cAgent.InventoryFolder.Guid;
|
||||
BaseFolder = cAgent.BaseFolder.Guid;
|
||||
CapsPath = cAgent.CapsPath;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user