diff options
| author | UbitUmarov | 2012-06-13 01:26:15 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-06-13 01:26:15 +0100 |
| commit | b4ab9a735007604caba2253077434299b4f81b65 (patch) | |
| tree | 1d6b3e4c7c15db6fc5eab32064c990538f3f34d2 /OpenSim/Region/Framework/Scenes | |
| parent | try to replicate SL bug of PRIM_ROTATION also for avas, est a fix to other c... (diff) | |
| download | opensim-SC_OLD-b4ab9a735007604caba2253077434299b4f81b65.zip opensim-SC_OLD-b4ab9a735007604caba2253077434299b4f81b65.tar.gz opensim-SC_OLD-b4ab9a735007604caba2253077434299b4f81b65.tar.bz2 opensim-SC_OLD-b4ab9a735007604caba2253077434299b4f81b65.tar.xz | |
*TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. Changed the sign of the sitoffset dependent on avatar size in SP.cs. Removed that offset correction from SET/GET..primitiveParams in LSL api. If the sign needs to be the previus one, then all references to avatar positions on LSL api need to be fixed with that correction, not only SET/GETprimitiveParams.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a810de2..059d4c2 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2383,7 +2383,8 @@ 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 | // m_pos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT; |
| 2387 | m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - sitOffset; | ||
| 2387 | Rotation = sitTargetOrient; | 2388 | Rotation = sitTargetOrient; |
| 2388 | ParentPosition = part.AbsolutePosition; | 2389 | ParentPosition = part.AbsolutePosition; |
| 2389 | part.ParentGroup.AddAvatar(UUID); | 2390 | part.ParentGroup.AddAvatar(UUID); |