OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Applied Chillken patch #418 : newline-r2092.patch ; failed on assemblyinfo tho. Thanxs Chillken!

afrisby
lbsa71 2007-10-15 07:01:22 +00:00
parent 77459edb70
commit 1294da6a93
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
OpenSim/Framework/General/Culture.cs
View File

@ -8,24 +8,24 @@ namespace OpenSim.Framework
{
public class Culture
{
private static readonly CultureInfo m_cultureInfo = new System.Globalization.CultureInfo("en-US", true);
public static NumberFormatInfo NumberFormatInfo
{
get
{
return m_cultureInfo.NumberFormat;
}
}
public static IFormatProvider FormatProvider
{
get
{
return m_cultureInfo;
}
}
private static readonly CultureInfo m_cultureInfo = new System.Globalization.CultureInfo("en-US", true);
public static NumberFormatInfo NumberFormatInfo
{
get
{
return m_cultureInfo.NumberFormat;
}
}
public static IFormatProvider FormatProvider
{
get
{
return m_cultureInfo;
}
}
public static void SetCurrentCulture()
{
Thread.CurrentThread.CurrentCulture = m_cultureInfo;

36
OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
View File

@ -1,34 +1,34 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Text;
using OpenSim.Framework.Console;
namespace OpenSim.Grid.ScriptServer
{
// Maintains connection and communication to a region
public class RegionConnectionManager: RegionBase
{
{
private LogBase m_log;
private ScriptServerMain m_ScriptServerMain;
private object m_Connection;
private ScriptServerMain m_ScriptServerMain;
private object m_Connection;
public RegionConnectionManager(ScriptServerMain scm, LogBase logger, object Connection)
{
m_ScriptServerMain = scm;
m_log = logger;
m_log = logger;
m_Connection = Connection;
}
private void DataReceived(object objectID, object scriptID)
{
// TODO: HOW DO WE RECEIVE DATA? ASYNC?
// ANYHOW WE END UP HERE?
// NEW SCRIPT? ASK SCRIPTENGINE TO INITIALIZE IT
ScriptRez();
// EVENT? DELIVER EVENT DIRECTLY TO SCRIPTENGINE
touch_start();
}
private void DataReceived(object objectID, object scriptID)
{
// TODO: HOW DO WE RECEIVE DATA? ASYNC?
// ANYHOW WE END UP HERE?
// NEW SCRIPT? ASK SCRIPTENGINE TO INITIALIZE IT
ScriptRez();
// EVENT? DELIVER EVENT DIRECTLY TO SCRIPTENGINE
touch_start();
}
}

4
OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
View File

@ -38,7 +38,7 @@ namespace OpenSim.Grid.ScriptServer
{
private Thread listenThread;
private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>();
private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>();
private LogBase m_log;
private ScriptServerMain m_ScriptServerMain;
@ -94,7 +94,7 @@ namespace OpenSim.Grid.ScriptServer
// - Add script to shared communication channel towards that region
// TODO: FAKING A CONNECTION
// TODO: FAKING A CONNECTION
Regions.Add(new RegionConnectionManager(m_ScriptServerMain, m_log, null));
}