aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorDiva Canto2013-05-28 20:59:54 -0700
committerDiva Canto2013-05-28 20:59:54 -0700
commit233b9ec4d7739f324360366079469f2026c4ce41 (patch)
tree61266ac4ceffef23a74bad1dbd15bbe4fd103f82 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentFirst change in Vivox for ages! -- added a lock to serialize calls to vivox s... (diff)
parentBulletSim: don't zero motion when changing vehicle type. (diff)
downloadopensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.zip
opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.gz
opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.bz2
opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0c91e13..ab7fd5b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2713,7 +2713,9 @@ namespace OpenSim.Region.Framework.Scenes
2713 // again here... this comes after the cached appearance check because the avatars 2713 // again here... this comes after the cached appearance check because the avatars
2714 // appearance goes into the avatar update packet 2714 // appearance goes into the avatar update packet
2715 SendAvatarDataToAllAgents(); 2715 SendAvatarDataToAllAgents();
2716 SendAppearanceToAgent(this); 2716
2717 // This invocation always shows up in the viewer logs as an error.
2718 // SendAppearanceToAgent(this);
2717 2719
2718 // If we are using the the cached appearance then send it out to everyone 2720 // If we are using the the cached appearance then send it out to everyone
2719 if (cachedappearance) 2721 if (cachedappearance)