Merge branch 'master' into bulletsim

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
 
         private String m_connectionString;
 
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
         public SQLiteSimulationData()
         {
         }
@@ -132,8 +137,7 @@ namespace OpenSim.Data.SQLite
                 SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
                 regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
                 // This actually does the roll forward assembly stuff
-                Assembly assem = GetType().Assembly;
-                Migration m = new Migration(m_conn, assem, "RegionStore");
+                Migration m = new Migration(m_conn, Assembly, "RegionStore");
                 m.Update();
 
                 lock (ds)