Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2026-08-06 17:32:42 +08:00 · 2012-03-29 00:27:35 +01:00
parent e73023b90b 964cae4f37
commit 7dad1ded2e
20 changed files with 471 additions and 85 deletions
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -717,7 +717,7 @@ namespace OpenSim.Framework
        /// The scene agent for this client.  This will only be set if the client has an agent in a scene (i.e. if it
        /// is connected).
        /// </summary>
-        ISceneAgent SceneAgent { get; }
+        ISceneAgent SceneAgent { get; set; }

        UUID SessionId { get; }