diff options
| author | Justin Clark-Casey (justincc) | 2014-01-08 01:04:26 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-01-08 01:04:26 +0000 |
| commit | 32e9c1695780199d34f62b06ce9ba8652f64467b (patch) | |
| tree | f865c16d5dd6eb372f7eff504f094e7a8c417453 /OpenSim/Region/Framework | |
| parent | Some missing definitions needed for successful compilation. (diff) | |
| parent | If an agent is sitting, then do send the rotation in the agent update instead... (diff) | |
| download | opensim-SC_OLD-32e9c1695780199d34f62b06ce9ba8652f64467b.zip opensim-SC_OLD-32e9c1695780199d34f62b06ce9ba8652f64467b.tar.gz opensim-SC_OLD-32e9c1695780199d34f62b06ce9ba8652f64467b.tar.bz2 opensim-SC_OLD-32e9c1695780199d34f62b06ce9ba8652f64467b.tar.xz | |
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index cf98ef2..5e80f5a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1902,6 +1902,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1902 | ControllingClient.SendAgentTerseUpdate(this); | 1902 | ControllingClient.SendAgentTerseUpdate(this); |
| 1903 | 1903 | ||
| 1904 | PhysicsActor actor = PhysicsActor; | 1904 | PhysicsActor actor = PhysicsActor; |
| 1905 | |||
| 1906 | // This will be the case if the agent is sitting on the groudn or on an object. | ||
| 1905 | if (actor == null) | 1907 | if (actor == null) |
| 1906 | { | 1908 | { |
| 1907 | SendControlsToScripts(flagsForScripts); | 1909 | SendControlsToScripts(flagsForScripts); |