diff options
author | Kitto Flora | 2011-01-04 21:36:09 +0000 |
---|---|---|
committer | Kitto Flora | 2011-01-04 21:36:09 +0000 |
commit | ba7a2277633804eb2d5e449efa0895e9f43a4ece (patch) | |
tree | 950d41b6bed87f6eccf295111b638d3138250993 /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-ba7a2277633804eb2d5e449efa0895e9f43a4ece.zip opensim-SC-ba7a2277633804eb2d5e449efa0895e9f43a4ece.tar.gz opensim-SC-ba7a2277633804eb2d5e449efa0895e9f43a4ece.tar.bz2 opensim-SC-ba7a2277633804eb2d5e449efa0895e9f43a4ece.tar.xz |
Revise Materials properties; Fix Double-Click Autopilot; Allow non-script sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 557fc42..208c2a6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1758,7 +1758,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1758 | return; | 1758 | return; |
1759 | } | 1759 | } |
1760 | m_moveToPositionInProgress = true; | 1760 | m_moveToPositionInProgress = true; |
1761 | m_moveToPositionTarget = new Vector3(locx, locy, locz); | 1761 | m_moveToPositionTarget = new Vector3(locx, locy, locz + (m_appearance.AvatarHeight / 2.0f)); |
1762 | } | 1762 | } |
1763 | catch (Exception ex) | 1763 | catch (Exception ex) |
1764 | { | 1764 | { |
@@ -2008,7 +2008,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2008 | } | 2008 | } |
2009 | else // Not Scripted | 2009 | else // Not Scripted |
2010 | { | 2010 | { |
2011 | if ( (Math.Abs(offset.X) > 0.5f) || (Math.Abs(offset.Y) > 0.5f) ) | 2011 | if ( (Math.Abs(offset.X) > 0.1f) || (Math.Abs(offset.Y) > 0.1f) ) // Changed 0.5M to 0.1M as they want to be able to sit close together |
2012 | { | 2012 | { |
2013 | // large prim & offset, ignore if other Avs sitting | 2013 | // large prim & offset, ignore if other Avs sitting |
2014 | // offset.Z -= 0.05f; | 2014 | // offset.Z -= 0.05f; |