aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteSimulationData.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-18 01:35:00 +0100
committerJustin Clark-Casey (justincc)2011-07-18 01:35:00 +0100
commitbdd340b9fc9c7935e4c6e3062759d49ffb92c871 (patch)
tree3728f6058b0d02ce3e1050efaeb5f23b8884baae /OpenSim/Data/SQLite/SQLiteSimulationData.cs
parentrefactor: group all the undo/redo code in SOP into one place for easier code ... (diff)
parentrefactor: Pull up Assembly of the SQLite classes as a protected property, so ... (diff)
downloadopensim-SC-bdd340b9fc9c7935e4c6e3062759d49ffb92c871.zip
opensim-SC-bdd340b9fc9c7935e4c6e3062759d49ffb92c871.tar.gz
opensim-SC-bdd340b9fc9c7935e4c6e3062759d49ffb92c871.tar.bz2
opensim-SC-bdd340b9fc9c7935e4c6e3062759d49ffb92c871.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteSimulationData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 377c680..5618772 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -74,6 +74,11 @@ namespace OpenSim.Data.SQLite
74 74
75 private String m_connectionString; 75 private String m_connectionString;
76 76
77 protected virtual Assembly Assembly
78 {
79 get { return GetType().Assembly; }
80 }
81
77 public SQLiteSimulationData() 82 public SQLiteSimulationData()
78 { 83 {
79 } 84 }
@@ -132,8 +137,7 @@ namespace OpenSim.Data.SQLite
132 SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn); 137 SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
133 regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd); 138 regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
134 // This actually does the roll forward assembly stuff 139 // This actually does the roll forward assembly stuff
135 Assembly assem = GetType().Assembly; 140 Migration m = new Migration(m_conn, Assembly, "RegionStore");
136 Migration m = new Migration(m_conn, assem, "RegionStore");
137 m.Update(); 141 m.Update();
138 142
139 lock (ds) 143 lock (ds)