diff options
| author | UbitUmarov | 2012-06-13 04:59:09 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-06-13 04:59:09 +0100 |
| commit | 7bd274b3d34b5f7cbdc4e4d9e9f6915392b004b8 (patch) | |
| tree | 5db7156946ad39681d51178400c263cad007edb9 /OpenSim/Region/Framework/Scenes | |
| parent | convert a LSL rotation of <0,0,0,0> to <0,0,0,1> and not <0,0,1,0> in SitTar... (diff) | |
| download | opensim-SC_OLD-7bd274b3d34b5f7cbdc4e4d9e9f6915392b004b8.zip opensim-SC_OLD-7bd274b3d34b5f7cbdc4e4d9e9f6915392b004b8.tar.gz opensim-SC_OLD-7bd274b3d34b5f7cbdc4e4d9e9f6915392b004b8.tar.bz2 opensim-SC_OLD-7bd274b3d34b5f7cbdc4e4d9e9f6915392b004b8.tar.xz | |
Changed t adding the avatar dependent sit offset and not subtracting, so not to break inworld contents. SL ported scripts will show a sit error around 0.1m. Added respective compensation in LSL api to maintain coerence. Fixed several bugs still on SET/GET[link]PrimitiveParams[fast] and llGetObjectDetails()
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 059d4c2..87b4d9f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2383,8 +2383,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2383 | 2383 | ||
| 2384 | Vector3 up = new Vector3((float)x, (float)y, (float)z); | 2384 | Vector3 up = new Vector3((float)x, (float)y, (float)z); |
| 2385 | Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f; | 2385 | Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f; |
| 2386 | // m_pos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT; | 2386 | |
| 2387 | m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - sitOffset; | 2387 | m_pos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT; |
| 2388 | |||
| 2389 | // m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - sitOffset; | ||
| 2388 | Rotation = sitTargetOrient; | 2390 | Rotation = sitTargetOrient; |
| 2389 | ParentPosition = part.AbsolutePosition; | 2391 | ParentPosition = part.AbsolutePosition; |
| 2390 | part.ParentGroup.AddAvatar(UUID); | 2392 | part.ParentGroup.AddAvatar(UUID); |