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. --- OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 4 +-- OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 6 ++-- OpenSim/Region/DataSnapshot/EstateSnapshot.cs | 6 ++-- OpenSim/Region/DataSnapshot/LandSnapshot.cs | 20 +++++++------- OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 32 +++++++++++----------- OpenSim/Region/DataSnapshot/SnapshotStore.cs | 4 +-- 6 files changed, 36 insertions(+), 36 deletions(-) (limited to 'OpenSim/Region/DataSnapshot') diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 7ddd072..8030b59 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs @@ -34,7 +34,7 @@ using log4net; using OpenSim.Region.Environment.Scenes; using OpenSim.Framework.Communications.Capabilities; using Caps = OpenSim.Framework.Communications.Capabilities.Caps; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework.Servers; namespace OpenSim.Region.DataSnapshot @@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot //harbl } - public void OnRegisterCaps(LLUUID agentID, Caps caps) + public void OnRegisterCaps(UUID agentID, Caps caps) { m_log.Info("[DATASNAPSHOT]: Registering service discovery capability for " + agentID); string capsBase = "/CAPS/" + caps.CapsObjectPath; diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index da72b61..46c9b3c 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs @@ -34,7 +34,7 @@ using System.Reflection; using System.Text; using System.Timers; using System.Xml; -using libsecondlife; +using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; @@ -42,7 +42,7 @@ using OpenSim.Framework.Communications; using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -using libsecondlife.Packets; +using OpenMetaverse.Packets; namespace OpenSim.Region.DataSnapshot { @@ -219,7 +219,7 @@ namespace OpenSim.Region.DataSnapshot return null; } - public Scene SceneForUUID(LLUUID id) + public Scene SceneForUUID(UUID id) { foreach (Scene scene in m_scenes) if (scene.RegionInfo.RegionID == id) diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs index eccdcf1..f25aad4 100644 --- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs @@ -27,7 +27,7 @@ using System; using System.Xml; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.Environment.Scenes; @@ -54,8 +54,8 @@ namespace OpenSim.Region.DataSnapshot.Providers //Now in DataSnapshotProvider module form! XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); - LLUUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID; - if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) + UUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID; + if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; // Can't fail because if it weren't in cache, we wouldn't be here diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index 930ea8f..b0ba29d 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs @@ -29,14 +29,14 @@ using System; using System.Collections.Generic; using System.Reflection; using System.Xml; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Modules.World.Land; using OpenSim.Region.Environment.Scenes; -using libsecondlife.Packets; +using OpenMetaverse.Packets; namespace OpenSim.Region.DataSnapshot.Providers { @@ -179,16 +179,16 @@ namespace OpenSim.Region.DataSnapshot.Providers //default location XmlNode tpLocation = nodeFactory.CreateNode(XmlNodeType.Element, "location", ""); - LLVector3 loc = parcel.UserLocation; - if (loc.Equals(LLVector3.Zero)) // This test is mute at this point: the location is wrong by default - loc = new LLVector3((parcel.AABBMax.X - parcel.AABBMin.X) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2); + Vector3 loc = parcel.UserLocation; + if (loc.Equals(Vector3.Zero)) // This test is mute at this point: the location is wrong by default + loc = new Vector3((parcel.AABBMax.X - parcel.AABBMin.X) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2); tpLocation.InnerText = loc.X.ToString() + "/" + loc.Y.ToString() + "/" + loc.Z.ToString(); xmlparcel.AppendChild(tpLocation); //TODO: figure how to figure out teleport system landData.landingType //land texture snapshot uuid - if (parcel.SnapshotID != LLUUID.Zero) + if (parcel.SnapshotID != UUID.Zero) { XmlNode textureuuid = nodeFactory.CreateNode(XmlNodeType.Element, "image", ""); textureuuid.InnerText = parcel.SnapshotID.ToString(); @@ -196,7 +196,7 @@ namespace OpenSim.Region.DataSnapshot.Providers } //attached user and group - if (parcel.GroupID != LLUUID.Zero) + if (parcel.GroupID != UUID.Zero) { XmlNode groupblock = nodeFactory.CreateNode(XmlNodeType.Element, "group", ""); XmlNode groupuuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); @@ -213,7 +213,7 @@ namespace OpenSim.Region.DataSnapshot.Providers { XmlNode userblock = nodeFactory.CreateNode(XmlNodeType.Element, "owner", ""); - LLUUID userOwnerUUID = parcel.OwnerID; + UUID userOwnerUUID = parcel.OwnerID; XmlNode useruuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); useruuid.InnerText = userOwnerUUID.ToString(); @@ -298,7 +298,7 @@ namespace OpenSim.Region.DataSnapshot.Providers IClientAPI remote_client) { this.Stale = true; }; client.OnParcelPropertiesUpdateRequest += delegate(LandUpdateArgs args, int local_id, IClientAPI remote_client) { this.Stale = true; }; - client.OnParcelBuy += delegate (LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, + client.OnParcelBuy += delegate (UUID agentId, UUID groupId, bool final, bool groupOwned, bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) { this.Stale = true; }; } @@ -315,4 +315,4 @@ namespace OpenSim.Region.DataSnapshot.Providers #endregion } -} \ No newline at end of file +} diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index d2a5051..c23c697 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs @@ -33,7 +33,7 @@ using log4net; using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.Environment.Scenes; using OpenSim.Framework; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Region.DataSnapshot.Providers { @@ -59,29 +59,29 @@ namespace OpenSim.Region.DataSnapshot.Providers //Detect object data changes by hooking into the IClientAPI. //Very dirty, and breaks whenever someone changes the client API. - client.OnAddPrim += delegate (LLUUID ownerID, LLVector3 RayEnd, LLQuaternion rot, - PrimitiveBaseShape shape, byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID, + client.OnAddPrim += delegate (UUID ownerID, Vector3 RayEnd, Quaternion rot, + PrimitiveBaseShape shape, byte bypassRaycast, Vector3 RayStart, UUID RayTargetID, byte RayEndIsIntersection) { this.Stale = true; }; client.OnLinkObjects += delegate (IClientAPI remoteClient, uint parent, List children) { this.Stale = true; }; client.OnDelinkObjects += delegate(List primIds) { this.Stale = true; }; - client.OnGrabUpdate += delegate(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, + client.OnGrabUpdate += delegate(UUID objectID, Vector3 offset, Vector3 grapPos, IClientAPI remoteClient) { this.Stale = true; }; client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, - LLQuaternion rot) { this.Stale = true; }; - client.OnObjectDuplicate += delegate(uint localID, LLVector3 offset, uint dupeFlags, LLUUID AgentID, - LLUUID GroupID) { this.Stale = true; }; - client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID, - LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, bool BypassRaycast, + Quaternion rot) { this.Stale = true; }; + client.OnObjectDuplicate += delegate(uint localID, Vector3 offset, uint dupeFlags, UUID AgentID, + UUID GroupID) { this.Stale = true; }; + client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID, + UUID RayTargetObj, Vector3 RayEnd, Vector3 RayStart, bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) { this.Stale = true; }; client.OnObjectIncludeInSearch += delegate(IClientAPI remoteClient, bool IncludeInSearch, uint localID) { this.Stale = true; }; - client.OnObjectPermissions += delegate(IClientAPI controller, LLUUID agentID, LLUUID sessionID, + client.OnObjectPermissions += delegate(IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set) { this.Stale = true; }; - client.OnRezObject += delegate(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, - LLVector3 RayStart, LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, + client.OnRezObject += delegate(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, + Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected, - bool RemoveItem, LLUUID fromTaskID) { this.Stale = true; }; + bool RemoveItem, UUID fromTaskID) { this.Stale = true; }; } public Scene GetParentScene @@ -105,11 +105,11 @@ namespace OpenSim.Region.DataSnapshot.Providers m_log.Debug("[DATASNAPSHOT]: Found object " + obj.Name + " in scene"); - if ((obj.RootPart.Flags & LLObject.ObjectFlags.JointWheel) == LLObject.ObjectFlags.JointWheel) { + if ((obj.RootPart.Flags & PrimFlags.JointWheel) == PrimFlags.JointWheel) { XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", ""); node = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); - node.InnerText = obj.UUID.ToString(); + node.InnerText = obj.ToString(); xmlobject.AppendChild(node); SceneObjectPart m_rootPart = null; @@ -170,4 +170,4 @@ namespace OpenSim.Region.DataSnapshot.Providers public event ProviderStale OnStale; } -} \ No newline at end of file +} diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs index e1a6651..d913cc5 100644 --- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs +++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs @@ -32,7 +32,7 @@ using System.Xml; using System.IO; using OpenSim.Region.Environment.Scenes; using OpenSim.Region.DataSnapshot.Interfaces; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Region.DataSnapshot { @@ -211,7 +211,7 @@ namespace OpenSim.Region.DataSnapshot private string DataFileNameScene(Scene scene) { return Path.Combine(m_directory, Path.ChangeExtension(scene.RegionInfo.RegionName, "xml")); - //return (m_snapsDir + Path.DirectorySeparatorChar + scene.RegionInfo.RegionName + ".xml"); + //return (m_snapsDir + Path.DirectorySeparatorChar + scene.RegionInfo.RegionName + ".Xml"); } private XmlNode MakeRegionNode(Scene scene, XmlDocument basedoc) -- cgit v1.1