4 files changed, 79 insertions, 39 deletions

diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index a743479..a22dc0a 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="asset">Asset UUID to create</param>
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
             lock (m_dbLock)
             {
@@ -203,12 +203,14 @@ namespace OpenSim.Data.MySQL
                             cmd.Parameters.AddWithValue("?data", asset.Data);
                             cmd.ExecuteNonQuery();
                             cmd.Dispose();
+                            return true;
                         }
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
                             asset.FullID, asset.Name, e.Message);
+                        return false;
                     }
                 }
             }
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 6d14b82..b201c51 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Data.MySQL
             Initialise(connectionString);
         }
 
-        public void Initialise(string connectionString)
+        public virtual void Initialise(string connectionString)
         {
             m_connectionString = connectionString;
 
@@ -113,7 +113,7 @@ namespace OpenSim.Data.MySQL
 
         public void Dispose() {}
 
-        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
+        public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
             uint flags = obj.RootPart.GetEffectiveObjectFlags();
 
@@ -241,7 +241,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void RemoveObject(UUID obj, UUID regionUUID)
+        public virtual void RemoveObject(UUID obj, UUID regionUUID)
         {
 //            m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID);
             
@@ -390,7 +390,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public List<SceneObjectGroup> LoadObjects(UUID regionID)
+        public virtual List<SceneObjectGroup> LoadObjects(UUID regionID)
         {
             const int ROWS_PER_QUERY = 5000;
 
@@ -559,7 +559,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void StoreTerrain(double[,] ter, UUID regionID)
+        public virtual void StoreTerrain(double[,] ter, UUID regionID)
         {
             m_log.Info("[REGION DB]: Storing terrain");
 
@@ -574,21 +574,35 @@ namespace OpenSim.Data.MySQL
                         cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
                         cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
 
-                        ExecuteNonQuery(cmd);
-
-                        cmd.CommandText = "insert into terrain (RegionUUID, " +
-                            "Revision, Heightfield) values (?RegionUUID, " +
-                            "1, ?Heightfield)";
+                        using (MySqlCommand cmd2 = dbcon.CreateCommand())
+                        {
+                            try
+                            {
+                                cmd2.CommandText = "insert into terrain (RegionUUID, " +
+                                        "Revision, Heightfield) values (?RegionUUID, " +
+                                        "1, ?Heightfield)";
 
-                        cmd.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter));
+                                cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                                cmd2.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter));
 
-                        ExecuteNonQuery(cmd);
+                                ExecuteNonQuery(cmd);
+                                ExecuteNonQuery(cmd2);
+                            }
+                            catch
+                            {
+                                // If we get here there is a NaN in the terrain
+                                // and the terrain can't be saved. A crash here
+                                // is much better than losing all the work
+                                m_log.ErrorFormat("[DATA]: Unable to save terrain. Stopping simulator to prevent data loss");
+                                Environment.Exit(1);
+                            }
+                        }
                     }
                 }
             }
         }
 
-        public double[,] LoadTerrain(UUID regionID)
+        public virtual double[,] LoadTerrain(UUID regionID)
         {
             double[,] terrain = null;
 
@@ -638,7 +652,7 @@ namespace OpenSim.Data.MySQL
             return terrain;
         }
 
-        public void RemoveLandObject(UUID globalID)
+        public virtual void RemoveLandObject(UUID globalID)
         {
             lock (m_dbLock)
             {
@@ -657,7 +671,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void StoreLandObject(ILandObject parcel)
+        public virtual void StoreLandObject(ILandObject parcel)
         {
             lock (m_dbLock)
             {
@@ -714,7 +728,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
+        public virtual RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             RegionLightShareData nWP = new RegionLightShareData();
             nWP.OnSave += StoreRegionWindlightSettings;
@@ -736,7 +750,7 @@ namespace OpenSim.Data.MySQL
                     {
                         //No result, so store our default windlight profile and return it
                         nWP.regionID = regionUUID;
-                        StoreRegionWindlightSettings(nWP);
+                        // StoreRegionWindlightSettings(nWP);
                         return nWP;
                     }
                     else
@@ -811,7 +825,7 @@ namespace OpenSim.Data.MySQL
             return nWP;
         }
 
-        public RegionSettings LoadRegionSettings(UUID regionUUID)
+        public virtual RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             RegionSettings rs = null;
 
@@ -849,7 +863,7 @@ namespace OpenSim.Data.MySQL
             return rs;
         }
 
-        public void StoreRegionWindlightSettings(RegionLightShareData wl)
+        public virtual void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -952,7 +966,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void RemoveRegionWindlightSettings(UUID regionID)
+        public virtual void RemoveRegionWindlightSettings(UUID regionID)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -967,7 +981,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void StoreRegionSettings(RegionSettings rs)
+        public virtual void StoreRegionSettings(RegionSettings rs)
         {
             lock (m_dbLock)
             {
@@ -994,7 +1008,7 @@ namespace OpenSim.Data.MySQL
                             "use_estate_sun, fixed_sun, sun_position, " +
                             "covenant, Sandbox, sunvectorx, sunvectory, " +
                             "sunvectorz, loaded_creation_datetime, " +
-                            "loaded_creation_id, map_tile_ID) values (?RegionUUID, ?BlockTerraform, " +
+                            "loaded_creation_id, map_tile_ID, block_search, casino) values (?RegionUUID, ?BlockTerraform, " +
                             "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
                             "?AllowLandResell, ?AllowLandJoinDivide, " +
                             "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
@@ -1009,7 +1023,7 @@ namespace OpenSim.Data.MySQL
                             "?SunPosition, ?Covenant, ?Sandbox, " +
                             "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                             "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                            "?TerrainImageID)";
+                            "?TerrainImageID, ?block_search, ?casino)";
 
                         FillRegionSettingsCommand(cmd, rs);
 
@@ -1019,7 +1033,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public List<LandData> LoadLandObjects(UUID regionUUID)
+        public virtual List<LandData> LoadLandObjects(UUID regionUUID)
         {
             List<LandData> landData = new List<LandData>();
 
@@ -1297,6 +1311,9 @@ namespace OpenSim.Data.MySQL
 
             newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]);
 
+            newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
+            newSettings.Casino = Convert.ToBoolean(row["casino"]);
+
             return newSettings;
         }
 
@@ -1626,6 +1643,8 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime);
             cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID);
             cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID);
+            cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
+            cmd.Parameters.AddWithValue("casino", settings.Casino);
 
         }
 
@@ -1784,7 +1803,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
         }
 
-        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
+        public virtual void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
             lock (m_dbLock)
             {
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index aa69d68..a18ac66 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -46,17 +46,21 @@ namespace OpenSim.Data.MySQL
         {
             string[] words = query.Split(new char[] {' '});
 
+            bool valid = false;
+
             for (int i = 0 ; i < words.Length ; i++)
             {
-                if (words[i].Length < 3)
-                {
-                    if (i != words.Length - 1)
-                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
-                    Array.Resize(ref words, words.Length - 1);
-                }
+                if (words[i].Length > 2)
+                    valid = true;
+//                if (words[i].Length < 3)
+//                {
+//                    if (i != words.Length - 1)
+//                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+//                    Array.Resize(ref words, words.Length - 1);
+//                }
             }
 
-            if (words.Length == 0)
+            if ((!valid) || words.Length == 0)
                 return new UserAccountData[0];
 
             if (words.Length > 2)
@@ -66,18 +70,33 @@ namespace OpenSim.Data.MySQL
 
             if (words.Length == 1)
             {
-                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm);
-                cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm);
+                cmd.Parameters.AddWithValue("?search", words[0] + "%");
                 cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
             }
             else
             {
-                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm);
-                cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
-                cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm);
+                cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%");
+                cmd.Parameters.AddWithValue("?searchLast", words[1] + "%");
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+            }
+
+            return DoQuery(cmd);
+        }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+
+            if (scopeID != UUID.Zero)
+            {
+                where = "(ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (" + where + ")";
                 cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
             }
 
+            cmd.CommandText = String.Format("select * from {0} where " + where, m_Realm);
+
             return DoQuery(cmd);
         }
     }
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 987625b..c2b130c 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -717,7 +717,7 @@ ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT
 
 COMMIT;
 
-:VERSION 32
+:VERSION 32                     #---------------------
 
 BEGIN;
 CREATE TABLE `regionwindlight` (