aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-04 01:38:11 +0100
committerJustin Clark-Casey (justincc)2010-09-04 01:38:11 +0100
commitc0b16f09bfc4f0c2aeabb7c6315f1124f8b08974 (patch)
tree9e0db9a67ff4b8c9a8c1d938f6407bcee0f7cb42 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentMove code that allows llGiveInvetory() to move item into appropriate system f... (diff)
parentAdded XFF header processing. Untested, for lack of proxy. (diff)
downloadopensim-SC-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.zip
opensim-SC-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.tar.gz
opensim-SC-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.tar.bz2
opensim-SC-c0b16f09bfc4f0c2aeabb7c6315f1124f8b08974.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 95c3e6c..d20f8c9 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Collections.Specialized;
31using System.IO; 32using System.IO;
32using System.Net; 33using System.Net;
33using System.Net.Sockets; 34using System.Net.Sockets;
@@ -737,6 +738,7 @@ namespace OpenSim.Framework.Servers.HttpServer
737 if (methodWasFound) 738 if (methodWasFound)
738 { 739 {
739 xmlRprcRequest.Params.Add(request.Url); // Param[2] 740 xmlRprcRequest.Params.Add(request.Url); // Param[2]
741 xmlRprcRequest.Params.Add(request.Headers.Get("X-Forwarded-For")); // Param[3]
740 742
741 try 743 try
742 { 744 {