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/ApplicationPlugins/Rest/Regions/GETHandler.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-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/ApplicationPlugins/Rest/Regions/GETHandler.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs | 16 |
1 files changed, 8 insertions, 8 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"; |