aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs2
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs2
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs2
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Grid/UserServer/UserServerCommandModule.cs8
8 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
index 2687af6..8f4b9a0 100644
--- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
+++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.AssetInventoryServer
55 { 55 {
56 ConfigFile = config; 56 ConfigFile = config;
57 57
58 m_console = new ConsoleBase("AssetInventory"); 58 m_console = new LocalConsole("AssetInventory");
59 MainConsole.Instance = m_console; 59 MainConsole.Instance = m_console;
60 } 60 }
61 61
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 5b23d5a..82a6078 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Grid.AssetServer
76 76
77 public OpenAsset_Main() 77 public OpenAsset_Main()
78 { 78 {
79 m_console = new ConsoleBase("Asset"); 79 m_console = new LocalConsole("Asset");
80 80
81 MainConsole.Instance = m_console; 81 MainConsole.Instance = m_console;
82 } 82 }
diff --git a/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs
index 1a4fe72..420249d 100644
--- a/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Grid.GridServer.Modules
53 53
54 protected IGridServiceCore m_core; 54 protected IGridServiceCore m_core;
55 55
56 protected ConsoleBase m_console; 56 protected CommandConsole m_console;
57 57
58 #region IGridPlugin Members 58 #region IGridPlugin Members
59 59
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index a1170f8..a281a37 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Grid.GridServer
70 70
71 public GridServerBase() 71 public GridServerBase()
72 { 72 {
73 m_console = new ConsoleBase("Grid"); 73 m_console = new LocalConsole("Grid");
74 MainConsole.Instance = m_console; 74 MainConsole.Instance = m_console;
75 } 75 }
76 76
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index fa316b1..b2ed6d3 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Grid.InventoryServer
60 60
61 public OpenInventory_Main() 61 public OpenInventory_Main()
62 { 62 {
63 m_console = new ConsoleBase("Inventory"); 63 m_console = new LocalConsole("Inventory");
64 MainConsole.Instance = m_console; 64 MainConsole.Instance = m_console;
65 } 65 }
66 66
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index c92dd6e..6fe0c8f 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Grid.MessagingServer
69 69
70 public OpenMessage_Main() 70 public OpenMessage_Main()
71 { 71 {
72 m_console = new ConsoleBase("Messaging"); 72 m_console = new LocalConsole("Messaging");
73 MainConsole.Instance = m_console; 73 MainConsole.Instance = m_console;
74 } 74 }
75 75
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 0a5abd3..d9185cb 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Grid.UserServer
84 84
85 public OpenUser_Main() 85 public OpenUser_Main()
86 { 86 {
87 m_console = new ConsoleBase("User"); 87 m_console = new LocalConsole("User");
88 MainConsole.Instance = m_console; 88 MainConsole.Instance = m_console;
89 } 89 }
90 90
@@ -126,7 +126,7 @@ namespace OpenSim.Grid.UserServer
126 126
127 m_httpServer = new BaseHttpServer(Cfg.HttpPort); 127 m_httpServer = new BaseHttpServer(Cfg.HttpPort);
128 128
129 RegisterInterface<ConsoleBase>(m_console); 129 RegisterInterface<CommandConsole>(m_console);
130 RegisterInterface<UserConfig>(Cfg); 130 RegisterInterface<UserConfig>(Cfg);
131 131
132 //Should be in modules? 132 //Should be in modules?
diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs
index f73b3de..1d74c80 100644
--- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs
+++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Grid.UserServer
49 { 49 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 51
52 protected ConsoleBase m_console; 52 protected CommandConsole m_console;
53 protected UserConfig m_cfg; 53 protected UserConfig m_cfg;
54 54
55 protected UserDataBaseService m_userDataBaseService; 55 protected UserDataBaseService m_userDataBaseService;
@@ -88,8 +88,8 @@ namespace OpenSim.Grid.UserServer
88 m_loginService = loginService; 88 m_loginService = loginService;
89 } 89 }
90 90
91 ConsoleBase console; 91 CommandConsole console;
92 if ((m_core.TryGet<ConsoleBase>(out console)) && (m_cfg != null) 92 if ((m_core.TryGet<CommandConsole>(out console)) && (m_cfg != null)
93 && (m_userDataBaseService != null) && (m_loginService != null)) 93 && (m_userDataBaseService != null) && (m_loginService != null))
94 { 94 {
95 RegisterConsoleCommands(console); 95 RegisterConsoleCommands(console);
@@ -101,7 +101,7 @@ namespace OpenSim.Grid.UserServer
101 101
102 } 102 }
103 103
104 private void RegisterConsoleCommands(ConsoleBase console) 104 private void RegisterConsoleCommands(CommandConsole console)
105 { 105 {
106 m_console = console; 106 m_console = console;
107 m_console.Commands.AddCommand("userserver", false, "create user", 107 m_console.Commands.AddCommand("userserver", false, "create user",