diff options
| author | UbitUmarov | 2014-09-09 02:05:44 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-09-09 02:05:44 +0100 |
| commit | d00aa403e01e8401a8447955b2fc159a8644b9ce (patch) | |
| tree | 9795dd3a22d01b645e741e7b4a01b516ea8a5f0b /OpenSim/Region/Framework/Scenes | |
| parent | dont send fullObjectUpdate on deselect (diff) | |
| parent | make PERMISSION_OVERRIDE_ANIMATIONS implicit for attachments (diff) | |
| download | opensim-SC-d00aa403e01e8401a8447955b2fc159a8644b9ce.zip opensim-SC-d00aa403e01e8401a8447955b2fc159a8644b9ce.tar.gz opensim-SC-d00aa403e01e8401a8447955b2fc159a8644b9ce.tar.bz2 opensim-SC-d00aa403e01e8401a8447955b2fc159a8644b9ce.tar.xz | |
Merge branch 'master' into ubitworkmaster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 47acb0b..4d5f747 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -6004,5 +6004,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 6004 | Animator.SendAnimPackToClient(p.ControllingClient); | 6004 | Animator.SendAnimPackToClient(p.ControllingClient); |
| 6005 | SendAttachmentsToAgentNF(p); | 6005 | SendAttachmentsToAgentNF(p); |
| 6006 | } | 6006 | } |
| 6007 | |||
| 6008 | public void SetAnimationOverride(string animState, UUID animID) | ||
| 6009 | { | ||
| 6010 | } | ||
| 6007 | } | 6011 | } |
| 6008 | } | 6012 | } |