Merge branch 'master' into careminster

2026-08-05 17:05:55 +08:00 · 2012-01-27 23:30:26 +00:00
parent 86b9e6fbed 31b87ff07b
commit 26a4e8a161
4 changed files with 125 additions and 21 deletions
--- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -134,4 +134,4 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <returns>UUID of owner if the NPC exists, UUID.Zero  if there was no such agent, the agent is unowned  or the agent was not an NPC</returns>
        UUID GetOwner(UUID agentID);
    }
-}
+}