aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate/NHibernateRegionData.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 78db52d..5af3d1a 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Data.NHibernate
63 63
64 public void StoreRegionSettings(RegionSettings rs) 64 public void StoreRegionSettings(RegionSettings rs)
65 { 65 {
66 RegionSettings oldRegionSettings = (RegionSettings)manager.Load(typeof(RegionSettings), rs.RegionUUID); 66 RegionSettings oldRegionSettings = (RegionSettings)manager.Get(typeof(RegionSettings), rs.RegionUUID);
67 if (oldRegionSettings != null) 67 if (oldRegionSettings != null)
68 { 68 {
69 manager.Update(rs); 69 manager.Update(rs);
@@ -76,7 +76,7 @@ namespace OpenSim.Data.NHibernate
76 76
77 public RegionSettings LoadRegionSettings(UUID regionUUID) 77 public RegionSettings LoadRegionSettings(UUID regionUUID)
78 { 78 {
79 RegionSettings regionSettings = (RegionSettings) manager.Load(typeof(RegionSettings), regionUUID); 79 RegionSettings regionSettings = (RegionSettings) manager.Get(typeof(RegionSettings), regionUUID);
80 80
81 if (regionSettings == null) 81 if (regionSettings == null)
82 { 82 {
@@ -96,7 +96,7 @@ namespace OpenSim.Data.NHibernate
96 { 96 {
97 try 97 try
98 { 98 {
99 SceneObjectPart old = (SceneObjectPart)manager.Load(typeof(SceneObjectPart), p.UUID); 99 SceneObjectPart old = (SceneObjectPart)manager.Get(typeof(SceneObjectPart), p.UUID);
100 if (old != null) 100 if (old != null)
101 { 101 {
102 m_log.InfoFormat("[NHIBERNATE] updating object {0}", p.UUID); 102 m_log.InfoFormat("[NHIBERNATE] updating object {0}", p.UUID);
@@ -120,7 +120,7 @@ namespace OpenSim.Data.NHibernate
120 try 120 try
121 { 121 {
122 122
123 Terrain old = (Terrain)manager.Load(typeof(Terrain), t.RegionID); 123 Terrain old = (Terrain)manager.Get(typeof(Terrain), t.RegionID);
124 if (old != null) 124 if (old != null)
125 { 125 {
126 m_log.InfoFormat("[NHIBERNATE] updating terrain {0}", t.RegionID); 126 m_log.InfoFormat("[NHIBERNATE] updating terrain {0}", t.RegionID);
@@ -279,7 +279,7 @@ namespace OpenSim.Data.NHibernate
279 /// <returns>Heightfield data</returns> 279 /// <returns>Heightfield data</returns>
280 public double[,] LoadTerrain(UUID regionID) 280 public double[,] LoadTerrain(UUID regionID)
281 { 281 {
282 Terrain t = (Terrain)manager.Load(typeof(Terrain), regionID); 282 Terrain t = (Terrain)manager.Get(typeof(Terrain), regionID);
283 if (t != null) 283 if (t != null)
284 { 284 {
285 return t.Doubles; 285 return t.Doubles;