Merge branch 'master' into careminster-presence-refactor

2026-08-06 01:06:30 +08:00 · 2010-04-19 07:00:40 +01:00
parent 72d380acf0 21cad5d3ac
commit 98cb4f74b2
63 changed files with 1534 additions and 611 deletions
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1486,4 +1486,4 @@ namespace OpenSim.Framework
        }

    }
-}
+}