aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
diff options
context:
space:
mode:
authorMelanie2011-04-30 14:23:20 +0200
committerMelanie2011-04-30 14:23:20 +0200
commit27891fddcf64df71570a7831dc75cac2b02b95b6 (patch)
tree9c3848fe83b405b25cb08302ac3dd9c44b2331d6 /OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
parentSet the attachment data on scripted rez to allow toasters to work. (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-27891fddcf64df71570a7831dc75cac2b02b95b6.zip
opensim-SC_OLD-27891fddcf64df71570a7831dc75cac2b02b95b6.tar.gz
opensim-SC_OLD-27891fddcf64df71570a7831dc75cac2b02b95b6.tar.bz2
opensim-SC_OLD-27891fddcf64df71570a7831dc75cac2b02b95b6.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-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 904366e..19e8fa6 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