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

comment out a debug msg. more on gods being Gods

avinationmerge
UbitUmarov 2014-08-03 00:22:21 +01:00
parent addca0737c
commit 9f5e19127d
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
View File

@ -358,7 +358,7 @@ namespace OpenSim.Region.ClientStack.Linden
return queue.Count > 0; return queue.Count > 0;
} }
m_log.WarnFormat("POLLED FOR EVENTS BY {0} unknown agent", agentID); //m_log.WarnFormat("POLLED FOR EVENTS BY {0} unknown agent", agentID);
return true; return true;
} }

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

@ -164,12 +164,12 @@ namespace OpenSim.Region.Framework.Scenes
lock (parcelLock) lock (parcelLock)
{ {
bool oldhide = m_currentParcelHide; bool oldhide = m_currentParcelHide;
bool check = true; bool checksame = true;
if (value != m_currentParcelUUID) if (value != m_currentParcelUUID)
{ {
m_previusParcelHide = m_currentParcelHide; m_previusParcelHide = m_currentParcelHide;
m_previusParcelUUID = m_currentParcelUUID; m_previusParcelUUID = m_currentParcelUUID;
check = false; checksame = false;
} }
m_currentParcelUUID = value; m_currentParcelUUID = value;
m_currentParcelHide = false; m_currentParcelHide = false;
@ -177,8 +177,9 @@ namespace OpenSim.Region.Framework.Scenes
ILandObject land = m_scene.LandChannel.GetLandObject(AbsolutePosition.X, AbsolutePosition.Y); ILandObject land = m_scene.LandChannel.GetLandObject(AbsolutePosition.X, AbsolutePosition.Y);
if (land != null && !land.LandData.SeeAVs) if (land != null && !land.LandData.SeeAVs)
m_currentParcelHide = true; m_currentParcelHide = true;
if (m_previusParcelUUID != UUID.Zero) if (m_previusParcelUUID != UUID.Zero)
ParcelCrossCheck(m_currentParcelUUID,m_previusParcelUUID,m_currentParcelHide, m_previusParcelHide, oldhide,check); ParcelCrossCheck(m_currentParcelUUID,m_previusParcelUUID,m_currentParcelHide, m_previusParcelHide, oldhide,checksame);
} }
} }
} }
@ -1923,8 +1924,11 @@ namespace OpenSim.Region.Framework.Scenes
} }
// if hide force a check // if hide force a check
if (!IsChildAgent && newhide) if (!IsChildAgent && newhide)
{
ParcelCrossCheck(m_currentParcelUUID, m_previusParcelUUID, ParcelCrossCheck(m_currentParcelUUID, m_previusParcelUUID,
true, m_previusParcelHide, false, true); true, m_previusParcelHide, false, true);
m_currentParcelHide = newhide;
}
} }
/// <summary> /// <summary>
@ -5511,13 +5515,15 @@ namespace OpenSim.Region.Framework.Scenes
continue; continue;
// only those on previus parcel need receive kills // only those on previus parcel need receive kills
if (previusParcelUUID == p.currentParcelUUID && p.GodLevel < 200) if (previusParcelUUID == p.currentParcelUUID)
{ {
if(p.GodLevel < 200)
killsToSendto.Add(p); // they dont see me killsToSendto.Add(p); // they dont see me
if(GodLevel < 200)
killsToSendme.Add(p); // i dont see them killsToSendme.Add(p); // i dont see them
} }
// only those on new parcel need see // only those on new parcel need see
if (currentParcelUUID == p.currentParcelUUID || p.GodLevel >= 200) if (currentParcelUUID == p.currentParcelUUID)
{ {
viewsToSendto.Add(p); // they see me viewsToSendto.Add(p); // they see me
viewsToSendme.Add(p); // i see them viewsToSendme.Add(p); // i see them
@ -5561,7 +5567,7 @@ namespace OpenSim.Region.Framework.Scenes
if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive) if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
continue; continue;
// only those old parcel need receive kills // only those old parcel need receive kills
if (previusParcelUUID == p.currentParcelUUID && p.GodLevel < 200) if (previusParcelUUID == p.currentParcelUUID && GodLevel < 200)
{ {
killsToSendme.Add(p); // i dont see them killsToSendme.Add(p); // i dont see them
} }