aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest/Regions
diff options
context:
space:
mode:
authorJeff Ames2008-08-15 10:24:04 +0000
committerJeff Ames2008-08-15 10:24:04 +0000
commitdde21314e75acdaeff27af70077f283493401961 (patch)
tree490ab065895adb41ee4771fce623f99faa60b507 /OpenSim/ApplicationPlugins/Rest/Regions
parentFixes a case where, when inventory is not currently accessible due (diff)
downloadopensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.zip
opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.gz
opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.bz2
opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.xz
Update svn properties, formatting cleanup, fix a couple compiler warnings.
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Regions')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index e5ec94b..ce564dd 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -133,7 +133,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
133 return XmlWriterResult; 133 return XmlWriterResult;
134 } 134 }
135 135
136 if (2 == comps.Length) { 136 if (2 == comps.Length)
137 {
137 string resp = ShortRegionInfo(comps[1], details[comps[1]]); 138 string resp = ShortRegionInfo(comps[1], details[comps[1]]);
138 if (null != resp) return resp; 139 if (null != resp) return resp;
139 140
@@ -153,7 +154,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
153 } 154 }
154 } 155 }
155 156
156 if (3 == comps.Length) { 157 if (3 == comps.Length)
158 {
157 switch (comps[1].ToLower()) 159 switch (comps[1].ToLower())
158 { 160 {
159 case "prims": 161 case "prims":
@@ -166,7 +168,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
166 min = new LLVector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2])); 168 min = new LLVector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2]));
167 max = new LLVector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5])); 169 max = new LLVector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5]));
168 } 170 }
169 catch (Exception e) 171 catch (Exception)
170 { 172 {
171 return Failure(httpResponse, OSHttpStatusCode.ClientErrorBadRequest, 173 return Failure(httpResponse, OSHttpStatusCode.ClientErrorBadRequest,
172 "GET", "invalid subregion parameter"); 174 "GET", "invalid subregion parameter");