Merge branch 'master' into careminster-presence-refactor

2026-08-09 10:46:00 +08:00 · 2011-06-09 02:05:04 +01:00
parent a41051f1dd 49e4e53928
commit 326c46ba70
119 changed files with 6471 additions and 4318 deletions
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -223,6 +223,12 @@ namespace OpenSim.Framework
            set { m_metadata.Temporary = value; }
        }

+        public string CreatorID
+        {
+            get { return m_metadata.CreatorID; }
+            set { m_metadata.CreatorID = value; }
+        }
+
        public AssetFlags Flags
        {
            get { return m_metadata.Flags; }