aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie2011-02-12 00:42:10 +0000
committerMelanie2011-02-12 00:42:10 +0000
commite2762a68b36ee0568fba15d4d42432ffe9be91bd (patch)
treea3b630ab92f8abe4ecfda606a6492c875d6b47c3 /OpenSim/Server
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentrefactor: split out estate management commands into separate class (diff)
downloadopensim-SC_OLD-e2762a68b36ee0568fba15d4d42432ffe9be91bd.zip
opensim-SC_OLD-e2762a68b36ee0568fba15d4d42432ffe9be91bd.tar.gz
opensim-SC_OLD-e2762a68b36ee0568fba15d4d42432ffe9be91bd.tar.bz2
opensim-SC_OLD-e2762a68b36ee0568fba15d4d42432ffe9be91bd.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index b33b0d5..448e321 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -205,6 +205,11 @@ namespace OpenSim.Server.Handlers.Simulation
205 205
206 // We're behind a proxy 206 // We're behind a proxy
207 Hashtable headers = (Hashtable)request["headers"]; 207 Hashtable headers = (Hashtable)request["headers"];
208
209 //// DEBUG
210 //foreach (object o in headers.Keys)
211 // m_log.DebugFormat("XXX {0} = {1}", o.ToString(), (headers[o] == null? "null" : headers[o].ToString()));
212
208 string xff = "X-Forwarded-For"; 213 string xff = "X-Forwarded-For";
209 if (headers.ContainsKey(xff.ToLower())) 214 if (headers.ContainsKey(xff.ToLower()))
210 xff = xff.ToLower(); 215 xff = xff.ToLower();