diff options
author | Melanie | 2012-05-13 01:25:03 +0100 |
---|---|---|
committer | Melanie | 2012-05-13 01:25:03 +0100 |
commit | fe029cf4e8fc0940d887329a823e66e0c29bd92e (patch) | |
tree | 7c2ae75849307cda30da96b6300ee30295610b42 /OpenSim/Region/ClientStack/Linden | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | ubitODE fix force in case of mlinear motor offset present (diff) | |
download | opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.zip opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.gz opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.bz2 opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.xz |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index b354cc0..9ae8dfb 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -98,6 +98,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
98 | public event AvatarPickerRequest OnAvatarPickerRequest; | 98 | public event AvatarPickerRequest OnAvatarPickerRequest; |
99 | public event StartAnim OnStartAnim; | 99 | public event StartAnim OnStartAnim; |
100 | public event StopAnim OnStopAnim; | 100 | public event StopAnim OnStopAnim; |
101 | public event ChangeAnim OnChangeAnim; | ||
101 | public event Action<IClientAPI> OnRequestAvatarsData; | 102 | public event Action<IClientAPI> OnRequestAvatarsData; |
102 | public event LinkObjects OnLinkObjects; | 103 | public event LinkObjects OnLinkObjects; |
103 | public event DelinkObjects OnDelinkObjects; | 104 | public event DelinkObjects OnDelinkObjects; |
@@ -6386,7 +6387,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6386 | return true; | 6387 | return true; |
6387 | } | 6388 | } |
6388 | #endregion | 6389 | #endregion |
6389 | 6390 | /* | |
6390 | StartAnim handlerStartAnim = null; | 6391 | StartAnim handlerStartAnim = null; |
6391 | StopAnim handlerStopAnim = null; | 6392 | StopAnim handlerStopAnim = null; |
6392 | 6393 | ||
@@ -6410,6 +6411,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6410 | } | 6411 | } |
6411 | } | 6412 | } |
6412 | return true; | 6413 | return true; |
6414 | */ | ||
6415 | ChangeAnim handlerChangeAnim = null; | ||
6416 | |||
6417 | for (int i = 0; i < AgentAni.AnimationList.Length; i++) | ||
6418 | { | ||
6419 | handlerChangeAnim = OnChangeAnim; | ||
6420 | if (handlerChangeAnim != null) | ||
6421 | { | ||
6422 | handlerChangeAnim(AgentAni.AnimationList[i].AnimID, AgentAni.AnimationList[i].StartAnim, false); | ||
6423 | } | ||
6424 | } | ||
6425 | |||
6426 | handlerChangeAnim = OnChangeAnim; | ||
6427 | if (handlerChangeAnim != null) | ||
6428 | { | ||
6429 | handlerChangeAnim(UUID.Zero, false, true); | ||
6430 | } | ||
6431 | |||
6432 | return true; | ||
6413 | } | 6433 | } |
6414 | 6434 | ||
6415 | private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack) | 6435 | private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack) |