Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
author: Melanie 2013-01-19 02:38:04 +0000
committer: Melanie 2013-01-19 02:38:04 +0000
commit: 12efac494a6f55d85b778bf752a9b6c37c1b0ced (patch)
tree: 4adec2a3f235f54e47a2216f7c9abaffdfac0c53 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parent: Merge branch 'master' into careminster (diff)
parent: Explicitly stop PollServiceRequestManager() rather than relying on its destru... (diff)
download: opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.zip
opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.gz
opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.bz2
opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c2ff110..9d18352 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2435,7 +2435,7 @@ namespace OpenSim.Region.Framework.Scenes
        public void HandleStopAnim(IClientAPI remoteClient, UUID animID)
        {
-            Animator.RemoveAnimation(animID);
+            Animator.RemoveAnimation(animID, false);
        }
        public void avnHandleChangeAnim(UUID animID, bool addRemove,bool sendPack)
author	Melanie	2013-01-19 02:38:04 +0000
committer	Melanie	2013-01-19 02:38:04 +0000
commit	12efac494a6f55d85b778bf752a9b6c37c1b0ced (patch)
tree	4adec2a3f235f54e47a2216f7c9abaffdfac0c53 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parent	Merge branch 'master' into careminster (diff)
parent	Explicitly stop PollServiceRequestManager() rather than relying on its destru... (diff)
download	opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.zip opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.gz opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.bz2 opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c2ff110..9d18352 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2435,7 +2435,7 @@ namespace OpenSim.Region.Framework.Scenes
2435		2435
2436	public void HandleStopAnim(IClientAPI remoteClient, UUID animID)	2436	public void HandleStopAnim(IClientAPI remoteClient, UUID animID)
2437	{	2437	{
2438	Animator.RemoveAnimation(animID);	2438	Animator.RemoveAnimation(animID, false);
2439	}	2439	}
2440		2440
2441	public void avnHandleChangeAnim(UUID animID, bool addRemove,bool sendPack)	2441	public void avnHandleChangeAnim(UUID animID, bool addRemove,bool sendPack)