OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some mess cleanup

avinationmerge
UbitUmarov 2014-08-03 22:57:08 +01:00
parent 0d71a2bb8f
commit bad01fbb41
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1836,12 +1836,12 @@ namespace OpenSim.Region.Framework.Scenes
m_currentParcelUUID = UUID.Zero; m_currentParcelUUID = UUID.Zero;
// send initial land overlay and parcel // send initial land overlay and parcel
if (!IsChildAgent)
{
ILandChannel landch = m_scene.LandChannel; ILandChannel landch = m_scene.LandChannel;
if (landch != null) if (landch != null)
{ {
landch.sendClientInitialLandInfo(client); landch.sendClientInitialLandInfo(client);
if (!IsChildAgent)
{
newhide = m_currentParcelHide; newhide = m_currentParcelHide;
m_currentParcelHide = false; m_currentParcelHide = false;
} }
@ -5416,9 +5416,9 @@ namespace OpenSim.Region.Framework.Scenes
{ {
foreach (ScenePresence p in viewsToSendme) foreach (ScenePresence p in viewsToSendme)
{ {
if (p.IsChildAgent)
continue;
m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname); m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname);
if (!p.IsChildAgent)
{
ControllingClient.SendAvatarDataImmediate(p); ControllingClient.SendAvatarDataImmediate(p);
p.SendAppearanceToAgent(this); p.SendAppearanceToAgent(this);
p.SendAttachmentsToClient(ControllingClient); p.SendAttachmentsToClient(ControllingClient);
@ -5427,7 +5427,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}
else else
{ {
List<ScenePresence> killsToSendme = new List<ScenePresence>(); List<ScenePresence> killsToSendme = new List<ScenePresence>();
@ -5526,8 +5525,8 @@ namespace OpenSim.Region.Framework.Scenes
foreach (ScenePresence p in viewsToSendme) foreach (ScenePresence p in viewsToSendme)
{ {
m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname); m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
if (!p.IsChildAgent) if (p.IsChildAgent)
{ continue;
ControllingClient.SendAvatarDataImmediate(p); ControllingClient.SendAvatarDataImmediate(p);
p.SendAppearanceToAgent(this); p.SendAppearanceToAgent(this);
p.SendAttachmentsToClient(ControllingClient); p.SendAttachmentsToClient(ControllingClient);
@ -5536,7 +5535,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}
private void parcelRegionCross(bool abort) private void parcelRegionCross(bool abort)
{ {
@ -5548,7 +5546,6 @@ namespace OpenSim.Region.Framework.Scenes
if (abort) if (abort)
{ {
List<ScenePresence> viewsToSendme = new List<ScenePresence>(); List<ScenePresence> viewsToSendme = new List<ScenePresence>();
foreach (ScenePresence p in allpresences) foreach (ScenePresence p in allpresences)
@ -5566,9 +5563,9 @@ namespace OpenSim.Region.Framework.Scenes
{ {
foreach (ScenePresence p in viewsToSendme) foreach (ScenePresence p in viewsToSendme)
{ {
m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname); if (p.IsChildAgent)
if (!p.IsChildAgent) continue;
{ // m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname);
ControllingClient.SendAvatarDataImmediate(p); ControllingClient.SendAvatarDataImmediate(p);
p.SendAppearanceToAgent(this); p.SendAppearanceToAgent(this);
p.SendAttachmentsToClient(ControllingClient); p.SendAttachmentsToClient(ControllingClient);
@ -5577,7 +5574,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}
else else
{ {
if (GodLevel >= 200) if (GodLevel >= 200)
@ -5768,8 +5764,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
foreach (ScenePresence p in viewsToSendto) foreach (ScenePresence p in viewsToSendto)
{ {
m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname);
p.ControllingClient.SendAvatarDataImmediate(this); p.ControllingClient.SendAvatarDataImmediate(this);
// m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname);
SendAppearanceToAgent(p); SendAppearanceToAgent(p);
SendAttachmentsToClient(p.ControllingClient); SendAttachmentsToClient(p.ControllingClient);
if (Animator != null) if (Animator != null)
@ -5781,9 +5777,9 @@ namespace OpenSim.Region.Framework.Scenes
{ {
foreach (ScenePresence p in viewsToSendme) foreach (ScenePresence p in viewsToSendme)
{ {
m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname); if (p.IsChildAgent)
if (!p.IsChildAgent) continue;
{ // m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
ControllingClient.SendAvatarDataImmediate(p); ControllingClient.SendAvatarDataImmediate(p);
p.SendAppearanceToAgent(this); p.SendAppearanceToAgent(this);
p.SendAttachmentsToClient(ControllingClient); p.SendAttachmentsToClient(ControllingClient);
@ -5794,4 +5790,3 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}