ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix lludp to read pseudocrc from SOP; move region cacheID to region settings

Browse Source
This commit is contained in:
UbitUmarov
2020-03-27 17:26:49 +00:00
parent 8e6fc69a11
commit 918f56d682
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -919,7 +919,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//BillableFactor
zc.AddFloat(es.BillableFactor);
//CacheID
zc.AddUUID(regionInfo.CacheID);
zc.AddUUID(regionSettings.CacheID);
//TerrainBase0
//TerrainBase1
//TerrainBase2
@@ -5467,7 +5467,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
Utils.UIntToBytes(sop.LocalId, data, pos); pos += 4;
Utils.UIntToBytes((uint)sop.ParentGroup.PseudoCRC, data, pos); pos += 4; //WRONG
Utils.UIntToBytes((uint)sop.PseudoCRC, data, pos); pos += 4; //WRONG
Utils.UIntToBytes(primflags, data, pos); pos += 4;
++count;
@@ -7116,7 +7116,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
zc.AddUInt(part.LocalId);
zc.AddByte(state); // state
zc.AddUUID(part.UUID);
zc.AddUInt((uint)part.ParentGroup.PseudoCRC);
zc.AddUInt((uint)part.PseudoCRC);
zc.AddByte((byte)pcode);
// material 1
// clickaction 1
@@ -7228,7 +7228,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
zc.AddUInt(part.LocalId);
zc.AddByte(state); // state
zc.AddUUID(part.UUID);
zc.AddUInt((uint)part.ParentGroup.PseudoCRC);
zc.AddUInt((uint)part.PseudoCRC);
zc.AddByte((byte)pcode);
zc.AddByte(part.Material);
zc.AddByte(part.ClickAction); // clickaction
@@ -7683,7 +7683,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
zc.AddByte((byte)pcode);
zc.AddByte(state);
zc.AddUInt((uint)part.ParentGroup.PseudoCRC);
zc.AddUInt((uint)part.PseudoCRC);
zc.AddZeros(2); // material and click action
@@ -7846,7 +7846,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
zc.AddByte((byte)pcode);
zc.AddByte(state);
zc.AddUInt((uint)part.ParentGroup.PseudoCRC);
zc.AddUInt((uint)part.PseudoCRC);
zc.AddByte(part.Material);
zc.AddByte(part.ClickAction);