aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs5
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs6
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
5 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
index 760c4e8..a02429c 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Grid.ScriptServer 28namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
29{ 29{
30 public abstract class RegionBase 30 public abstract class RegionBase
31 { 31 {
@@ -240,4 +240,4 @@ namespace OpenSim.Grid.ScriptServer
240 onhttp_response(); 240 onhttp_response();
241 } 241 }
242 } 242 }
243} 243} \ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index b815a37..8c31b9b 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
@@ -25,9 +25,8 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Grid.ScriptServer 28namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
29{ 29{
30 // Maintains connection and communication to a region
31 public class RegionConnectionManager : RegionBase 30 public class RegionConnectionManager : RegionBase
32 { 31 {
33 private ScriptServerMain m_ScriptServerMain; 32 private ScriptServerMain m_ScriptServerMain;
@@ -39,4 +38,4 @@ namespace OpenSim.Grid.ScriptServer
39 m_Connection = Connection; 38 m_Connection = Connection;
40 } 39 }
41 } 40 }
42} 41} \ No newline at end of file
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
index c87352c..8422bea 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
@@ -28,10 +28,10 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Threading; 29using System.Threading;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Grid.ScriptServer.ScriptServer.Region;
31 32
32namespace OpenSim.Grid.ScriptServer 33namespace OpenSim.Grid.ScriptServer.ScriptServer
33{ 34{
34 // Waiting for incoming script requests from region
35 internal class RegionCommManager 35 internal class RegionCommManager
36 { 36 {
37 private Thread listenThread; 37 private Thread listenThread;
@@ -99,4 +99,4 @@ namespace OpenSim.Grid.ScriptServer
99 Regions.Add(new RegionConnectionManager(m_ScriptServerMain, null)); 99 Regions.Add(new RegionConnectionManager(m_ScriptServerMain, null));
100 } 100 }
101 } 101 }
102} 102} \ No newline at end of file
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index f294dcf..b123b8c 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -34,9 +34,9 @@ using log4net;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Data; 35using OpenSim.Data;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications;
37using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
39using OpenSim.Framework.UserManagement;
40 40
41namespace OpenSim.Grid.UserServer 41namespace OpenSim.Grid.UserServer
42{ 42{
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index aa2c959..5d0e1d6 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -34,7 +34,7 @@ using libsecondlife;
34using log4net; 34using log4net;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.UserManagement; 37using OpenSim.Framework.Communications;
38 38
39namespace OpenSim.Grid.UserServer 39namespace OpenSim.Grid.UserServer
40{ 40{