Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2026-08-04 08:06:27 +08:00 · 2012-02-01 10:08:45 +00:00
parent 727ddffb71 003bd9f1b3
commit 16aa00e944
7 changed files with 305 additions and 43 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -327,6 +327,12 @@ namespace OpenSim.Region.Framework.Scenes
            set { RootPart.Name = value; }
        }

+        public string Description
+        {
+            get { return RootPart.Description; }
+            set { RootPart.Description = value; }
+        }
+
        /// <summary>
        /// Added because the Parcel code seems to use it
        /// but not sure a object should have this