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

missing files

0.9.1.1
UbitUmarov 2019-12-16 16:12:04 +00:00
parent 60473ff44e
commit 7516288634
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3037,9 +3037,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void SendAlertMessage(string message) public void SendAlertMessage(string message)
{ {
AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage); AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage);
alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1]; //alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1];
alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock(); //alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock();
alertPack.AgentInfo[0].AgentID = AgentId; //alertPack.AgentInfo[0].AgentID = AgentId;
alertPack.AlertData = new AlertMessagePacket.AlertDataBlock(); alertPack.AlertData = new AlertMessagePacket.AlertDataBlock();
alertPack.AlertData.Message = Util.StringToBytes256(message); alertPack.AlertData.Message = Util.StringToBytes256(message);
alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[0]; alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[0];
@ -3049,9 +3049,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void SendAlertMessage(string message, string info) public void SendAlertMessage(string message, string info)
{ {
AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage); AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage);
alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1]; //alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1];
alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock(); //alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock();
alertPack.AgentInfo[0].AgentID = AgentId; //alertPack.AgentInfo[0].AgentID = AgentId;
alertPack.AlertData = new AlertMessagePacket.AlertDataBlock(); alertPack.AlertData = new AlertMessagePacket.AlertDataBlock();
alertPack.AlertData.Message = Util.StringToBytes256(message); alertPack.AlertData.Message = Util.StringToBytes256(message);
alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[1]; alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[1];
@ -6591,6 +6591,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLSDxmlEncode.AddEndMapAndArray(sb); LLSDxmlEncode.AddEndMapAndArray(sb);
LLSDxmlEncode.AddArrayAndMap("ParcelEnvironmentBlock", sb);
LLSDxmlEncode.AddElem("ParcelEnvironmentVersion", -1, sb);
LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", false, sb);
LLSDxmlEncode.AddEndMapAndArray(sb);
bool accessovr = Scene.RegionInfo.EstateSettings.TaxFree;
LLSDxmlEncode.AddArrayAndMap("RegionAllowAccessBlock", sb);
LLSDxmlEncode.AddElem("RegionAllowAccessOverride", accessovr, sb);
LLSDxmlEncode.AddEndMapAndArray(sb);
OSDllsdxml ev = new OSDllsdxml(eq.EndEvent(sb)); OSDllsdxml ev = new OSDllsdxml(eq.EndEvent(sb));
eq.Enqueue(ev, AgentId); eq.Enqueue(ev, AgentId);
@ -15437,7 +15446,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
} }
return ret; // ???
return ret;
} }
} }
} }

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

@ -1172,7 +1172,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
int dataLength = buffer.DataLength; int dataLength = buffer.DataLength;
// only append acks on plain reliable messages // only append acks on plain reliable messages
if (flags == Helpers.MSG_RELIABLE && outgoingPacket.UnackedMethod == null) if (flags == Helpers.MSG_RELIABLE)
{ {
// Keep appending ACKs until there is no room left in the buffer or there are // Keep appending ACKs until there is no room left in the buffer or there are
// no more ACKs to append // no more ACKs to append