Merge branch 'master' into careminster-presence-refactor

2026-08-05 08:55:56 +08:00 · 2011-07-05 04:01:59 +01:00
parent 719e0702be af8773d6d0
commit 47cf9c8fe0
26 changed files with 766 additions and 315 deletions
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -281,6 +281,7 @@ namespace OpenSim.Framework

                return m_id;
            }
+            
            set
            {
                UUID uuid = UUID.Zero;