diff options
author | Melanie Thielker | 2010-08-07 05:45:52 +0200 |
---|---|---|
committer | Melanie | 2010-08-07 05:33:49 +0100 |
commit | 00fd2e0446382af1a3581c8feec359cad5b939aa (patch) | |
tree | 9ace6b554885a4771862967bf928bb59965e0312 /OpenSim/Services/Connectors | |
parent | Change the (hackish) constant to match the changed enum for attachs (diff) | |
download | opensim-SC-00fd2e0446382af1a3581c8feec359cad5b939aa.zip opensim-SC-00fd2e0446382af1a3581c8feec359cad5b939aa.tar.gz opensim-SC-00fd2e0446382af1a3581c8feec359cad5b939aa.tar.bz2 opensim-SC-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/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Land/LandServiceConnector.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs index 06bc11c..8bae4aa 100644 --- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Services.Connectors | |||
64 | m_GridService = gridServices; | 64 | m_GridService = gridServices; |
65 | } | 65 | } |
66 | 66 | ||
67 | public virtual LandData GetLandData(ulong regionHandle, uint x, uint y) | 67 | public virtual LandData GetLandData(ulong regionHandle, uint x, uint y, out byte regionAccess) |
68 | { | 68 | { |
69 | LandData landData = null; | 69 | LandData landData = null; |
70 | Hashtable hash = new Hashtable(); | 70 | Hashtable hash = new Hashtable(); |
@@ -74,6 +74,7 @@ namespace OpenSim.Services.Connectors | |||
74 | 74 | ||
75 | IList paramList = new ArrayList(); | 75 | IList paramList = new ArrayList(); |
76 | paramList.Add(hash); | 76 | paramList.Add(hash); |
77 | regionAccess = 42; // Default to adult. Better safe... | ||
77 | 78 | ||
78 | try | 79 | try |
79 | { | 80 | { |
@@ -107,6 +108,8 @@ namespace OpenSim.Services.Connectors | |||
107 | landData.SalePrice = Convert.ToInt32(hash["SalePrice"]); | 108 | landData.SalePrice = Convert.ToInt32(hash["SalePrice"]); |
108 | landData.SnapshotID = new UUID((string)hash["SnapshotID"]); | 109 | landData.SnapshotID = new UUID((string)hash["SnapshotID"]); |
109 | landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]); | 110 | landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]); |
111 | if (hash["RegionAccess"] != null) | ||
112 | regionAccess = (byte)Convert.ToInt32((string)hash["RegionAccess"]); | ||
110 | m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name); | 113 | m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name); |
111 | } | 114 | } |
112 | catch (Exception e) | 115 | catch (Exception e) |