Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
2026-08-10 03:06:05 +08:00 · 2012-01-30 16:38:11 +00:00
parent 9a86a713d3 3de534896e
commit 1b600e7803
3 changed files with 18 additions and 2 deletions
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -373,6 +373,14 @@ namespace OpenSim.Framework
            set { m_SunVector = value; }
        }

+        private UUID m_ParcelImageID;
+
+        public UUID ParcelImageID
+        {
+            get { return m_ParcelImageID; }
+            set { m_ParcelImageID = value; }
+        }
+
        private UUID m_TerrainImageID;

        public UUID TerrainImageID