aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate/NHibernateRegionData.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 9682d87..07bf05c 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using NHibernate; 36using NHibernate;
37using NHibernate.Cfg; 37using NHibernate.Cfg;
@@ -109,7 +109,7 @@ namespace OpenSim.Data.NHibernate
109 { 109 {
110 } 110 }
111 111
112 public RegionSettings LoadRegionSettings(LLUUID regionUUID) 112 public RegionSettings LoadRegionSettings(UUID regionUUID)
113 { 113 {
114 return null; 114 return null;
115 } 115 }
@@ -162,7 +162,7 @@ namespace OpenSim.Data.NHibernate
162 /// </summary> 162 /// </summary>
163 /// <param name="obj">the object</param> 163 /// <param name="obj">the object</param>
164 /// <param name="regionUUID">the region UUID</param> 164 /// <param name="regionUUID">the region UUID</param>
165 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 165 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
166 { 166 {
167 try 167 try
168 { 168 {
@@ -179,7 +179,7 @@ namespace OpenSim.Data.NHibernate
179 } 179 }
180 } 180 }
181 181
182 private SceneObjectGroup LoadObject(LLUUID uuid, LLUUID region) 182 private SceneObjectGroup LoadObject(UUID uuid, UUID region)
183 { 183 {
184 SceneObjectGroup group = new SceneObjectGroup(); 184 SceneObjectGroup group = new SceneObjectGroup();
185 185
@@ -210,7 +210,7 @@ namespace OpenSim.Data.NHibernate
210 /// </summary> 210 /// </summary>
211 /// <param name="obj">the object</param> 211 /// <param name="obj">the object</param>
212 /// <param name="regionUUID">the region UUID</param> 212 /// <param name="regionUUID">the region UUID</param>
213 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 213 public void RemoveObject(UUID obj, UUID regionUUID)
214 { 214 {
215 SceneObjectGroup g = LoadObject(obj, regionUUID); 215 SceneObjectGroup g = LoadObject(obj, regionUUID);
216 foreach (SceneObjectPart p in g.Children.Values) 216 foreach (SceneObjectPart p in g.Children.Values)
@@ -219,7 +219,7 @@ namespace OpenSim.Data.NHibernate
219 } 219 }
220 session.Flush(); 220 session.Flush();
221 221
222 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 222 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
223 223
224 } 224 }
225 225
@@ -228,9 +228,9 @@ namespace OpenSim.Data.NHibernate
228 /// </summary> 228 /// </summary>
229 /// <param name="regionUUID">The region UUID</param> 229 /// <param name="regionUUID">The region UUID</param>
230 /// <returns>List of loaded groups</returns> 230 /// <returns>List of loaded groups</returns>
231 public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) 231 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
232 { 232 {
233 Dictionary<LLUUID, SceneObjectGroup> SOG = new Dictionary<LLUUID, SceneObjectGroup>(); 233 Dictionary<UUID, SceneObjectGroup> SOG = new Dictionary<UUID, SceneObjectGroup>();
234 List<SceneObjectGroup> ret = new List<SceneObjectGroup>(); 234 List<SceneObjectGroup> ret = new List<SceneObjectGroup>();
235 235
236 ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart)); 236 ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart));
@@ -276,7 +276,7 @@ namespace OpenSim.Data.NHibernate
276 /// </summary> 276 /// </summary>
277 /// <param name="ter">terrain heightfield</param> 277 /// <param name="ter">terrain heightfield</param>
278 /// <param name="regionID">region UUID</param> 278 /// <param name="regionID">region UUID</param>
279 public void StoreTerrain(double[,] ter, LLUUID regionID) 279 public void StoreTerrain(double[,] ter, UUID regionID)
280 { 280 {
281 lock (this) { 281 lock (this) {
282 Terrain t = new Terrain(regionID, ter); 282 Terrain t = new Terrain(regionID, ter);
@@ -289,7 +289,7 @@ namespace OpenSim.Data.NHibernate
289 /// </summary> 289 /// </summary>
290 /// <param name="regionID">the region UUID</param> 290 /// <param name="regionID">the region UUID</param>
291 /// <returns>Heightfield data</returns> 291 /// <returns>Heightfield data</returns>
292 public double[,] LoadTerrain(LLUUID regionID) 292 public double[,] LoadTerrain(UUID regionID)
293 { 293 {
294 try 294 try
295 { 295 {
@@ -307,7 +307,7 @@ namespace OpenSim.Data.NHibernate
307 /// 307 ///
308 /// </summary> 308 /// </summary>
309 /// <param name="globalID"></param> 309 /// <param name="globalID"></param>
310 public void RemoveLandObject(LLUUID globalID) 310 public void RemoveLandObject(UUID globalID)
311 { 311 {
312 312
313 } 313 }
@@ -326,7 +326,7 @@ namespace OpenSim.Data.NHibernate
326 /// </summary> 326 /// </summary>
327 /// <param name="regionUUID"></param> 327 /// <param name="regionUUID"></param>
328 /// <returns></returns> 328 /// <returns></returns>
329 public List<LandData> LoadLandObjects(LLUUID regionUUID) 329 public List<LandData> LoadLandObjects(UUID regionUUID)
330 { 330 {
331 List<LandData> landDataForRegion = new List<LandData>(); 331 List<LandData> landDataForRegion = new List<LandData>();
332 332
@@ -347,7 +347,7 @@ namespace OpenSim.Data.NHibernate
347 /// </summary> 347 /// </summary>
348 /// <param name="regionUUID">the region UUID</param> 348 /// <param name="regionUUID">the region UUID</param>
349 /// <returns>The banlist</returns> 349 /// <returns>The banlist</returns>
350 public List<EstateBan> LoadRegionBanList(LLUUID regionUUID) 350 public List<EstateBan> LoadRegionBanList(UUID regionUUID)
351 { 351 {
352 List<EstateBan> regionbanlist = new List<EstateBan>(); 352 List<EstateBan> regionbanlist = new List<EstateBan>();
353 353
@@ -395,7 +395,7 @@ namespace OpenSim.Data.NHibernate
395 /// </summary> 395 /// </summary>
396 /// <param name="primID"></param> 396 /// <param name="primID"></param>
397 /// <param name="items"></param> 397 /// <param name="items"></param>
398 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 398 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
399 { 399 {
400 ICriteria criteria = session.CreateCriteria(typeof(TaskInventoryItem)); 400 ICriteria criteria = session.CreateCriteria(typeof(TaskInventoryItem));
401 criteria.Add(Expression.Eq("ParentPartID", primID)); 401 criteria.Add(Expression.Eq("ParentPartID", primID));