From 1294da6a930edb86bfa4d3fb120b5a88b65b4aab Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Mon, 15 Oct 2007 07:01:22 +0000 Subject: * Applied Chillken patch #418 : newline-r2092.patch ; failed on assemblyinfo tho. Thanxs Chillken! --- .../ScriptServer/Region/RegionConnectionManager.cs | 36 +++++++++++----------- .../ScriptServer/ScriptServer/RegionCommManager.cs | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'OpenSim/Grid/ScriptServer') 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 @@ 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(); + } } 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 { private Thread listenThread; - private List Regions = new List(); + private List Regions = new List(); 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)); } -- cgit v1.1