diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index d00a6c0..625342e 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -905,11 +905,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
905 | 905 | ||
906 | public void Close() | 906 | public void Close() |
907 | { | 907 | { |
908 | Close(true); | 908 | Close(true, false); |
909 | } | 909 | } |
910 | 910 | ||
911 | public void Close(bool sendStop) | 911 | public void Close(bool sendStop, bool force) |
912 | { | 912 | { |
913 | // Remove ourselves from the scene | ||
914 | m_scene.RemoveClient(AgentId, false); | ||
913 | } | 915 | } |
914 | 916 | ||
915 | public void Start() | 917 | public void Start() |