aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/Main.cs
diff options
context:
space:
mode:
authorlbsa712008-03-12 09:17:23 +0000
committerlbsa712008-03-12 09:17:23 +0000
commit47ed69c933c3d9b4bd97fd9ca8857edca6ef402c (patch)
tree5dfbf4a535f97beb8bf1517ad8d1a0076862ae19 /OpenSim/Grid/GridServer/Main.cs
parent* minor refactoring (diff)
downloadopensim-SC_OLD-47ed69c933c3d9b4bd97fd9ca8857edca6ef402c.zip
opensim-SC_OLD-47ed69c933c3d9b4bd97fd9ca8857edca6ef402c.tar.gz
opensim-SC_OLD-47ed69c933c3d9b4bd97fd9ca8857edca6ef402c.tar.bz2
opensim-SC_OLD-47ed69c933c3d9b4bd97fd9ca8857edca6ef402c.tar.xz
* Extracted RegionProfileData from Request
* Introduced ValidateNewRegion and ValidateOverwrite
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer/Main.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index ff4cfa2..b13ab0c 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Grid.GridServer
105 m_log.Info("[GRID]: Connecting to Storage Server"); 105 m_log.Info("[GRID]: Connecting to Storage Server");
106 m_gridManager = new GridManager(); 106 m_gridManager = new GridManager();
107 m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win 107 m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win
108 m_gridManager.config = Cfg; 108 m_gridManager.Config = Cfg;
109 109
110 m_log.Info("[GRID]: Starting HTTP process"); 110 m_log.Info("[GRID]: Starting HTTP process");
111 BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); 111 BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort);
@@ -120,7 +120,6 @@ namespace OpenSim.Grid.GridServer
120 httpServer.AddXmlRPCHandler("register_messageserver", m_gridManager.XmlRPCRegisterMessageServer); 120 httpServer.AddXmlRPCHandler("register_messageserver", m_gridManager.XmlRPCRegisterMessageServer);
121 httpServer.AddXmlRPCHandler("deregister_messageserver", m_gridManager.XmlRPCDeRegisterMessageServer); 121 httpServer.AddXmlRPCHandler("deregister_messageserver", m_gridManager.XmlRPCDeRegisterMessageServer);
122 122
123
124 httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod)); 123 httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod));
125 httpServer.AddStreamHandler(new RestStreamHandler("POST", "/sims/", m_gridManager.RestSetSimMethod)); 124 httpServer.AddStreamHandler(new RestStreamHandler("POST", "/sims/", m_gridManager.RestSetSimMethod));
126 125