diff options
| author | Melanie | 2014-01-28 20:47:36 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-28 20:47:36 +0000 |
| commit | 4ccb15290ea9686070311c8a62c0fd9e6b0787d8 (patch) | |
| tree | 5c4f69879983e87f567e11c59d8d8b83d0bd7bb4 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Remove the core module extra profile settings support carried in with the latest (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.zip opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.gz opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.bz2 opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
| -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 8ff17f6..252c72f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1903,6 +1903,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1903 | ControllingClient.SendAgentTerseUpdate(this); | 1903 | ControllingClient.SendAgentTerseUpdate(this); |
| 1904 | 1904 | ||
| 1905 | PhysicsActor actor = PhysicsActor; | 1905 | PhysicsActor actor = PhysicsActor; |
| 1906 | |||
| 1907 | // This will be the case if the agent is sitting on the groudn or on an object. | ||
| 1906 | if (actor == null) | 1908 | if (actor == null) |
| 1907 | { | 1909 | { |
| 1908 | SendControlsToScripts(flagsForScripts); | 1910 | SendControlsToScripts(flagsForScripts); |