aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/General/Culture.cs36
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs36
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs4
3 files changed, 38 insertions, 38 deletions
diff --git a/OpenSim/Framework/General/Culture.cs b/OpenSim/Framework/General/Culture.cs
index 4d175f7..b6c68ed 100644
--- a/OpenSim/Framework/General/Culture.cs
+++ b/OpenSim/Framework/General/Culture.cs
@@ -8,24 +8,24 @@ namespace OpenSim.Framework
8{ 8{
9 public class Culture 9 public class Culture
10 { 10 {
11 private static readonly CultureInfo m_cultureInfo = new System.Globalization.CultureInfo("en-US", true); 11 private static readonly CultureInfo m_cultureInfo = new System.Globalization.CultureInfo("en-US", true);
12 12
13 public static NumberFormatInfo NumberFormatInfo 13 public static NumberFormatInfo NumberFormatInfo
14 { 14 {
15 get 15 get
16 { 16 {
17 return m_cultureInfo.NumberFormat; 17 return m_cultureInfo.NumberFormat;
18 } 18 }
19 } 19 }
20 20
21 public static IFormatProvider FormatProvider 21 public static IFormatProvider FormatProvider
22 { 22 {
23 get 23 get
24 { 24 {
25 return m_cultureInfo; 25 return m_cultureInfo;
26 } 26 }
27 } 27 }
28 28
29 public static void SetCurrentCulture() 29 public static void SetCurrentCulture()
30 { 30 {
31 Thread.CurrentThread.CurrentCulture = m_cultureInfo; 31 Thread.CurrentThread.CurrentCulture = m_cultureInfo;
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index 09e6f7b..7aaa607 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
@@ -1,34 +1,34 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Framework.Console; 4using OpenSim.Framework.Console;
5 5
6namespace OpenSim.Grid.ScriptServer 6namespace OpenSim.Grid.ScriptServer
7{ 7{
8 // Maintains connection and communication to a region 8 // Maintains connection and communication to a region
9 public class RegionConnectionManager: RegionBase 9 public class RegionConnectionManager: RegionBase
10 { 10 {
11 private LogBase m_log; 11 private LogBase m_log;
12 private ScriptServerMain m_ScriptServerMain; 12 private ScriptServerMain m_ScriptServerMain;
13 private object m_Connection; 13 private object m_Connection;
14 public RegionConnectionManager(ScriptServerMain scm, LogBase logger, object Connection) 14 public RegionConnectionManager(ScriptServerMain scm, LogBase logger, object Connection)
15 { 15 {
16 m_ScriptServerMain = scm; 16 m_ScriptServerMain = scm;
17 m_log = logger; 17 m_log = logger;
18 m_Connection = Connection; 18 m_Connection = Connection;
19 } 19 }
20 20
21 private void DataReceived(object objectID, object scriptID) 21 private void DataReceived(object objectID, object scriptID)
22 { 22 {
23 // TODO: HOW DO WE RECEIVE DATA? ASYNC? 23 // TODO: HOW DO WE RECEIVE DATA? ASYNC?
24 // ANYHOW WE END UP HERE? 24 // ANYHOW WE END UP HERE?
25 25
26 // NEW SCRIPT? ASK SCRIPTENGINE TO INITIALIZE IT 26 // NEW SCRIPT? ASK SCRIPTENGINE TO INITIALIZE IT
27 ScriptRez(); 27 ScriptRez();
28 28
29 // EVENT? DELIVER EVENT DIRECTLY TO SCRIPTENGINE 29 // EVENT? DELIVER EVENT DIRECTLY TO SCRIPTENGINE
30 touch_start(); 30 touch_start();
31 31
32 } 32 }
33 33
34 } 34 }
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
index 63701db..ac56fbe 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Grid.ScriptServer
38 { 38 {
39 private Thread listenThread; 39 private Thread listenThread;
40 40
41 private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>(); 41 private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>();
42 42
43 private LogBase m_log; 43 private LogBase m_log;
44 private ScriptServerMain m_ScriptServerMain; 44 private ScriptServerMain m_ScriptServerMain;
@@ -94,7 +94,7 @@ namespace OpenSim.Grid.ScriptServer
94 // - Add script to shared communication channel towards that region 94 // - Add script to shared communication channel towards that region
95 95
96 96
97 // TODO: FAKING A CONNECTION 97 // TODO: FAKING A CONNECTION
98 Regions.Add(new RegionConnectionManager(m_ScriptServerMain, m_log, null)); 98 Regions.Add(new RegionConnectionManager(m_ScriptServerMain, m_log, null));
99 } 99 }
100 100