aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorDalien Talbot2007-09-11 14:11:21 +0000
committerDalien Talbot2007-09-11 14:11:21 +0000
commitbc86d33dbda39fd16c6ec1024e394d899e6aff4a (patch)
tree3facb79ce63cf827caefcebe812ac0f811ab2a6a /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parentdefault to sqlite for assets, will help flush out any other bugs (diff)
downloadopensim-SC_OLD-bc86d33dbda39fd16c6ec1024e394d899e6aff4a.zip
opensim-SC_OLD-bc86d33dbda39fd16c6ec1024e394d899e6aff4a.tar.gz
opensim-SC_OLD-bc86d33dbda39fd16c6ec1024e394d899e6aff4a.tar.bz2
opensim-SC_OLD-bc86d33dbda39fd16c6ec1024e394d899e6aff4a.tar.xz
Get rid of extra green men in minimap on region crossings (they were
child agents, not delirium tremens - thanks MW!); Get green men when connecting; Update the green men in the region you leave.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b598d45..6d51fbc 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
64 64
65 private bool newForce = false; 65 private bool newForce = false;
66 private bool newAvatar = false; 66 private bool newAvatar = false;
67 private bool newCoarseLocations = false; 67 private bool newCoarseLocations = true;
68 68
69 protected RegionInfo m_regionInfo; 69 protected RegionInfo m_regionInfo;
70 protected ulong crossingFromRegion = 0; 70 protected ulong crossingFromRegion = 0;
@@ -540,7 +540,7 @@ namespace OpenSim.Region.Environment.Scenes
540 List<ScenePresence> avatars = this.m_scene.RequestAvatarList(); 540 List<ScenePresence> avatars = this.m_scene.RequestAvatarList();
541 for (int i = 0; i < avatars.Count; i++) 541 for (int i = 0; i < avatars.Count; i++)
542 { 542 {
543 if (avatars[i] != this) { 543 if (avatars[i] != this && (!avatars[i].childAgent) ) {
544 CoarseLocations.Add(avatars[i].AbsolutePosition); 544 CoarseLocations.Add(avatars[i].AbsolutePosition);
545 } 545 }
546 } 546 }
@@ -763,6 +763,7 @@ namespace OpenSim.Region.Environment.Scenes
763 this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath); 763 this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath);
764 this.MakeChildAgent(); 764 this.MakeChildAgent();
765 this.m_scene.SendKillObject(this.m_localId); 765 this.m_scene.SendKillObject(this.m_localId);
766 this.NotifyMyCoarseLocationChange();
766 } 767 }
767 } 768 }
768 } 769 }