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

forced still bad

master
UbitUmarov 2020-06-21 02:31:57 +01:00
parent bcacd2ff21
commit 29bf9522e2
2 changed files with 8 additions and 11 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

@ -6569,8 +6569,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if(allowenvovr) if(allowenvovr)
{ {
ScenePresence sp = SceneAgent as ScenePresence; ScenePresence sp = SceneAgent as ScenePresence;
if(sp != null && sp .EnvironmentVersion > 0) if(sp != null && sp.EnvironmentVersion > 0)
envVersion = sp.EnvironmentVersion; envVersion = -1;
else else
envVersion = landData.EnvironmentVersion; envVersion = landData.EnvironmentVersion;
} }

15
OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
View File

@ -296,16 +296,15 @@ namespace OpenSim.Region.CoreModules.World.LightShare
if ((vflags & 0x8000) != 0) if ((vflags & 0x8000) != 0)
{ {
ScenePresence sp = isp as ScenePresence; ScenePresence sp = isp as ScenePresence;
if(sp.Environment != null) ILandObject lo = m_scene.LandChannel.GetLandObject(sp.AbsolutePosition.X, sp.AbsolutePosition.Y);
m_estateModule.HandleRegionInfoRequest(client); if (lo != null && lo.LandData != null && lo.LandData.Environment != null)
else
{ {
ILandObject lo = m_scene.LandChannel.GetLandObject(sp.AbsolutePosition.X, sp.AbsolutePosition.Y); lo.SendLandUpdateToClient(client);
if (lo != null && lo.LandData != null && lo.LandData.Environment != null) if (sp.Environment != null)
lo.SendLandUpdateToClient(client);
else
m_estateModule.HandleRegionInfoRequest(client); m_estateModule.HandleRegionInfoRequest(client);
} }
else
m_estateModule.HandleRegionInfoRequest(client);
} }
else if ((vflags & 0x4000) != 0) else if ((vflags & 0x4000) != 0)
@ -468,9 +467,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
ScenePresence sp = m_scene.GetScenePresence(agentID); ScenePresence sp = m_scene.GetScenePresence(agentID);
if(sp != null && sp.Environment != null) if(sp != null && sp.Environment != null)
{
VEnv = sp.Environment; VEnv = sp.Environment;
}
else if (parcelid == -1) else if (parcelid == -1)
VEnv = GetRegionEnvironment(); VEnv = GetRegionEnvironment();
else else