Merge branch 'master' of /home/opensim/src/OpenSim/Core

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index c42c687..de72a6a 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -54,6 +54,11 @@ namespace OpenSim.Data.MySQL
         private Dictionary<string, FieldInfo> m_FieldMap =
                 new Dictionary<string, FieldInfo>();
 
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
         public MySQLEstateStore()
         {
         }
@@ -82,8 +87,7 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
-                Assembly assem = GetType().Assembly;
-                Migration m = new Migration(dbcon, assem, "EstateStore");
+                Migration m = new Migration(dbcon, Assembly, "EstateStore");
                 m.Update();
 
                 Type t = typeof(EstateSettings);