aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorMelanie2009-08-19 05:15:25 +0100
committerMelanie2009-08-19 05:15:25 +0100
commitdd0234f5005127c03760c2b9862ed1672f4a2e91 (patch)
treeceb6e9b1c182618063cf0cab5d1e10378eade99b /OpenSim/Grid/UserServer
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-dd0234f5005127c03760c2b9862ed1672f4a2e91.zip
opensim-SC-dd0234f5005127c03760c2b9862ed1672f4a2e91.tar.gz
opensim-SC-dd0234f5005127c03760c2b9862ed1672f4a2e91.tar.bz2
opensim-SC-dd0234f5005127c03760c2b9862ed1672f4a2e91.tar.xz
Graft the REST console onto the grid server. Same procedure as with
the user server.
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index f47a96e..1ee53ef 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -157,7 +157,6 @@ namespace OpenSim.Grid.UserServer
157 157
158 if (m_console is RemoteConsole) 158 if (m_console is RemoteConsole)
159 { 159 {
160 System.Console.WriteLine("Initialized REST console");
161 RemoteConsole c = (RemoteConsole)m_console; 160 RemoteConsole c = (RemoteConsole)m_console;
162 c.SetServer(m_httpServer); 161 c.SetServer(m_httpServer);
163 IConfig netConfig = m_config.AddConfig("Network"); 162 IConfig netConfig = m_config.AddConfig("Network");