aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:15:25 +0100
committerMelanie2011-10-11 22:15:25 +0100
commit03d533dc1e9ad236e0aa437287bc9a79de548af6 (patch)
treef9a4ae4fb5367a6a415ee8559b6f9d66d1e99124 /OpenSim/Region/Framework
parentMerge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge (diff)
parentOn setting a new avatar appearance, if height hasn't changed then don't set t... (diff)
downloadopensim-SC_OLD-03d533dc1e9ad236e0aa437287bc9a79de548af6.zip
opensim-SC_OLD-03d533dc1e9ad236e0aa437287bc9a79de548af6.tar.gz
opensim-SC_OLD-03d533dc1e9ad236e0aa437287bc9a79de548af6.tar.bz2
opensim-SC_OLD-03d533dc1e9ad236e0aa437287bc9a79de548af6.tar.xz
Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 697a9f8..ef291f7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3661,6 +3661,10 @@ namespace OpenSim.Region.Framework.Scenes
3661 /// </summary> 3661 /// </summary>
3662 public void AddToPhysicalScene(bool isFlying) 3662 public void AddToPhysicalScene(bool isFlying)
3663 { 3663 {
3664// m_log.DebugFormat(
3665// "[SCENE PRESENCE]: Adding physics actor for {0}, ifFlying = {1} in {2}",
3666// Name, isFlying, Scene.RegionInfo.RegionName);
3667
3664 if (m_appearance.AvatarHeight == 0) 3668 if (m_appearance.AvatarHeight == 0)
3665 m_appearance.SetHeight(); 3669 m_appearance.SetHeight();
3666 3670