diff options
| author | Melanie | 2009-12-06 03:10:34 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-06 03:10:34 +0000 |
| commit | f9ae9afaacc82ee0284b1f7dc88ad880aabe23af (patch) | |
| tree | b4e8df612c3b161edcf2f40bbbfd4d8f40007ce0 /OpenSim/Region | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-f9ae9afaacc82ee0284b1f7dc88ad880aabe23af.zip opensim-SC-f9ae9afaacc82ee0284b1f7dc88ad880aabe23af.tar.gz opensim-SC-f9ae9afaacc82ee0284b1f7dc88ad880aabe23af.tar.bz2 opensim-SC-f9ae9afaacc82ee0284b1f7dc88ad880aabe23af.tar.xz | |
Fix build break from conflicted merge
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 3d4490a..f6bcb59 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1972,7 +1972,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1972 | SendFullUpdateToAllClients(); | 1972 | SendFullUpdateToAllClients(); |
| 1973 | } | 1973 | } |
| 1974 | 1974 | ||
| 1975 | public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance) | 1975 | public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal) |
| 1976 | { | 1976 | { |
| 1977 | if(hitYN) | 1977 | if(hitYN) |
| 1978 | { | 1978 | { |