aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorSean Dague2008-07-17 20:58:23 +0000
committerSean Dague2008-07-17 20:58:23 +0000
commit50eab185905897af8a94464402eb942d55d99213 (patch)
treec44bdc057566bc99ca2b813ee31db16d98bc21d6 /OpenSim/Data
parentfirst pass at Terrain implementation (diff)
downloadopensim-SC_OLD-50eab185905897af8a94464402eb942d55d99213.zip
opensim-SC_OLD-50eab185905897af8a94464402eb942d55d99213.tar.gz
opensim-SC_OLD-50eab185905897af8a94464402eb942d55d99213.tar.bz2
opensim-SC_OLD-50eab185905897af8a94464402eb942d55d99213.tar.xz
need to synchronize the terrain updates
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index fb0a545..2167002 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -138,7 +138,7 @@ namespace OpenSim.Data.NHibernate
138 } 138 }
139 catch (Exception e) 139 catch (Exception e)
140 { 140 {
141 m_log.Error("[NHIBERNATE] issue saving asset", e); 141 m_log.Error("[NHIBERNATE] issue saving prim", e);
142 } 142 }
143 } 143 }
144 144
@@ -166,7 +166,7 @@ namespace OpenSim.Data.NHibernate
166 } 166 }
167 catch (Exception e) 167 catch (Exception e)
168 { 168 {
169 m_log.Error("[NHIBERNATE] issue saving asset", e); 169 m_log.Error("[NHIBERNATE] issue saving terrain", e);
170 } 170 }
171 } 171 }
172 172
@@ -280,8 +280,10 @@ namespace OpenSim.Data.NHibernate
280 /// <param name="regionID">region UUID</param> 280 /// <param name="regionID">region UUID</param>
281 public void StoreTerrain(double[,] ter, LLUUID regionID) 281 public void StoreTerrain(double[,] ter, LLUUID regionID)
282 { 282 {
283 Terrain t = new Terrain(regionID, ter); 283 lock (this) {
284 SaveOrUpdate(t); 284 Terrain t = new Terrain(regionID, ter);
285 SaveOrUpdate(t);
286 }
285 } 287 }
286 288
287 /// <summary> 289 /// <summary>