bad merge?

2026-08-01 22:26:09 +08:00 · 2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -2013,6 +2013,7 @@ namespace OpenSim.Data.SQLite
            return entry;
        }

+        /*
        /// <summary>
        ///
        /// </summary>
@@ -2944,6 +2945,11 @@ namespace OpenSim.Data.SQLite
            }
        }

+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
        public void SaveExtra(UUID regionID, string name, string value)
        {
        }