diff options
| author | Melanie | 2012-07-29 16:11:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-29 16:11:20 +0100 |
| commit | e012c81d7c883fda33edb1094dd165214804bff9 (patch) | |
| tree | 4ef031a39490ef0202a298190b5168ac99213944 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Return world rotation on llGetObjectDetails()'s OBJECT_ROT (diff) | |
| download | opensim-SC_OLD-e012c81d7c883fda33edb1094dd165214804bff9.zip opensim-SC_OLD-e012c81d7c883fda33edb1094dd165214804bff9.tar.gz opensim-SC_OLD-e012c81d7c883fda33edb1094dd165214804bff9.tar.bz2 opensim-SC_OLD-e012c81d7c883fda33edb1094dd165214804bff9.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5cff3f0..628fd20 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3817,6 +3817,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3817 | if (p == null) | 3817 | if (p == null) |
| 3818 | return; | 3818 | return; |
| 3819 | 3819 | ||
| 3820 | ControllingClient.SendTakeControls(controls, false, false); | ||
| 3821 | ControllingClient.SendTakeControls(controls, true, false); | ||
| 3822 | |||
| 3820 | ScriptControllers obj = new ScriptControllers(); | 3823 | ScriptControllers obj = new ScriptControllers(); |
| 3821 | obj.ignoreControls = ScriptControlled.CONTROL_ZERO; | 3824 | obj.ignoreControls = ScriptControlled.CONTROL_ZERO; |
| 3822 | obj.eventControls = ScriptControlled.CONTROL_ZERO; | 3825 | obj.eventControls = ScriptControlled.CONTROL_ZERO; |