aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/DataSnapshot
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* 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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs6
-rw-r--r--OpenSim/Region/DataSnapshot/EstateSnapshot.cs6
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs20
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs32
-rw-r--r--OpenSim/Region/DataSnapshot/SnapshotStore.cs4
6 files changed, 36 insertions, 36 deletions
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;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Framework.Communications.Capabilities; 35using OpenSim.Framework.Communications.Capabilities;
36using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 36using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
37using libsecondlife; 37using OpenMetaverse;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39 39
40namespace OpenSim.Region.DataSnapshot 40namespace OpenSim.Region.DataSnapshot
@@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot
64 //harbl 64 //harbl
65 } 65 }
66 66
67 public void OnRegisterCaps(LLUUID agentID, Caps caps) 67 public void OnRegisterCaps(UUID agentID, Caps caps)
68 { 68 {
69 m_log.Info("[DATASNAPSHOT]: Registering service discovery capability for " + agentID); 69 m_log.Info("[DATASNAPSHOT]: Registering service discovery capability for " + agentID);
70 string capsBase = "/CAPS/" + caps.CapsObjectPath; 70 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;
34using System.Text; 34using System.Text;
35using System.Timers; 35using System.Timers;
36using System.Xml; 36using System.Xml;
37using libsecondlife; 37using OpenMetaverse;
38using log4net; 38using log4net;
39using Nini.Config; 39using Nini.Config;
40using OpenSim.Framework; 40using OpenSim.Framework;
@@ -42,7 +42,7 @@ using OpenSim.Framework.Communications;
42using OpenSim.Region.DataSnapshot.Interfaces; 42using OpenSim.Region.DataSnapshot.Interfaces;
43using OpenSim.Region.Environment.Interfaces; 43using OpenSim.Region.Environment.Interfaces;
44using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Environment.Scenes;
45using libsecondlife.Packets; 45using OpenMetaverse.Packets;
46 46
47namespace OpenSim.Region.DataSnapshot 47namespace OpenSim.Region.DataSnapshot
48{ 48{
@@ -219,7 +219,7 @@ namespace OpenSim.Region.DataSnapshot
219 return null; 219 return null;
220 } 220 }
221 221
222 public Scene SceneForUUID(LLUUID id) 222 public Scene SceneForUUID(UUID id)
223 { 223 {
224 foreach (Scene scene in m_scenes) 224 foreach (Scene scene in m_scenes)
225 if (scene.RegionInfo.RegionID == id) 225 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 @@
27 27
28using System; 28using System;
29using System.Xml; 29using System.Xml;
30using libsecondlife; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.DataSnapshot.Interfaces; 32using OpenSim.Region.DataSnapshot.Interfaces;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
@@ -54,8 +54,8 @@ namespace OpenSim.Region.DataSnapshot.Providers
54 //Now in DataSnapshotProvider module form! 54 //Now in DataSnapshotProvider module form!
55 XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); 55 XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", "");
56 56
57 LLUUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID; 57 UUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID;
58 if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) 58 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
59 ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; 59 ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner;
60 60
61 // Can't fail because if it weren't in cache, we wouldn't be here 61 // 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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Xml; 31using System.Xml;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.DataSnapshot.Interfaces; 35using OpenSim.Region.DataSnapshot.Interfaces;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Modules.World.Land; 37using OpenSim.Region.Environment.Modules.World.Land;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39using libsecondlife.Packets; 39using OpenMetaverse.Packets;
40 40
41namespace OpenSim.Region.DataSnapshot.Providers 41namespace OpenSim.Region.DataSnapshot.Providers
42{ 42{
@@ -179,16 +179,16 @@ namespace OpenSim.Region.DataSnapshot.Providers
179 179
180 //default location 180 //default location
181 XmlNode tpLocation = nodeFactory.CreateNode(XmlNodeType.Element, "location", ""); 181 XmlNode tpLocation = nodeFactory.CreateNode(XmlNodeType.Element, "location", "");
182 LLVector3 loc = parcel.UserLocation; 182 Vector3 loc = parcel.UserLocation;
183 if (loc.Equals(LLVector3.Zero)) // This test is mute at this point: the location is wrong by default 183 if (loc.Equals(Vector3.Zero)) // This test is mute at this point: the location is wrong by default
184 loc = new LLVector3((parcel.AABBMax.X - parcel.AABBMin.X) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2); 184 loc = new Vector3((parcel.AABBMax.X - parcel.AABBMin.X) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2);
185 tpLocation.InnerText = loc.X.ToString() + "/" + loc.Y.ToString() + "/" + loc.Z.ToString(); 185 tpLocation.InnerText = loc.X.ToString() + "/" + loc.Y.ToString() + "/" + loc.Z.ToString();
186 xmlparcel.AppendChild(tpLocation); 186 xmlparcel.AppendChild(tpLocation);
187 187
188 //TODO: figure how to figure out teleport system landData.landingType 188 //TODO: figure how to figure out teleport system landData.landingType
189 189
190 //land texture snapshot uuid 190 //land texture snapshot uuid
191 if (parcel.SnapshotID != LLUUID.Zero) 191 if (parcel.SnapshotID != UUID.Zero)
192 { 192 {
193 XmlNode textureuuid = nodeFactory.CreateNode(XmlNodeType.Element, "image", ""); 193 XmlNode textureuuid = nodeFactory.CreateNode(XmlNodeType.Element, "image", "");
194 textureuuid.InnerText = parcel.SnapshotID.ToString(); 194 textureuuid.InnerText = parcel.SnapshotID.ToString();
@@ -196,7 +196,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
196 } 196 }
197 197
198 //attached user and group 198 //attached user and group
199 if (parcel.GroupID != LLUUID.Zero) 199 if (parcel.GroupID != UUID.Zero)
200 { 200 {
201 XmlNode groupblock = nodeFactory.CreateNode(XmlNodeType.Element, "group", ""); 201 XmlNode groupblock = nodeFactory.CreateNode(XmlNodeType.Element, "group", "");
202 XmlNode groupuuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); 202 XmlNode groupuuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", "");
@@ -213,7 +213,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
213 { 213 {
214 XmlNode userblock = nodeFactory.CreateNode(XmlNodeType.Element, "owner", ""); 214 XmlNode userblock = nodeFactory.CreateNode(XmlNodeType.Element, "owner", "");
215 215
216 LLUUID userOwnerUUID = parcel.OwnerID; 216 UUID userOwnerUUID = parcel.OwnerID;
217 217
218 XmlNode useruuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); 218 XmlNode useruuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", "");
219 useruuid.InnerText = userOwnerUUID.ToString(); 219 useruuid.InnerText = userOwnerUUID.ToString();
@@ -298,7 +298,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
298 IClientAPI remote_client) { this.Stale = true; }; 298 IClientAPI remote_client) { this.Stale = true; };
299 client.OnParcelPropertiesUpdateRequest += delegate(LandUpdateArgs args, int local_id, 299 client.OnParcelPropertiesUpdateRequest += delegate(LandUpdateArgs args, int local_id,
300 IClientAPI remote_client) { this.Stale = true; }; 300 IClientAPI remote_client) { this.Stale = true; };
301 client.OnParcelBuy += delegate (LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, 301 client.OnParcelBuy += delegate (UUID agentId, UUID groupId, bool final, bool groupOwned,
302 bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) 302 bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated)
303 { this.Stale = true; }; 303 { this.Stale = true; };
304 } 304 }
@@ -315,4 +315,4 @@ namespace OpenSim.Region.DataSnapshot.Providers
315 315
316 #endregion 316 #endregion
317 } 317 }
318} \ No newline at end of file 318}
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;
33using OpenSim.Region.DataSnapshot.Interfaces; 33using OpenSim.Region.DataSnapshot.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using libsecondlife; 36using OpenMetaverse;
37 37
38namespace OpenSim.Region.DataSnapshot.Providers 38namespace OpenSim.Region.DataSnapshot.Providers
39{ 39{
@@ -59,29 +59,29 @@ namespace OpenSim.Region.DataSnapshot.Providers
59 //Detect object data changes by hooking into the IClientAPI. 59 //Detect object data changes by hooking into the IClientAPI.
60 //Very dirty, and breaks whenever someone changes the client API. 60 //Very dirty, and breaks whenever someone changes the client API.
61 61
62 client.OnAddPrim += delegate (LLUUID ownerID, LLVector3 RayEnd, LLQuaternion rot, 62 client.OnAddPrim += delegate (UUID ownerID, Vector3 RayEnd, Quaternion rot,
63 PrimitiveBaseShape shape, byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID, 63 PrimitiveBaseShape shape, byte bypassRaycast, Vector3 RayStart, UUID RayTargetID,
64 byte RayEndIsIntersection) { this.Stale = true; }; 64 byte RayEndIsIntersection) { this.Stale = true; };
65 client.OnLinkObjects += delegate (IClientAPI remoteClient, uint parent, List<uint> children) 65 client.OnLinkObjects += delegate (IClientAPI remoteClient, uint parent, List<uint> children)
66 { this.Stale = true; }; 66 { this.Stale = true; };
67 client.OnDelinkObjects += delegate(List<uint> primIds) { this.Stale = true; }; 67 client.OnDelinkObjects += delegate(List<uint> primIds) { this.Stale = true; };
68 client.OnGrabUpdate += delegate(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, 68 client.OnGrabUpdate += delegate(UUID objectID, Vector3 offset, Vector3 grapPos,
69 IClientAPI remoteClient) { this.Stale = true; }; 69 IClientAPI remoteClient) { this.Stale = true; };
70 client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, 70 client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt,
71 LLQuaternion rot) { this.Stale = true; }; 71 Quaternion rot) { this.Stale = true; };
72 client.OnObjectDuplicate += delegate(uint localID, LLVector3 offset, uint dupeFlags, LLUUID AgentID, 72 client.OnObjectDuplicate += delegate(uint localID, Vector3 offset, uint dupeFlags, UUID AgentID,
73 LLUUID GroupID) { this.Stale = true; }; 73 UUID GroupID) { this.Stale = true; };
74 client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID, 74 client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID,
75 LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, bool BypassRaycast, 75 UUID RayTargetObj, Vector3 RayEnd, Vector3 RayStart, bool BypassRaycast,
76 bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) { this.Stale = true; }; 76 bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) { this.Stale = true; };
77 client.OnObjectIncludeInSearch += delegate(IClientAPI remoteClient, bool IncludeInSearch, uint localID) 77 client.OnObjectIncludeInSearch += delegate(IClientAPI remoteClient, bool IncludeInSearch, uint localID)
78 { this.Stale = true; }; 78 { this.Stale = true; };
79 client.OnObjectPermissions += delegate(IClientAPI controller, LLUUID agentID, LLUUID sessionID, 79 client.OnObjectPermissions += delegate(IClientAPI controller, UUID agentID, UUID sessionID,
80 byte field, uint localId, uint mask, byte set) { this.Stale = true; }; 80 byte field, uint localId, uint mask, byte set) { this.Stale = true; };
81 client.OnRezObject += delegate(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, 81 client.OnRezObject += delegate(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd,
82 LLVector3 RayStart, LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 82 Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
83 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected, 83 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected,
84 bool RemoveItem, LLUUID fromTaskID) { this.Stale = true; }; 84 bool RemoveItem, UUID fromTaskID) { this.Stale = true; };
85 } 85 }
86 86
87 public Scene GetParentScene 87 public Scene GetParentScene
@@ -105,11 +105,11 @@ namespace OpenSim.Region.DataSnapshot.Providers
105 105
106 m_log.Debug("[DATASNAPSHOT]: Found object " + obj.Name + " in scene"); 106 m_log.Debug("[DATASNAPSHOT]: Found object " + obj.Name + " in scene");
107 107
108 if ((obj.RootPart.Flags & LLObject.ObjectFlags.JointWheel) == LLObject.ObjectFlags.JointWheel) { 108 if ((obj.RootPart.Flags & PrimFlags.JointWheel) == PrimFlags.JointWheel) {
109 XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", ""); 109 XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", "");
110 110
111 node = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); 111 node = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", "");
112 node.InnerText = obj.UUID.ToString(); 112 node.InnerText = obj.ToString();
113 xmlobject.AppendChild(node); 113 xmlobject.AppendChild(node);
114 114
115 SceneObjectPart m_rootPart = null; 115 SceneObjectPart m_rootPart = null;
@@ -170,4 +170,4 @@ namespace OpenSim.Region.DataSnapshot.Providers
170 170
171 public event ProviderStale OnStale; 171 public event ProviderStale OnStale;
172 } 172 }
173} \ No newline at end of file 173}
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;
32using System.IO; 32using System.IO;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
34using OpenSim.Region.DataSnapshot.Interfaces; 34using OpenSim.Region.DataSnapshot.Interfaces;
35using libsecondlife; 35using OpenMetaverse;
36 36
37namespace OpenSim.Region.DataSnapshot 37namespace OpenSim.Region.DataSnapshot
38{ 38{
@@ -211,7 +211,7 @@ namespace OpenSim.Region.DataSnapshot
211 private string DataFileNameScene(Scene scene) 211 private string DataFileNameScene(Scene scene)
212 { 212 {
213 return Path.Combine(m_directory, Path.ChangeExtension(scene.RegionInfo.RegionName, "xml")); 213 return Path.Combine(m_directory, Path.ChangeExtension(scene.RegionInfo.RegionName, "xml"));
214 //return (m_snapsDir + Path.DirectorySeparatorChar + scene.RegionInfo.RegionName + ".xml"); 214 //return (m_snapsDir + Path.DirectorySeparatorChar + scene.RegionInfo.RegionName + ".Xml");
215 } 215 }
216 216
217 private XmlNode MakeRegionNode(Scene scene, XmlDocument basedoc) 217 private XmlNode MakeRegionNode(Scene scene, XmlDocument basedoc)