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/Services/Connectors/Land | |
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 'OpenSim/Services/Connectors/Land')
-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 0223a77..c439dc5 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 | { |
@@ -109,6 +110,8 @@ namespace OpenSim.Services.Connectors | |||
109 | landData.SalePrice = Convert.ToInt32(hash["SalePrice"]); | 110 | landData.SalePrice = Convert.ToInt32(hash["SalePrice"]); |
110 | landData.SnapshotID = new UUID((string)hash["SnapshotID"]); | 111 | landData.SnapshotID = new UUID((string)hash["SnapshotID"]); |
111 | landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]); | 112 | landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]); |
113 | if (hash["RegionAccess"] != null) | ||
114 | regionAccess = (byte)Convert.ToInt32((string)hash["RegionAccess"]); | ||
112 | m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name); | 115 | m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name); |
113 | } | 116 | } |
114 | catch (Exception e) | 117 | catch (Exception e) |