diff options
author | Justin Clark-Casey (justincc) | 2011-04-28 23:43:42 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-28 23:43:42 +0100 |
commit | 5e578c97558c818a5d4738e140e9301dd2e86c44 (patch) | |
tree | 4bf3535e10e6dbcb1e5660115fc4c7c274da0e8e /OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs | |
parent | Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim. (diff) | |
parent | Added MrMonkE to the contributors. Fixed contributors. (diff) | |
download | opensim-SC-5e578c97558c818a5d4738e140e9301dd2e86c44.zip opensim-SC-5e578c97558c818a5d4738e140e9301dd2e86c44.tar.gz opensim-SC-5e578c97558c818a5d4738e140e9301dd2e86c44.tar.bz2 opensim-SC-5e578c97558c818a5d4738e140e9301dd2e86c44.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.cs | 6 |
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 | ||