aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
diff options
context:
space:
mode:
authorDan Lake2011-04-29 15:49:49 -0700
committerDan Lake2011-04-29 15:49:49 -0700
commit8f14c3f04f6f4ddeafdfc83c1719ec5cddfe7dfe (patch)
treebe718fbb3ab2e404b5cb650d544eec86abb0bb42 /OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
parentFix crash when [Mesh] section is missing from configuration files (diff)
parentMinor correction to yesterday's changes. Make normal prim crossing (no attach... (diff)
downloadopensim-SC-8f14c3f04f6f4ddeafdfc83c1719ec5cddfe7dfe.zip
opensim-SC-8f14c3f04f6f4ddeafdfc83c1719ec5cddfe7dfe.tar.gz
opensim-SC-8f14c3f04f6f4ddeafdfc83c1719ec5cddfe7dfe.tar.bz2
opensim-SC-8f14c3f04f6f4ddeafdfc83c1719ec5cddfe7dfe.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
index 6a5d6eb..f5492b3 100644
--- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
@@ -56,15 +56,15 @@ namespace OpenSim.Data.MSSQL
56 string realm, string storeName) 56 string realm, string storeName)
57 { 57 {
58 m_Realm = realm; 58 m_Realm = realm;
59
60 m_ConnectionString = connectionString;
59 61
60 if (storeName != String.Empty) 62 if (storeName != String.Empty)
61 { 63 {
62 Assembly assem = GetType().Assembly;
63 m_ConnectionString = connectionString;
64 using (SqlConnection conn = new SqlConnection(m_ConnectionString)) 64 using (SqlConnection conn = new SqlConnection(m_ConnectionString))
65 { 65 {
66 conn.Open(); 66 conn.Open();
67 Migration m = new Migration(conn, assem, storeName); 67 Migration m = new Migration(conn, GetType().Assembly, storeName);
68 m.Update(); 68 m.Update();
69 } 69 }
70 70