diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/LandData.cs | 15 |
2 files changed, 18 insertions, 5 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs index cc799ca..511c8d8 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | |||
@@ -289,17 +289,17 @@ namespace OpenSim.Framework.Data.MySQL | |||
289 | return terret; | 289 | return terret; |
290 | } | 290 | } |
291 | 291 | ||
292 | public void RemoveLandObject(uint id) | 292 | public void RemoveLandObject(uint id, LLUUID regionUUID) |
293 | { | 293 | { |
294 | } | 294 | } |
295 | 295 | ||
296 | public void StoreParcel(Land parcel) | 296 | public void StoreLandObject(Land parcel, LLUUID regionUUID) |
297 | { | 297 | { |
298 | } | 298 | } |
299 | 299 | ||
300 | public List<Land> LoadLandObjects() | 300 | public List<Framework.LandData> LoadLandObjects(LLUUID regionUUID) |
301 | { | 301 | { |
302 | return new List<Land>(); | 302 | return new List<LandData>(); |
303 | } | 303 | } |
304 | 304 | ||
305 | private void DisplayDataSet(DataSet ds, string title) | 305 | private void DisplayDataSet(DataSet ds, string title) |
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 8b6c654..e35aa0e 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | 29 | using System.Collections.Generic; | |
30 | namespace OpenSim.Framework | 30 | namespace OpenSim.Framework |
31 | { | 31 | { |
32 | public class LandData | 32 | public class LandData |
@@ -74,6 +74,8 @@ namespace OpenSim.Framework | |||
74 | public LLVector3 userLocation = new LLVector3(); | 74 | public LLVector3 userLocation = new LLVector3(); |
75 | public LLVector3 userLookAt = new LLVector3(); | 75 | public LLVector3 userLookAt = new LLVector3(); |
76 | 76 | ||
77 | public List<ParcelManager.ParcelAccessEntry> parcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); | ||
78 | |||
77 | public LandData() | 79 | public LandData() |
78 | { | 80 | { |
79 | globalID = LLUUID.Random(); | 81 | globalID = LLUUID.Random(); |
@@ -117,6 +119,17 @@ namespace OpenSim.Framework | |||
117 | landData.userLocation = userLocation; | 119 | landData.userLocation = userLocation; |
118 | landData.userLookAt = userLookAt; | 120 | landData.userLookAt = userLookAt; |
119 | 121 | ||
122 | landData.parcelAccessList.Clear(); | ||
123 | foreach (ParcelManager.ParcelAccessEntry entry in parcelAccessList) | ||
124 | { | ||
125 | ParcelManager.ParcelAccessEntry newEntry = new ParcelManager.ParcelAccessEntry(); | ||
126 | newEntry.AgentID = entry.AgentID; | ||
127 | newEntry.Flags = entry.Flags; | ||
128 | newEntry.Time = entry.Time; | ||
129 | |||
130 | landData.parcelAccessList.Add(newEntry); | ||
131 | } | ||
132 | |||
120 | return landData; | 133 | return landData; |
121 | } | 134 | } |
122 | } | 135 | } |