aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2010-01-17 11:33:47 -0800
committerDiva Canto2010-01-17 11:33:47 -0800
commitf276ba57bf5bd732fbc6a255213c9bb7f5f5f148 (patch)
tree65c49c571c4012b195a309866b8bf6ed2885f9ef /OpenSim/Server
parentCopyright notices. (diff)
downloadopensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.zip
opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.tar.gz
opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.tar.bz2
opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.tar.xz
HG agent transfers are starting to work. Gatekeeper handlers are missing.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs2
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs12
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index 762ea79..f72b36c 100644
--- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
109 Hashtable requestData = (Hashtable)request.Params[0]; 109 Hashtable requestData = (Hashtable)request.Params[0];
110 //string host = (string)requestData["host"]; 110 //string host = (string)requestData["host"];
111 //string portstr = (string)requestData["port"]; 111 //string portstr = (string)requestData["port"];
112 string regionID_str = (string)requestData["regionID"]; 112 string regionID_str = (string)requestData["region_uuid"];
113 UUID regionID = UUID.Zero; 113 UUID regionID = UUID.Zero;
114 UUID.TryParse(regionID_str, out regionID); 114 UUID.TryParse(regionID_str, out regionID);
115 115
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 45e88ce..0c098d9 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -59,13 +59,13 @@ namespace OpenSim.Server.Handlers.Simulation
59 59
60 public Hashtable Handler(Hashtable request) 60 public Hashtable Handler(Hashtable request)
61 { 61 {
62 //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); 62 m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
63 63
64 //m_log.Debug("---------------------------"); 64 m_log.Debug("---------------------------");
65 //m_log.Debug(" >> uri=" + request["uri"]); 65 m_log.Debug(" >> uri=" + request["uri"]);
66 //m_log.Debug(" >> content-type=" + request["content-type"]); 66 m_log.Debug(" >> content-type=" + request["content-type"]);
67 //m_log.Debug(" >> http-method=" + request["http-method"]); 67 m_log.Debug(" >> http-method=" + request["http-method"]);
68 //m_log.Debug("---------------------------\n"); 68 m_log.Debug("---------------------------\n");
69 69
70 Hashtable responsedata = new Hashtable(); 70 Hashtable responsedata = new Hashtable();
71 responsedata["content_type"] = "text/html"; 71 responsedata["content_type"] = "text/html";