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

change interpretation of a viewer flag

0.9.1.0-post-fixes
UbitUmarov 2019-04-06 21:26:12 +01:00
parent a25e18587c
commit ec6a52c029
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -4814,7 +4814,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
EntityUpdate update; EntityUpdate update;
bool viewerCache = m_supportViewerCache && (m_viewerHandShakeFlags & 1) != 0;// && mysp.IsChildAgent; // only on child agents bool viewerCache = m_supportViewerCache;// && mysp.IsChildAgent; // only on child agents
bool doCulling = m_scene.ObjectsCullingByDistance; bool doCulling = m_scene.ObjectsCullingByDistance;
float cullingrange = 64.0f; float cullingrange = 64.0f;
Vector3 mypos = Vector3.Zero; Vector3 mypos = Vector3.Zero;
@ -5650,7 +5650,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if(GroupsNeedFullUpdate.Count > 0) if(GroupsNeedFullUpdate.Count > 0)
{ {
bool sendProbes = m_supportViewerCache && (m_viewerHandShakeFlags & 1) != 0 && (m_viewerHandShakeFlags & 2) == 0; bool sendProbes = m_supportViewerCache && (m_viewerHandShakeFlags & 2) == 0;
if(sendProbes) if(sendProbes)
{ {

2
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -369,7 +369,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary> /// </summary>
public int IncomingOrphanedPacketCount { get; protected set; } public int IncomingOrphanedPacketCount { get; protected set; }
public bool SupportViewerObjectsCache = false; public bool SupportViewerObjectsCache = true;
/// <summary> /// <summary>
/// Run queue empty processing within a single persistent thread. /// Run queue empty processing within a single persistent thread.
/// </summary> /// </summary>

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

@ -4045,11 +4045,9 @@ namespace OpenSim.Region.Framework.Scenes
Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI); Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI);
m_callbackURI = null; m_callbackURI = null;
//NeedInitialData = 4;
//return;
} }
// v0.7 close HG sender region // v0.7 close HG sender region
if (!string.IsNullOrEmpty(m_newCallbackURI)) else if (!string.IsNullOrEmpty(m_newCallbackURI))
{ {
m_log.DebugFormat( m_log.DebugFormat(
"[SCENE PRESENCE({0})]: Releasing {1} {2} with callback to {3}", "[SCENE PRESENCE({0})]: Releasing {1} {2} with callback to {3}",
@ -4062,8 +4060,6 @@ namespace OpenSim.Region.Framework.Scenes
Scene.SimulationService.ReleaseAgent(originID, UUID, m_newCallbackURI); Scene.SimulationService.ReleaseAgent(originID, UUID, m_newCallbackURI);
m_newCallbackURI = null; m_newCallbackURI = null;
//NeedInitialData = 4;
//return;
} }
IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
if (m_agentTransfer != null) if (m_agentTransfer != null)
@ -4096,12 +4092,8 @@ namespace OpenSim.Region.Framework.Scenes
} }
else else
{ {
bool cacheCulling = (flags & 1) != 0; //bool cacheCulling = (flags & 1) != 0;
bool cacheEmpty; bool cacheEmpty = (flags & 2) != 0;;
if (cacheCulling)
cacheEmpty = (flags & 2) != 0;
else
cacheEmpty = true;
EntityBase[] entities = Scene.Entities.GetEntities(); EntityBase[] entities = Scene.Entities.GetEntities();
if(cacheEmpty) if(cacheEmpty)