aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorMelanie2010-02-14 22:27:39 +0000
committerMelanie2010-02-14 22:27:39 +0000
commit2084e08ad7a24908a4465108f2b76ee639c91ae6 (patch)
tree1cc1aa8f1c08de402f27036762b9ac2d1eccabfe /OpenSim/ApplicationPlugins
parentResolve a merge issue (diff)
parent* SQLite match code casing with regionsettings table field casing (what's wit... (diff)
downloadopensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.zip
opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.gz
opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.bz2
opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index 9c90a7e..ed18207 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -29,6 +29,7 @@ using System;
29using System.IO; 29using System.IO;
30using System.Xml.Serialization; 30using System.Xml.Serialization;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework;
32using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
33using OpenSim.Framework.Servers.HttpServer; 34using OpenSim.Framework.Servers.HttpServer;
34using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
@@ -156,8 +157,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
156 Vector3 min, max; 157 Vector3 min, max;
157 try 158 try
158 { 159 {
159 min = new Vector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2])); 160 min = new Vector3((float)Double.Parse(subregion[0], Culture.NumberFormatInfo), (float)Double.Parse(subregion[1], Culture.NumberFormatInfo), (float)Double.Parse(subregion[2], Culture.NumberFormatInfo));
160 max = new Vector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5])); 161 max = new Vector3((float)Double.Parse(subregion[3], Culture.NumberFormatInfo), (float)Double.Parse(subregion[4], Culture.NumberFormatInfo), (float)Double.Parse(subregion[5], Culture.NumberFormatInfo));
161 } 162 }
162 catch (Exception) 163 catch (Exception)
163 { 164 {