Merge branch 'master' into vehicles

2026-05-30 14:17:12 +08:00 · 2009-10-15 21:14:13 +01:00
parent 70553a979e fe4109a5b0
commit 6deef7d0f3
63 changed files with 2254 additions and 1996 deletions
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -813,7 +813,7 @@ namespace OpenSim.Region.Examples.SimpleModule
        {
        }

-        public void Close(bool ShutdownCircuit)
+        public void Close()
        {
        }

@@ -833,6 +833,11 @@ namespace OpenSim.Region.Examples.SimpleModule
            set { m_circuitCode = value; }
        }

+        public IPEndPoint RemoteEndPoint
+        {
+            get { return new IPEndPoint(IPAddress.Loopback, (ushort)m_circuitCode); }
+        }
+
        public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message)
        {