diff options
| author | meta7 | 2010-08-07 06:33:51 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-07 06:33:51 -0700 |
| commit | bcb3b57f8dad06b2df1e84900da9a63253fa5a8e (patch) | |
| tree | c081310d6b2c6ebf1636c52a91c6b02dd4b37acf /OpenSim/Region/ClientStack/LindenUDP | |
| parent | Add a CHANGED_POSITION event so scripts don't have to run expensive loops to ... (diff) | |
| parent | and another one... (diff) | |
| download | opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.zip opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.tar.gz opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.tar.bz2 opensim-SC-bcb3b57f8dad06b2df1e84900da9a63253fa5a8e.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index d2d1e8f..af2dd85 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -2675,7 +2675,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 2675 | 2675 | ||
| 2676 | // Bit 0: Mature, bit 7: on sale, other bits: no idea | 2676 | // Bit 0: Mature, bit 7: on sale, other bits: no idea |
| 2677 | reply.Data.Flags = (byte)( | 2677 | reply.Data.Flags = (byte)( |
| 2678 | ((land.Flags & (uint)ParcelFlags.MaturePublish) != 0 ? (1 << 0) : 0) + | 2678 | (info.AccessLevel > 13 ? (1 << 0) : 0) + |
| 2679 | ((land.Flags & (uint)ParcelFlags.ForSale) != 0 ? (1 << 7) : 0)); | 2679 | ((land.Flags & (uint)ParcelFlags.ForSale) != 0 ? (1 << 7) : 0)); |
| 2680 | 2680 | ||
| 2681 | Vector3 pos = land.UserLocation; | 2681 | Vector3 pos = land.UserLocation; |
| @@ -2683,8 +2683,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 2683 | { | 2683 | { |
| 2684 | pos = (land.AABBMax + land.AABBMin) * 0.5f; | 2684 | pos = (land.AABBMax + land.AABBMin) * 0.5f; |
| 2685 | } | 2685 | } |
| 2686 | reply.Data.GlobalX = info.RegionLocX * Constants.RegionSize + x; | 2686 | reply.Data.GlobalX = info.RegionLocX + x; |
| 2687 | reply.Data.GlobalY = info.RegionLocY * Constants.RegionSize + y; | 2687 | reply.Data.GlobalY = info.RegionLocY + y; |
| 2688 | reply.Data.GlobalZ = pos.Z; | 2688 | reply.Data.GlobalZ = pos.Z; |
| 2689 | reply.Data.SimName = Utils.StringToBytes(info.RegionName); | 2689 | reply.Data.SimName = Utils.StringToBytes(info.RegionName); |
| 2690 | reply.Data.SnapshotID = land.SnapshotID; | 2690 | reply.Data.SnapshotID = land.SnapshotID; |