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

RegionHandshake IS critical llupd protocol not to be done by odd modules

0.9.1.0-post-fixes
UbitUmarov 2019-03-20 15:09:53 +00:00
parent 81ff118378
commit d6b3413c63
7 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/EstateSettings.cs
View File

@ -153,7 +153,7 @@ namespace OpenSim.Framework
private bool m_DenyAnonymous = false; private bool m_DenyAnonymous = false;
public bool DenyAnonymous public bool DenyAnonymous
{ {
get { return m_DenyAnonymous; } get { return (DoDenyAnonymous && m_DenyAnonymous); }
set { m_DenyAnonymous = value; } set { m_DenyAnonymous = value; }
} }
@ -233,7 +233,7 @@ namespace OpenSim.Framework
private bool m_DenyMinors = false; private bool m_DenyMinors = false;
public bool DenyMinors public bool DenyMinors
{ {
get { return m_DenyMinors; } get { return (DoDenyMinors && m_DenyMinors); }
set { m_DenyMinors = value; } set { m_DenyMinors = value; }
} }
@ -379,14 +379,14 @@ namespace OpenSim.Framework
if (!HasAccess(avatarID)) if (!HasAccess(avatarID))
{ {
if (DoDenyMinors && DenyMinors) if (DenyMinors)
{ {
if ((userFlags & 32) == 0) if ((userFlags & 32) == 0)
{ {
return true; return true;
} }
} }
if (DoDenyAnonymous && DenyAnonymous) if (DenyAnonymous)
{ {
if ((userFlags & 4) == 0) if ((userFlags & 4) == 0)
{ {

2
OpenSim/Framework/IClientAPI.cs
View File

@ -1106,7 +1106,7 @@ namespace OpenSim.Framework
// void SendPartFullUpdate(ISceneEntity ent, uint? parentID); // void SendPartFullUpdate(ISceneEntity ent, uint? parentID);
void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); void SendRegionHandshake();
/// <summary> /// <summary>
/// Send chat to the viewer. /// Send chat to the viewer.

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

@ -890,7 +890,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
0xff, 0xff, 0, 1, 148 // ID 148 (low frequency bigendian) zero encoded 0xff, 0xff, 0, 1, 148 // ID 148 (low frequency bigendian) zero encoded
}; };
public void SendRegionHandshake(RegionInfo _regionInfo, RegionHandshakeArgs args)
public void SendRegionHandshake()
{ {
RegionInfo regionInfo = m_scene.RegionInfo; RegionInfo regionInfo = m_scene.RegionInfo;
RegionSettings regionSettings = regionInfo.RegionSettings; RegionSettings regionSettings = regionInfo.RegionSettings;

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

@ -1725,11 +1725,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// circuit code to the existing child agent. This is not particularly obvious. // circuit code to the existing child agent. This is not particularly obvious.
SendAckImmediate(endPoint, uccp.Header.Sequence); SendAckImmediate(endPoint, uccp.Header.Sequence);
client.CheckViewerCaps();
// We only want to send initial data to new clients, not ones which are being converted from child to root.
if (client != null) if (client != null)
{ {
client.SendRegionHandshake();
client.CheckViewerCaps();
// We only want to send initial data to new clients, not ones which are being converted from child to root.
bool tp = (aCircuit.teleportFlags > 0); bool tp = (aCircuit.teleportFlags > 0);
// Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
if (!tp) if (!tp)

2
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -932,7 +932,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(),appearance.AvatarSize, new WearableCacheItem[0]); OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(),appearance.AvatarSize, new WearableCacheItem[0]);
} }
public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) public void SendRegionHandshake()
{ {
m_log.Info("[IRCd ClientStack] Completing Handshake to Region"); m_log.Info("[IRCd ClientStack] Completing Handshake to Region");

6
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -668,10 +668,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{ {
} }
public virtual void SendStartPingCheck(byte seq)
{
}
public virtual void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data) public virtual void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data)
{ {
} }
@ -928,7 +924,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{ {
} }
public virtual void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) public virtual void SendRegionHandshake()
{ {
if (OnRegionHandShakeReply != null) if (OnRegionHandShakeReply != null)
{ {

2
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -876,7 +876,7 @@ namespace OpenSim.Tests.Common
{ {
} }
public virtual void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) public virtual void SendRegionHandshake()
{ {
if (OnRegionHandShakeReply != null) if (OnRegionHandShakeReply != null)
{ {