diff options
author | Justin Clarke Casey | 2008-07-12 22:18:54 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-12 22:18:54 +0000 |
commit | da55f4d2aed3850ba237d6759446349ef39273eb (patch) | |
tree | a883d9457eded0da9ab33d13e9fb6bf043566647 /OpenSim | |
parent | * On archive loading, tell the user how many objects we are ignoring because ... (diff) | |
download | opensim-SC_OLD-da55f4d2aed3850ba237d6759446349ef39273eb.zip opensim-SC_OLD-da55f4d2aed3850ba237d6759446349ef39273eb.tar.gz opensim-SC_OLD-da55f4d2aed3850ba237d6759446349ef39273eb.tar.bz2 opensim-SC_OLD-da55f4d2aed3850ba237d6759446349ef39273eb.tar.xz |
* minor: comment out a couple of lines to eliminate nhibernate compile warnings for now
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateRegionData.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs index 9b91f76..a2caab1 100644 --- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs +++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Data.NHibernate | |||
52 | 52 | ||
53 | private Configuration cfg; | 53 | private Configuration cfg; |
54 | private ISessionFactory factory; | 54 | private ISessionFactory factory; |
55 | private ISession session; | 55 | //private ISession session; |
56 | 56 | ||
57 | public void Initialise() | 57 | public void Initialise() |
58 | { | 58 | { |
@@ -89,7 +89,7 @@ namespace OpenSim.Data.NHibernate | |||
89 | cfg.AddInputStream(stream); | 89 | cfg.AddInputStream(stream); |
90 | 90 | ||
91 | factory = cfg.BuildSessionFactory(); | 91 | factory = cfg.BuildSessionFactory(); |
92 | session = factory.OpenSession(); | 92 | //session = factory.OpenSession(); |
93 | 93 | ||
94 | // This actually does the roll forward assembly stuff | 94 | // This actually does the roll forward assembly stuff |
95 | Assembly assem = GetType().Assembly; | 95 | Assembly assem = GetType().Assembly; |
@@ -119,7 +119,7 @@ namespace OpenSim.Data.NHibernate | |||
119 | /// <param name="regionUUID">the region UUID</param> | 119 | /// <param name="regionUUID">the region UUID</param> |
120 | public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) | 120 | public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) |
121 | { | 121 | { |
122 | NHPrim[] prims = (NHPrim[]) obj.GetParts(); | 122 | //NHPrim[] prims = (NHPrim[]) obj.GetParts(); |
123 | } | 123 | } |
124 | 124 | ||
125 | /// <summary> | 125 | /// <summary> |
@@ -242,18 +242,18 @@ namespace OpenSim.Data.NHibernate | |||
242 | /// </summary> | 242 | /// </summary> |
243 | /// <param name="val"></param> | 243 | /// <param name="val"></param> |
244 | /// <returns></returns> | 244 | /// <returns></returns> |
245 | private static Array serializeTerrain(double[,] val) | 245 | // private static Array serializeTerrain(double[,] val) |
246 | { | 246 | // { |
247 | MemoryStream str = new MemoryStream(65536*sizeof (double)); | 247 | // MemoryStream str = new MemoryStream(65536*sizeof (double)); |
248 | BinaryWriter bw = new BinaryWriter(str); | 248 | // BinaryWriter bw = new BinaryWriter(str); |
249 | 249 | // | |
250 | // TODO: COMPATIBILITY - Add byte-order conversions | 250 | // // TODO: COMPATIBILITY - Add byte-order conversions |
251 | for (int x = 0; x < 256; x++) | 251 | // for (int x = 0; x < 256; x++) |
252 | for (int y = 0; y < 256; y++) | 252 | // for (int y = 0; y < 256; y++) |
253 | bw.Write(val[x, y]); | 253 | // bw.Write(val[x, y]); |
254 | 254 | // | |
255 | return str.ToArray(); | 255 | // return str.ToArray(); |
256 | } | 256 | // } |
257 | 257 | ||
258 | /// <summary> | 258 | /// <summary> |
259 | /// see IRegionDatastore | 259 | /// see IRegionDatastore |