aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJeff Ames2008-05-16 13:33:57 +0000
committerJeff Ames2008-05-16 13:33:57 +0000
commit7fefb80abbde4bd8a9b19cb631736b5860274134 (patch)
treeb10ad0bb4a7e19bcdca675126320858b3427894f /OpenSim/Data
parentSet svn:ignore. Minor formatting cleanup. (diff)
downloadopensim-SC_OLD-7fefb80abbde4bd8a9b19cb631736b5860274134.zip
opensim-SC_OLD-7fefb80abbde4bd8a9b19cb631736b5860274134.tar.gz
opensim-SC_OLD-7fefb80abbde4bd8a9b19cb631736b5860274134.tar.bz2
opensim-SC_OLD-7fefb80abbde4bd8a9b19cb631736b5860274134.tar.xz
Minor cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs4
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs6
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs4
3 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 075f2e9..7163a92 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -78,8 +78,8 @@ namespace OpenSim.Data.NHibernate
78 cfg.AddAssembly("OpenSim.Data.NHibernate"); 78 cfg.AddAssembly("OpenSim.Data.NHibernate");
79 79
80 HbmSerializer.Default.Validate = true; 80 HbmSerializer.Default.Validate = true;
81 using ( MemoryStream stream = 81 using (MemoryStream stream =
82 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) 82 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
83 cfg.AddInputStream(stream); 83 cfg.AddInputStream(stream);
84 84
85 factory = cfg.BuildSessionFactory(); 85 factory = cfg.BuildSessionFactory();
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 228e0b6..902ecfb 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -75,8 +75,8 @@ namespace OpenSim.Data.NHibernate
75 cfg.AddAssembly("OpenSim.Data.NHibernate"); 75 cfg.AddAssembly("OpenSim.Data.NHibernate");
76 76
77 HbmSerializer.Default.Validate = true; 77 HbmSerializer.Default.Validate = true;
78 using ( MemoryStream stream = 78 using (MemoryStream stream =
79 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) 79 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
80 cfg.AddInputStream(stream); 80 cfg.AddInputStream(stream);
81 81
82 // If uncommented this will auto create tables, but it 82 // If uncommented this will auto create tables, but it
@@ -90,7 +90,6 @@ namespace OpenSim.Data.NHibernate
90 InitDB(); 90 InitDB();
91 } 91 }
92 92
93
94 private void InitDB() 93 private void InitDB()
95 { 94 {
96 string regex = @"no such table: Inventory"; 95 string regex = @"no such table: Inventory";
@@ -117,7 +116,6 @@ namespace OpenSim.Data.NHibernate
117 } 116 }
118 } 117 }
119 118
120
121 /***************************************************************** 119 /*****************************************************************
122 * 120 *
123 * Basic CRUD operations on Data 121 * Basic CRUD operations on Data
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 4de0291..678ec04 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -74,8 +74,8 @@ namespace OpenSim.Data.NHibernate
74 cfg.AddAssembly("OpenSim.Data.NHibernate"); 74 cfg.AddAssembly("OpenSim.Data.NHibernate");
75 75
76 HbmSerializer.Default.Validate = true; 76 HbmSerializer.Default.Validate = true;
77 using ( MemoryStream stream = 77 using (MemoryStream stream =
78 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) 78 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
79 cfg.AddInputStream(stream); 79 cfg.AddInputStream(stream);
80 80
81 // new SchemaExport(cfg).Create(true, true); 81 // new SchemaExport(cfg).Create(true, true);