aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-07 05:45:52 +0200
committerMelanie2010-08-07 05:33:49 +0100
commit00fd2e0446382af1a3581c8feec359cad5b939aa (patch)
tree9ace6b554885a4771862967bf928bb59965e0312 /OpenSim/Region/ClientStack/LindenUDP
parentChange the (hackish) constant to match the changed enum for attachs (diff)
downloadopensim-SC_OLD-00fd2e0446382af1a3581c8feec359cad5b939aa.zip
opensim-SC_OLD-00fd2e0446382af1a3581c8feec359cad5b939aa.tar.gz
opensim-SC_OLD-00fd2e0446382af1a3581c8feec359cad5b939aa.tar.bz2
opensim-SC_OLD-00fd2e0446382af1a3581c8feec359cad5b939aa.tar.xz
Correct display of landmark about info. Also correct region maturity rating
in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c59eedf..7bf7511 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2656,7 +2656,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2656 2656
2657 // Bit 0: Mature, bit 7: on sale, other bits: no idea 2657 // Bit 0: Mature, bit 7: on sale, other bits: no idea
2658 reply.Data.Flags = (byte)( 2658 reply.Data.Flags = (byte)(
2659 ((land.Flags & (uint)ParcelFlags.MaturePublish) != 0 ? (1 << 0) : 0) + 2659 (info.AccessLevel > 13 ? (1 << 0) : 0) +
2660 ((land.Flags & (uint)ParcelFlags.ForSale) != 0 ? (1 << 7) : 0)); 2660 ((land.Flags & (uint)ParcelFlags.ForSale) != 0 ? (1 << 7) : 0));
2661 2661
2662 Vector3 pos = land.UserLocation; 2662 Vector3 pos = land.UserLocation;
@@ -2664,8 +2664,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2664 { 2664 {
2665 pos = (land.AABBMax + land.AABBMin) * 0.5f; 2665 pos = (land.AABBMax + land.AABBMin) * 0.5f;
2666 } 2666 }
2667 reply.Data.GlobalX = info.RegionLocX * Constants.RegionSize + x; 2667 reply.Data.GlobalX = info.RegionLocX + x;
2668 reply.Data.GlobalY = info.RegionLocY * Constants.RegionSize + y; 2668 reply.Data.GlobalY = info.RegionLocY + y;
2669 reply.Data.GlobalZ = pos.Z; 2669 reply.Data.GlobalZ = pos.Z;
2670 reply.Data.SimName = Utils.StringToBytes(info.RegionName); 2670 reply.Data.SimName = Utils.StringToBytes(info.RegionName);
2671 reply.Data.SnapshotID = land.SnapshotID; 2671 reply.Data.SnapshotID = land.SnapshotID;