aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices.GridServer/Main.cs
diff options
context:
space:
mode:
authorgareth2007-04-13 15:14:21 +0000
committergareth2007-04-13 15:14:21 +0000
commitdd5f4abdb9423dd767ccb1c8be310e40fdd1ad43 (patch)
treea9a3647fca57f49e00fed77006bd5379841f5828 /OpenGridServices.GridServer/Main.cs
parentaaaaaaarrrrrrrrrggggghhhhhhhh why oh why? (diff)
downloadopensim-SC_OLD-dd5f4abdb9423dd767ccb1c8be310e40fdd1ad43.zip
opensim-SC_OLD-dd5f4abdb9423dd767ccb1c8be310e40fdd1ad43.tar.gz
opensim-SC_OLD-dd5f4abdb9423dd767ccb1c8be310e40fdd1ad43.tar.bz2
opensim-SC_OLD-dd5f4abdb9423dd767ccb1c8be310e40fdd1ad43.tar.xz
Fixed weird XML/HTTP bugs
Can now update a sim profile at startup automatically! W00t! Untested neighbours code (for sim crossings) Didn't drink any red bull today :( Used liquid guarana extract + cola
Diffstat (limited to 'OpenGridServices.GridServer/Main.cs')
-rw-r--r--OpenGridServices.GridServer/Main.cs20
1 files changed, 5 insertions, 15 deletions
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index c69b6dc..55e2b00 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -47,20 +47,10 @@ namespace OpenGridServices.GridServer
47 public class OpenGrid_Main : BaseServer, conscmd_callback 47 public class OpenGrid_Main : BaseServer, conscmd_callback
48 { 48 {
49 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll"; 49 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
50 private GridConfig Cfg; 50 public GridConfig Cfg;
51 51
52 public static OpenGrid_Main thegrid; 52 public static OpenGrid_Main thegrid;
53 53
54 public string GridOwner;
55 public string DefaultStartupMsg;
56 public string DefaultAssetServer;
57 public string AssetSendKey;
58 public string AssetRecvKey;
59 public string DefaultUserServer;
60 public string UserSendKey;
61 public string UserRecvKey;
62 public string SimSendKey;
63 public string SimRecvKey;
64 //public LLUUID highestUUID; 54 //public LLUUID highestUUID;
65 55
66 private SimProfileManager m_simProfileManager; 56 private SimProfileManager m_simProfileManager;
@@ -109,10 +99,10 @@ namespace OpenGridServices.GridServer
109 99
110 httpServer.AddXmlRPCHandler("simulator_login", m_simProfileManager.XmlRpcLoginToSimulatorMethod); 100 httpServer.AddXmlRPCHandler("simulator_login", m_simProfileManager.XmlRpcLoginToSimulatorMethod);
111 101
112 httpServer.AddRestHandler("GET", "/sims", m_simProfileManager.RestGetSimMethod); 102 httpServer.AddRestHandler("GET", "/sims/", m_simProfileManager.RestGetSimMethod);
113 httpServer.AddRestHandler("POST", "/sims", m_simProfileManager.RestSetSimMethod); 103 httpServer.AddRestHandler("POST", "/sims/", m_simProfileManager.RestSetSimMethod);
114 httpServer.AddRestHandler("GET", "/regions", m_simProfileManager.RestGetRegionMethod); 104 httpServer.AddRestHandler("GET", "/regions/", m_simProfileManager.RestGetRegionMethod);
115 httpServer.AddRestHandler("POST", "/regions", m_simProfileManager.RestSetRegionMethod); 105 httpServer.AddRestHandler("POST", "/regions/", m_simProfileManager.RestSetRegionMethod);
116 106
117 107
118 // lbsa71 : This code snippet taken from old http server. 108 // lbsa71 : This code snippet taken from old http server.