From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * 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. --- .../Region/Examples/SimpleModule/ComplexObject.cs | 54 +++--- .../Examples/SimpleModule/CpuCounterObject.cs | 6 +- .../Examples/SimpleModule/FileSystemObject.cs | 6 +- .../Region/Examples/SimpleModule/MyNpcCharacter.cs | 198 ++++++++++----------- .../Region/Examples/SimpleModule/RegionModule.cs | 20 +-- 5 files changed, 142 insertions(+), 142 deletions(-) (limited to 'OpenSim/Region/Examples') diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index 16636e0..c8c4624 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; @@ -33,7 +33,7 @@ namespace OpenSim.Region.Examples.SimpleModule { public class ComplexObject : SceneObjectGroup { - private readonly LLQuaternion m_rotationDirection; + private readonly Quaternion m_rotationDirection; protected override bool InSceneBackup { @@ -45,21 +45,21 @@ namespace OpenSim.Region.Examples.SimpleModule private class RotatingWheel : SceneObjectPart { - private readonly LLQuaternion m_rotationDirection; + private readonly Quaternion m_rotationDirection; public RotatingWheel() { } - public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, - LLVector3 groupPosition, LLVector3 offsetPosition, LLQuaternion rotationDirection) + public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, UUID ownerID, uint localID, + Vector3 groupPosition, Vector3 offsetPosition, Quaternion rotationDirection) : base( regionHandle, parent, ownerID, localID, PrimitiveBaseShape.Default, groupPosition, offsetPosition ) { m_rotationDirection = rotationDirection; - Flags |= LLObject.ObjectFlags.Touch; + Flags |= PrimFlags.Touch; } public override void UpdateMovement() @@ -79,55 +79,55 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public ComplexObject(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos) + public ComplexObject(Scene scene, ulong regionHandle, UUID ownerID, uint localID, Vector3 pos) : base(scene, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default) { - m_rotationDirection = new LLQuaternion(0.05f, 0.1f, 0.15f); + m_rotationDirection = new Quaternion(0.05f, 0.1f, 0.15f); AddPart( - new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, 0.75f), - new LLQuaternion(0.05f, 0, 0))); + new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, 0, 0.75f), + new Quaternion(0.05f, 0, 0))); AddPart( - new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, -0.75f), - new LLQuaternion(-0.05f, 0, 0))); + new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, 0, -0.75f), + new Quaternion(-0.05f, 0, 0))); AddPart( - new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0.75f, 0), - new LLQuaternion(0.5f, 0, 0.05f))); + new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, 0.75f, 0), + new Quaternion(0.5f, 0, 0.05f))); AddPart( - new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, -0.75f, 0), - new LLQuaternion(-0.5f, 0, -0.05f))); + new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0, -0.75f, 0), + new Quaternion(-0.5f, 0, -0.05f))); AddPart( - new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0.75f, 0, 0), - new LLQuaternion(0, 0.5f, 0.05f))); + new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(0.75f, 0, 0), + new Quaternion(0, 0.5f, 0.05f))); AddPart( - new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(-0.75f, 0, 0), - new LLQuaternion(0, -0.5f, -0.05f))); + new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new Vector3(-0.75f, 0, 0), + new Quaternion(0, -0.5f, -0.05f))); - RootPart.Flags |= LLObject.ObjectFlags.Touch; + RootPart.Flags |= PrimFlags.Touch; UpdateParentIDs(); } - public override void OnGrabPart(SceneObjectPart part, LLVector3 offsetPos, IClientAPI remoteClient) + public override void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient) { m_parts.Remove(part.UUID); - remoteClient.SendKillObject(m_regionHandle, part.LocalId); + remoteClient.SendKiPrimitive(m_regionHandle, part.LocalId); remoteClient.AddMoney(1); - remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); + remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); } - public override void OnGrabGroup(LLVector3 offsetPos, IClientAPI remoteClient) + public override void OnGrabGroup(Vector3 offsetPos, IClientAPI remoteClient) { if (m_parts.Count == 1) { m_parts.Remove(m_rootPart.UUID); m_scene.DeleteSceneObject(this); - remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId); + remoteClient.SendKiPrimitive(m_regionHandle, m_rootPart.LocalId); remoteClient.AddMoney(50); - remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); + remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); } } } diff --git a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs index e7d5db8..126ccd3 100644 --- a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs @@ -27,7 +27,7 @@ using System; using System.Diagnostics; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; @@ -45,7 +45,7 @@ namespace OpenSim.Region.Examples.SimpleModule private PerformanceCounter m_counter; - public CpuCounterObject(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos) + public CpuCounterObject(Scene world, ulong regionHandle, UUID ownerID, uint localID, Vector3 pos) : base(world, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default) { String objectName = "Processor"; @@ -58,7 +58,7 @@ namespace OpenSim.Region.Examples.SimpleModule public override void UpdateMovement() { float cpu = m_counter.NextValue()/40f; - LLVector3 size = new LLVector3(cpu, cpu, cpu); + Vector3 size = new Vector3(cpu, cpu, cpu); RootPart.Resize(size); diff --git a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs index 34ed086..3b43c7a 100644 --- a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs @@ -26,7 +26,7 @@ */ using System.IO; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; @@ -34,8 +34,8 @@ namespace OpenSim.Region.Examples.SimpleModule { public class FileSystemObject : SceneObjectGroup { - public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) - : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default) + public FileSystemObject(Scene world, FileInfo fileInfo, Vector3 pos) + : base(world, world.RegionInfo.RegionHandle, UUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default) { Text = fileInfo.Name; } diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 3ea518f..8f579bd 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -28,8 +28,8 @@ using System; using System.Collections.Generic; using System.Net; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; @@ -39,7 +39,7 @@ namespace OpenSim.Region.Examples.SimpleModule { private uint movementFlag = 0; private short flyState = 0; - private LLQuaternion bodyDirection = LLQuaternion.Identity; + private Quaternion bodyDirection = Quaternion.Identity; private short count = 0; private short frame = 0; private Scene m_scene; @@ -117,7 +117,7 @@ namespace OpenSim.Region.Examples.SimpleModule public event UpdateVector OnUpdatePrimGroupScale; public event StatusChange OnChildAgentStatus; public event GenericCall2 OnStopMovement; - public event Action OnRemoveAvatar; + public event Action OnRemoveAvatar; public event CreateNewInventoryItem OnCreateNewInventoryItem; public event CreateInventoryFolder OnCreateNewInventoryFolder; @@ -216,37 +216,37 @@ namespace OpenSim.Region.Examples.SimpleModule #pragma warning restore 67 - private LLUUID myID = LLUUID.Random(); + private UUID myID = UUID.Random(); public MyNpcCharacter(Scene scene) { - // startPos = new LLVector3(128, (float)(Util.RandomClass.NextDouble()*100), 2); + // startPos = new Vector3(128, (float)(Util.RandomClass.NextDouble()*100), 2); m_scene = scene; m_scene.EventManager.OnFrame += Update; } - private LLVector3 startPos = new LLVector3(128, 128, 2); + private Vector3 startPos = new Vector3(128, 128, 2); - public virtual LLVector3 StartPos + public virtual Vector3 StartPos { get { return startPos; } set { } } - public virtual LLUUID AgentId + public virtual UUID AgentId { get { return myID; } } - public LLUUID SessionId + public UUID SessionId { - get { return LLUUID.Zero; } + get { return UUID.Zero; } } - public LLUUID SecureSessionId + public UUID SecureSessionId { - get { return LLUUID.Zero; } + get { return UUID.Zero; } } public virtual string FirstName @@ -272,9 +272,9 @@ namespace OpenSim.Region.Examples.SimpleModule set { } } - public LLUUID ActiveGroupId + public UUID ActiveGroupId { - get { return LLUUID.Zero; } + get { return UUID.Zero; } } public string ActiveGroupName @@ -287,10 +287,10 @@ namespace OpenSim.Region.Examples.SimpleModule get { return 0; } } - public ulong GetGroupPowers(LLUUID groupID) - { - return 0; - } + public ulong GetGroupPowers(UUID groupID) + { + return 0; + } public virtual int NextAnimationSequenceNumber { @@ -307,7 +307,7 @@ namespace OpenSim.Region.Examples.SimpleModule set { } } - public virtual void ActivateGesture(LLUUID assetId, LLUUID gestureId) + public virtual void ActivateGesture(UUID assetId, UUID gestureId) { } @@ -320,7 +320,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public virtual void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry) + public virtual void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) { } @@ -336,12 +336,12 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public virtual void SendAgentDataUpdate(LLUUID agentid, LLUUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) + public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) { } - public virtual void SendKillObject(ulong regionHandle, uint localID) + public virtual void SendKiPrimitive(ulong regionHandle, uint localID) { } @@ -354,27 +354,27 @@ namespace OpenSim.Region.Examples.SimpleModule } - public virtual void SendAnimations(LLUUID[] animations, int[] seqs, LLUUID sourceAgentId) + public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId) { } - public virtual void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, - LLUUID fromAgentID, byte source, byte audible) + public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, + UUID fromAgentID, byte source, byte audible) { } - public virtual void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, - LLUUID fromAgentID, byte source, byte audible) + public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, + UUID fromAgentID, byte source, byte audible) { } - public virtual void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, - LLUUID imSessionID, string fromName, byte dialog, uint timeStamp) + public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, + UUID imSessionID, string fromName, byte dialog, uint timeStamp) { } - public virtual void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, - LLUUID imSessionID, string fromName, byte dialog, uint timeStamp, + public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, + UUID imSessionID, string fromName, byte dialog, uint timeStamp, byte[] binaryBucket) { } @@ -390,7 +390,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) + public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) { } @@ -403,7 +403,7 @@ namespace OpenSim.Region.Examples.SimpleModule return new AgentCircuitData(); } - public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, + public virtual void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL) { } @@ -412,7 +412,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags) + public virtual void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags) { } @@ -429,66 +429,66 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance) + public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance) { } - public virtual void SendPayPrice(LLUUID objectID, int[] payPrice) + public virtual void SendPayPrice(UUID objectID, int[] payPrice) { } - public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, - uint avatarLocalID, LLVector3 Pos, byte[] textureEntry, uint parentID, LLQuaternion rotation) + public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, UUID avatarID, + uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) { } public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, - LLVector3 position, LLVector3 velocity, LLQuaternion rotation) + Vector3 position, Vector3 velocity, Quaternion rotation) { } - public virtual void SendCoarseLocationUpdate(List CoarseLocations) + public virtual void SendCoarseLocationUpdate(List CoarseLocations) { } - public virtual void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint) + public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint) { } - public virtual void SendDialog(string objectname, LLUUID objectID, LLUUID ownerID, string msg, LLUUID textureID, int ch, string[] buttonlabels) + public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string msg, UUID textureID, int ch, string[] buttonlabels) { } public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, - PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, - LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags, - LLUUID objectID, LLUUID ownerID, string text, byte[] color, + PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, + Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, + UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction) { } public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, - PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, - LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags, - LLUUID objectID, LLUUID ownerID, string text, byte[] color, + PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, + Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, + UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte[] textureanimation, - bool attachment, uint AttachmentPoint, LLUUID AssetId, LLUUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) + bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) { } public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, - LLVector3 position, LLQuaternion rotation, LLVector3 velocity, - LLVector3 rotationalvelocity, byte state, LLUUID AssetId) + Vector3 position, Quaternion rotation, Vector3 velocity, + Vector3 rotationalvelocity, byte state, UUID AssetId) { } public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, - LLVector3 position, LLQuaternion rotation, LLVector3 velocity, - LLVector3 rotationalvelocity) + Vector3 position, Quaternion rotation, Vector3 velocity, + Vector3 rotationalvelocity) { } - public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, + public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List items, List folders, bool fetchFolders, @@ -496,7 +496,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public virtual void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item) + public virtual void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item) { } @@ -504,7 +504,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public virtual void SendRemoveInventoryItem(LLUUID itemID) + public virtual void SendRemoveInventoryItem(UUID itemID) { } @@ -513,16 +513,16 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public LLUUID GetDefaultAnimation(string name) + public UUID GetDefaultAnimation(string name) { - return LLUUID.Zero; + return UUID.Zero; } public void SendTakeControls(int controls, bool passToAgent, bool TakeControls) { } - public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) + public virtual void SendTaskInventory(UUID taskID, short serial, byte[] fileName) { } @@ -537,24 +537,24 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname) + public virtual void SendNameReply(UUID profileId, string firstname, string lastname) { } - public virtual void SendPreLoadSound(LLUUID objectID, LLUUID ownerID, LLUUID soundID) + public virtual void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID) { } - public virtual void SendPlayAttachedSound(LLUUID soundID, LLUUID objectID, LLUUID ownerID, float gain, + public virtual void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain, byte flags) { } - public void SendTriggeredSound(LLUUID soundID, LLUUID ownerID, LLUUID objectID, LLUUID parentID, ulong handle, LLVector3 position, float gain) + public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) { } - public void SendAttachedSoundGainChange(LLUUID objectID, float gain) + public void SendAttachedSoundGainChange(UUID objectID, float gain) { } @@ -571,7 +571,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, + public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url) { } @@ -588,7 +588,7 @@ namespace OpenSim.Region.Examples.SimpleModule OnCompleteMovementToRegion(); } } - public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID) + public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) { } @@ -596,11 +596,11 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName) + public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName) { } - public void SendImagePart(ushort numParts, LLUUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) + public void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) { } @@ -612,37 +612,37 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public void SendObjectPropertiesFamilyData(uint RequestFlags, LLUUID ObjectUUID, LLUUID OwnerID, LLUUID GroupID, + public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category, - LLUUID LastOwnerID, string ObjectName, string Description) + UUID LastOwnerID, string ObjectName, string Description) { } - public void SendObjectPropertiesReply(LLUUID ItemID, ulong CreationDate, LLUUID CreatorUUID, LLUUID FolderUUID, LLUUID FromTaskUUID, - LLUUID GroupUUID, short InventorySerial, LLUUID LastOwnerUUID, LLUUID ObjectUUID, - LLUUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, + public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID, + UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID, + UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, uint BaseMask, byte saleType, int salePrice) { } - public void SendAgentOffline(LLUUID[] agentIDs) + public void SendAgentOffline(UUID[] agentIDs) { } - public void SendAgentOnline(LLUUID[] agentIDs) + public void SendAgentOnline(UUID[] agentIDs) { } - public void SendSitResponse(LLUUID TargetID, LLVector3 OffsetPos, LLQuaternion SitOrientation, bool autopilot, - LLVector3 CameraAtOffset, LLVector3 CameraEyeOffset, bool ForceMouseLook) + public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, + Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) { } - public void SendAdminResponse(LLUUID Token, uint AdminLevel) + public void SendAdminResponse(UUID Token, uint AdminLevel) { } @@ -692,7 +692,7 @@ namespace OpenSim.Region.Examples.SimpleModule args.Message = "Hey You! Get out of my Home. This is my Region"; args.Channel = 0; args.From = FirstName + " " + LastName; - args.Position = new LLVector3(128, 128, 26); + args.Position = new Vector3(128, 128, 26); args.Sender = this; args.Type = ChatTypeEnum.Shout; @@ -710,7 +710,7 @@ namespace OpenSim.Region.Examples.SimpleModule return false; } - public void SendSunPos(LLVector3 sunPos, LLVector3 sunVel, ulong time, uint dlen, uint ylen, float phase) + public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong time, uint dlen, uint ylen, float phase) { } @@ -718,9 +718,9 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember, - string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, - LLUUID partnerID) + public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, + string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, + UUID partnerID) { } @@ -751,7 +751,7 @@ namespace OpenSim.Region.Examples.SimpleModule get { return m_circuitCode; } set { m_circuitCode = value; } } - public void SendBlueBoxMessage(LLUUID FromAvatarID, LLUUID fromSessionID, String FromAvatarName, String Message) + public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message) { } @@ -772,41 +772,41 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public void SendScriptQuestion(LLUUID objectID, string taskName, string ownerName, LLUUID itemID, int question) + public void SendScriptQuestion(UUID objectID, string taskName, string ownerName, UUID itemID, int question) { } public void SendHealth(float health) { } - public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) + public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) { } - public void SendBannedUserList(LLUUID invoice, EstateBan[] banlist, uint estateID) + public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID) { } public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) { } - public void SendEstateCovenantInformation(LLUUID covenant) + public void SendEstateCovenantInformation(UUID covenant) { } - public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant, string abuseEmail) + public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail) { } public void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) { } - public void SendLandAccessListData(List avatars, uint accessFlag, int localLandID) + public void SendLandAccessListData(List avatars, uint accessFlag, int localLandID) { } public void SendForceClientSelectObjects(List objectIDs) { } - public void SendLandObjectOwners(Dictionary ownersAndCount) + public void SendLandObjectOwners(Dictionary ownersAndCount) { } public void SendLandParcelOverlay(byte[] data, int sequence_id) @@ -818,13 +818,13 @@ namespace OpenSim.Region.Examples.SimpleModule } - public void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID, byte autoScale, string mediaType, + public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop) { } - public void SendGroupNameReply(LLUUID groupLLUID, string GroupName) + public void SendGroupNameReply(UUID groupLLUID, string GroupName) { } @@ -832,7 +832,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public void SendScriptRunningReply(LLUUID objectID, LLUUID itemID, bool running) + public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running) { } @@ -845,19 +845,19 @@ namespace OpenSim.Region.Examples.SimpleModule } - public void SendSetFollowCamProperties (LLUUID objectID, SortedDictionary parameters) + public void SendSetFollowCamProperties (UUID objectID, SortedDictionary parameters) { } - public void SendClearFollowCamProperties (LLUUID objectID) + public void SendClearFollowCamProperties (UUID objectID) { } - public void SendRegionHandle (LLUUID regoinID, ulong handle) + public void SendRegionHandle (UUID regoinID, ulong handle) { } - public void SendParcelInfo (RegionInfo info, LandData land, LLUUID parcelID, uint x, uint y) + public void SendParcelInfo (RegionInfo info, LandData land, UUID parcelID, uint x, uint y) { } diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs index 441c696..4fc0dbb 100644 --- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs +++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; using System.IO; -using libsecondlife; +using OpenMetaverse; using Nini.Config; using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; @@ -50,7 +50,7 @@ namespace OpenSim.Region.Examples.SimpleModule { // RegionInfo regionInfo = m_scene.RegionInfo; - // LLVector3 pos = new LLVector3(110, 129, 27); + // Vector3 pos = new Vector3(110, 129, 27); //AddCpuCounter(regionInfo, pos); // AddComplexObjects(regionInfo, pos); @@ -67,7 +67,7 @@ namespace OpenSim.Region.Examples.SimpleModule // foreach (FileInfo fileInfo in dirInfo.GetFiles()) // { - // LLVector3 filePos = new LLVector3(100 + x, 129, 27 + z); + // Vector3 filePos = new Vector3(100 + x, 129, 27 + z); // x = x + 2; // if (x > 50) // { @@ -92,29 +92,29 @@ namespace OpenSim.Region.Examples.SimpleModule foreach (ScenePresence avatar in avatars) { avatar.AbsolutePosition = - new LLVector3((float)Util.RandomClass.Next(100, 200), (float)Util.RandomClass.Next(30, 200), 2); + new Vector3((float)Util.RandomClass.Next(100, 200), (float)Util.RandomClass.Next(30, 200), 2); } } - // private void AddComplexObjects(RegionInfo regionInfo, LLVector3 pos) + // private void AddComplexObjects(RegionInfo regionInfo, Vector3 pos) // { // int objs = 3; // for (int i = 0; i < (objs*objs*objs); i++) // { - // LLVector3 posOffset = new LLVector3((i % objs) * 4, ((i % (objs*objs)) / (objs)) * 4, (i / (objs*objs)) * 4); + // Vector3 posOffset = new Vector3((i % objs) * 4, ((i % (objs*objs)) / (objs)) * 4, (i / (objs*objs)) * 4); // ComplexObject complexObject = - // new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), + // new ComplexObject(m_scene, regionInfo.RegionHandle, UUID.Zero, m_scene.PrimIDAllocate(), // pos + posOffset); // m_scene.AddNewSceneObject(complexObject, true); // } // } - // private void AddCpuCounter(RegionInfo regionInfo, LLVector3 pos) + // private void AddCpuCounter(RegionInfo regionInfo, Vector3 pos) // { // SceneObjectGroup sceneObject = - // new CpuCounterObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), - // pos + new LLVector3(1f, 1f, 1f)); + // new CpuCounterObject(m_scene, regionInfo.RegionHandle, UUID.Zero, m_scene.PrimIDAllocate(), + // pos + new Vector3(1f, 1f, 1f)); // m_scene.AddNewSceneObject(sceneObject, true); // } -- cgit v1.1