aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2011-12-09 08:13:57 +0000
committerMelanie2011-12-09 08:13:57 +0000
commitd9133038755180da5378729985b2aca6dc33b425 (patch)
treef70530bacb9b22d6f2f20ec8dfa7e1dd9b755f2b /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... (diff)
parentRevert "Revert "Stop performing the asset save part of baked texture uploadin... (diff)
downloadopensim-SC_OLD-d9133038755180da5378729985b2aca6dc33b425.zip
opensim-SC_OLD-d9133038755180da5378729985b2aca6dc33b425.tar.gz
opensim-SC_OLD-d9133038755180da5378729985b2aca6dc33b425.tar.bz2
opensim-SC_OLD-d9133038755180da5378729985b2aca6dc33b425.tar.xz
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2748a75..21e3d3f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2397,8 +2397,6 @@ namespace OpenSim.Region.Framework.Scenes
2397 2397
2398 #region Overridden Methods 2398 #region Overridden Methods
2399 2399
2400 private bool sendingPrims = false;
2401
2402 public override void Update() 2400 public override void Update()
2403 { 2401 {
2404 const float ROTATION_TOLERANCE = 0.01f; 2402 const float ROTATION_TOLERANCE = 0.01f;
@@ -2569,7 +2567,7 @@ namespace OpenSim.Region.Framework.Scenes
2569 } 2567 }
2570 2568
2571 // This agent just became root. We are going to tell everyone about it. The process of 2569 // This agent just became root. We are going to tell everyone about it. The process of
2572 // getting other avatars information was initiated in the constructor... don't do it 2570 // getting other avatars information was initiated elsewhere immediately after the child circuit connected... don't do it
2573 // again here... this comes after the cached appearance check because the avatars 2571 // again here... this comes after the cached appearance check because the avatars
2574 // appearance goes into the avatar update packet 2572 // appearance goes into the avatar update packet
2575 SendAvatarDataToAllAgents(); 2573 SendAvatarDataToAllAgents();