diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/RegionProfileData.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Data/RegionProfileData.cs')
-rw-r--r-- | OpenSim/Data/RegionProfileData.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs index 9549b80..b4c7b3c 100644 --- a/OpenSim/Data/RegionProfileData.cs +++ b/OpenSim/Data/RegionProfileData.cs | |||
@@ -27,9 +27,10 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | using Nwc.XmlRpc; | 31 | using Nwc.XmlRpc; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenMetaverse; | ||
33 | 34 | ||
34 | namespace OpenSim.Data | 35 | namespace OpenSim.Data |
35 | { | 36 | { |
@@ -51,7 +52,7 @@ namespace OpenSim.Data | |||
51 | /// <summary> | 52 | /// <summary> |
52 | /// OGS/OpenSim Specific ID for a region | 53 | /// OGS/OpenSim Specific ID for a region |
53 | /// </summary> | 54 | /// </summary> |
54 | public LLUUID UUID; | 55 | public UUID UUID; |
55 | 56 | ||
56 | /// <summary> | 57 | /// <summary> |
57 | /// Coordinates of the region | 58 | /// Coordinates of the region |
@@ -117,18 +118,18 @@ namespace OpenSim.Data | |||
117 | /// <summary> | 118 | /// <summary> |
118 | /// Region Map Texture Asset | 119 | /// Region Map Texture Asset |
119 | /// </summary> | 120 | /// </summary> |
120 | public LLUUID regionMapTextureID = new LLUUID("00000000-0000-1111-9999-000000000006"); | 121 | public UUID regionMapTextureID = new UUID("00000000-0000-1111-9999-000000000006"); |
121 | 122 | ||
122 | /// <summary> | 123 | /// <summary> |
123 | /// this particular mod to the file provides support within the spec for RegionProfileData for the | 124 | /// this particular mod to the file provides support within the spec for RegionProfileData for the |
124 | /// owner_uuid for the region | 125 | /// owner_uuid for the region |
125 | /// </summary> | 126 | /// </summary> |
126 | public LLUUID owner_uuid = LLUUID.Zero; | 127 | public UUID owner_uuid = UUID.Zero; |
127 | 128 | ||
128 | /// <summary> | 129 | /// <summary> |
129 | /// OGS/OpenSim Specific original ID for a region after move/split | 130 | /// OGS/OpenSim Specific original ID for a region after move/split |
130 | /// </summary> | 131 | /// </summary> |
131 | public LLUUID originUUID; | 132 | public UUID originUUID; |
132 | 133 | ||
133 | /// <summary> | 134 | /// <summary> |
134 | /// Request sim data based on arbitrary key/value | 135 | /// Request sim data based on arbitrary key/value |
@@ -161,7 +162,7 @@ namespace OpenSim.Data | |||
161 | simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); | 162 | simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); |
162 | simData.serverURI = (string) responseData["server_uri"]; | 163 | simData.serverURI = (string) responseData["server_uri"]; |
163 | simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/"; | 164 | simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/"; |
164 | simData.UUID = new LLUUID((string) responseData["region_UUID"]); | 165 | simData.UUID = new UUID((string) responseData["region_UUID"]); |
165 | simData.regionName = (string) responseData["region_name"]; | 166 | simData.regionName = (string) responseData["region_name"]; |
166 | } | 167 | } |
167 | 168 | ||
@@ -177,10 +178,10 @@ namespace OpenSim.Data | |||
177 | /// <param name="gridserver_recvkey"></param> | 178 | /// <param name="gridserver_recvkey"></param> |
178 | /// <returns>The sim profile. Null if there was a request failure</returns> | 179 | /// <returns>The sim profile. Null if there was a request failure</returns> |
179 | /// <remarks>This method should be statics</remarks> | 180 | /// <remarks>This method should be statics</remarks> |
180 | public static RegionProfileData RequestSimProfileData(LLUUID region_uuid, Uri gridserver_url, | 181 | public static RegionProfileData RequestSimProfileData(UUID region_uuid, Uri gridserver_url, |
181 | string gridserver_sendkey, string gridserver_recvkey) | 182 | string gridserver_sendkey, string gridserver_recvkey) |
182 | { | 183 | { |
183 | return RequestSimData(gridserver_url, gridserver_sendkey, "region_UUID", region_uuid.UUID.ToString()); | 184 | return RequestSimData(gridserver_url, gridserver_sendkey, "region_UUID", region_uuid.Guid.ToString()); |
184 | } | 185 | } |
185 | 186 | ||
186 | /// <summary> | 187 | /// <summary> |