aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorlbsa712007-09-25 01:20:30 +0000
committerlbsa712007-09-25 01:20:30 +0000
commit2219ccc5b053d5c8885de113488dfb6718903435 (patch)
tree06bde077b98c0e8df228bec23aef8aa9b2eba39d /OpenSim/Region
parentMore reorganizing of new SE. Added debug print of application exception. (diff)
downloadopensim-SC_OLD-2219ccc5b053d5c8885de113488dfb6718903435.zip
opensim-SC_OLD-2219ccc5b053d5c8885de113488dfb6718903435.tar.gz
opensim-SC_OLD-2219ccc5b053d5c8885de113488dfb6718903435.tar.bz2
opensim-SC_OLD-2219ccc5b053d5c8885de113488dfb6718903435.tar.xz
* Fixed Culture-variant parsing of config options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/Application.cs6
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs7
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs6
4 files changed, 10 insertions, 11 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 572f034..ec7c43d 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -29,6 +29,8 @@ using System;
29using OpenSim.Framework.Console; 29using OpenSim.Framework.Console;
30using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
31using Nini.Config; 31using Nini.Config;
32using System.Threading;
33using OpenSim.Framework;
32 34
33namespace OpenSim 35namespace OpenSim
34{ 36{
@@ -55,9 +57,7 @@ namespace OpenSim
55 57
56 Console.WriteLine("Starting...\n"); 58 Console.WriteLine("Starting...\n");
57 59
58 // Set current culture 60 Culture.SetCurrentCulture();
59
60 System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(""); // en
61 61
62 ArgvConfigSource configSource = new ArgvConfigSource(args); 62 ArgvConfigSource configSource = new ArgvConfigSource(args);
63 63
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index d3b4e49..dad6afd 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -44,6 +44,8 @@ using OpenSim.Region.Communications.OGS1;
44using OpenSim.Region.Environment; 44using OpenSim.Region.Environment;
45using OpenSim.Region.Environment.Scenes; 45using OpenSim.Region.Environment.Scenes;
46using OpenSim.Region.Physics.Manager; 46using OpenSim.Region.Physics.Manager;
47using System.Globalization;
48using RegionInfo=OpenSim.Framework.Types.RegionInfo;
47 49
48namespace OpenSim 50namespace OpenSim
49{ 51{
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5849519..5fbe918 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Region.Environment.Scenes
54{ 54{
55 public partial class Scene : SceneBase 55 public partial class Scene : SceneBase
56 { 56 {
57
57 public delegate bool FilterAvatarList(ScenePresence avatar); 58 public delegate bool FilterAvatarList(ScenePresence avatar);
58 59
59 protected Timer m_heartbeatTimer = new Timer(); 60 protected Timer m_heartbeatTimer = new Timer();
@@ -160,12 +161,6 @@ namespace OpenSim.Region.Environment.Scenes
160 161
161 #region Constructors 162 #region Constructors
162 163
163 /// <summary>
164 /// Creates a new Scene class, and a region to go with it.
165 /// </summary>
166 /// <param name="clientThreads">Dictionary to contain client threads</param>
167 /// <param name="regionHandle">Region Handle for this region</param>
168 /// <param name="regionName">Region Name for this region</param>
169 public Scene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan, 164 public Scene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan,
170 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, 165 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
171 ModuleLoader moduleLoader) 166 ModuleLoader moduleLoader)
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 6454bdc..c3c4935 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -33,6 +33,8 @@ using System.IO;
33using libTerrain; 33using libTerrain;
34using OpenJPEGNet; 34using OpenJPEGNet;
35using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
36using System.Globalization;
37using OpenSim.Framework;
36 38
37namespace OpenSim.Region.Terrain 39namespace OpenSim.Region.Terrain
38{ 40{
@@ -603,8 +605,8 @@ namespace OpenSim.Region.Terrain
603 if (args.GetLength(0) > 2) 605 if (args.GetLength(0) > 2)
604 { 606 {
605 int.TryParse(args[2].ToString(), out count); 607 int.TryParse(args[2].ToString(), out count);
606 double.TryParse(args[3].ToString(), out sizeMin); 608 double.TryParse(args[3].ToString(), NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out sizeMin);
607 double.TryParse(args[4].ToString(), out sizeRange); 609 double.TryParse(args[4].ToString(), NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out sizeRange);
608 bool.TryParse(args[5].ToString(), out island); 610 bool.TryParse(args[5].ToString(), out island);
609 bool.TryParse(args[6].ToString(), out additive); 611 bool.TryParse(args[6].ToString(), out additive);
610 bool.TryParse(args[7].ToString(), out noisy); 612 bool.TryParse(args[7].ToString(), out noisy);