diff options
Diffstat (limited to '')
4 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs index ce564dd..d812e24 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs | |||
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions; | |||
36 | using System.Timers; | 36 | using System.Timers; |
37 | using System.Xml; | 37 | using System.Xml; |
38 | using System.Xml.Serialization; | 38 | using System.Xml.Serialization; |
39 | using libsecondlife; | 39 | using OpenMetaverse; |
40 | using Mono.Addins; | 40 | using Mono.Addins; |
41 | using Nwc.XmlRpc; | 41 | using Nwc.XmlRpc; |
42 | using Nini.Config; | 42 | using Nini.Config; |
@@ -109,11 +109,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
109 | // be resilient and don't get confused by a terminating '/' | 109 | // be resilient and don't get confused by a terminating '/' |
110 | param = param.TrimEnd(new char[]{'/'}); | 110 | param = param.TrimEnd(new char[]{'/'}); |
111 | string[] comps = param.Split('/'); | 111 | string[] comps = param.Split('/'); |
112 | LLUUID regionID = (LLUUID)comps[0]; | 112 | UUID regionID = (UUID)comps[0]; |
113 | 113 | ||
114 | m_log.DebugFormat("{0} GET region UUID {1}", MsgID, regionID.ToString()); | 114 | m_log.DebugFormat("{0} GET region UUID {1}", MsgID, regionID.ToString()); |
115 | 115 | ||
116 | if (LLUUID.Zero == regionID) throw new Exception("missing region ID"); | 116 | if (UUID.Zero == regionID) throw new Exception("missing region ID"); |
117 | 117 | ||
118 | Scene scene = null; | 118 | Scene scene = null; |
119 | App.SceneManager.TryGetScene(regionID, out scene); | 119 | App.SceneManager.TryGetScene(regionID, out scene); |
@@ -150,7 +150,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
150 | return RegionStats(httpResponse, scene); | 150 | return RegionStats(httpResponse, scene); |
151 | 151 | ||
152 | case "prims": | 152 | case "prims": |
153 | return RegionPrims(httpResponse, scene, LLVector3.Zero, LLVector3.Zero); | 153 | return RegionPrims(httpResponse, scene, Vector3.Zero, Vector3.Zero); |
154 | } | 154 | } |
155 | } | 155 | } |
156 | 156 | ||
@@ -162,11 +162,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
162 | string[] subregion = comps[2].Split(','); | 162 | string[] subregion = comps[2].Split(','); |
163 | if (subregion.Length == 6) | 163 | if (subregion.Length == 6) |
164 | { | 164 | { |
165 | LLVector3 min, max; | 165 | Vector3 min, max; |
166 | try | 166 | try |
167 | { | 167 | { |
168 | min = new LLVector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2])); | 168 | min = new Vector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2])); |
169 | max = new LLVector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5])); | 169 | max = new Vector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5])); |
170 | } | 170 | } |
171 | catch (Exception) | 171 | catch (Exception) |
172 | { | 172 | { |
@@ -215,7 +215,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
215 | return XmlWriterResult; | 215 | return XmlWriterResult; |
216 | } | 216 | } |
217 | 217 | ||
218 | protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, LLVector3 min, LLVector3 max) | 218 | protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max) |
219 | { | 219 | { |
220 | httpResponse.SendChunked = true; | 220 | httpResponse.SendChunked = true; |
221 | httpResponse.ContentType = "text/xml"; | 221 | httpResponse.ContentType = "text/xml"; |
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs index 6e3d1ff..73a1b9b 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs | |||
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions; | |||
36 | using System.Timers; | 36 | using System.Timers; |
37 | using System.Xml; | 37 | using System.Xml; |
38 | using System.Xml.Serialization; | 38 | using System.Xml.Serialization; |
39 | using libsecondlife; | 39 | using OpenMetaverse; |
40 | using Mono.Addins; | 40 | using Mono.Addins; |
41 | using Nwc.XmlRpc; | 41 | using Nwc.XmlRpc; |
42 | using Nini.Config; | 42 | using Nini.Config; |
@@ -76,10 +76,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
76 | // Parse region ID and other parameters | 76 | // Parse region ID and other parameters |
77 | param = param.TrimEnd(new char[]{'/'}); | 77 | param = param.TrimEnd(new char[]{'/'}); |
78 | string[] comps = param.Split('/'); | 78 | string[] comps = param.Split('/'); |
79 | LLUUID regionID = (LLUUID)comps[0]; | 79 | UUID regionID = (UUID)comps[0]; |
80 | 80 | ||
81 | m_log.DebugFormat("{0} POST region UUID {1}", MsgID, regionID.ToString()); | 81 | m_log.DebugFormat("{0} POST region UUID {1}", MsgID, regionID.ToString()); |
82 | if (LLUUID.Zero == regionID) throw new Exception("missing region ID"); | 82 | if (UUID.Zero == regionID) throw new Exception("missing region ID"); |
83 | 83 | ||
84 | Scene scene = null; | 84 | Scene scene = null; |
85 | App.SceneManager.TryGetScene(regionID, out scene); | 85 | App.SceneManager.TryGetScene(regionID, out scene); |
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs index 74cf354..d517895 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using libsecondlife; | 28 | using OpenMetaverse; |
29 | using System; | 29 | using System; |
30 | using System.Collections; | 30 | using System.Collections; |
31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
@@ -58,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
58 | region_id = regInfo.RegionID.ToString(); | 58 | region_id = regInfo.RegionID.ToString(); |
59 | region_x = regInfo.RegionLocX; | 59 | region_x = regInfo.RegionLocX; |
60 | region_y = regInfo.RegionLocY; | 60 | region_y = regInfo.RegionLocY; |
61 | if (regInfo.EstateSettings.EstateOwner != LLUUID.Zero) | 61 | if (regInfo.EstateSettings.EstateOwner != UUID.Zero) |
62 | region_owner_id = regInfo.EstateSettings.EstateOwner.ToString(); | 62 | region_owner_id = regInfo.EstateSettings.EstateOwner.ToString(); |
63 | else | 63 | else |
64 | region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString(); | 64 | region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString(); |
@@ -101,4 +101,4 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
101 | } | 101 | } |
102 | } | 102 | } |
103 | } | 103 | } |
104 | } \ No newline at end of file | 104 | } |
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index 1f68d2b..4c24f3f 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | |||
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions; | |||
36 | using System.Timers; | 36 | using System.Timers; |
37 | using System.Xml; | 37 | using System.Xml; |
38 | using System.Xml.Serialization; | 38 | using System.Xml.Serialization; |
39 | using libsecondlife; | 39 | using OpenMetaverse; |
40 | using Nwc.XmlRpc; | 40 | using Nwc.XmlRpc; |
41 | using Nini.Config; | 41 | using Nini.Config; |
42 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |