diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 83b5319..5a6a328 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -877,10 +877,13 @@ namespace OpenSim.Grid.GridServer | |||
877 | /// <param name="request"></param> | 877 | /// <param name="request"></param> |
878 | /// <param name="path"></param> | 878 | /// <param name="path"></param> |
879 | /// <param name="param"></param> | 879 | /// <param name="param"></param> |
880 | /// <param name="httpRequest">HTTP request header object</param> | ||
881 | /// <param name="httpResponse">HTTP response header object</param> | ||
880 | /// <returns></returns> | 882 | /// <returns></returns> |
881 | public string RestGetRegionMethod(string request, string path, string param) | 883 | public string RestGetRegionMethod(string request, string path, string param, |
884 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
882 | { | 885 | { |
883 | return RestGetSimMethod(String.Empty, "/sims/", param); | 886 | return RestGetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); |
884 | } | 887 | } |
885 | 888 | ||
886 | /// <summary> | 889 | /// <summary> |
@@ -889,10 +892,13 @@ namespace OpenSim.Grid.GridServer | |||
889 | /// <param name="request"></param> | 892 | /// <param name="request"></param> |
890 | /// <param name="path"></param> | 893 | /// <param name="path"></param> |
891 | /// <param name="param"></param> | 894 | /// <param name="param"></param> |
895 | /// <param name="httpRequest">HTTP request header object</param> | ||
896 | /// <param name="httpResponse">HTTP response header object</param> | ||
892 | /// <returns></returns> | 897 | /// <returns></returns> |
893 | public string RestSetRegionMethod(string request, string path, string param) | 898 | public string RestSetRegionMethod(string request, string path, string param, |
899 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
894 | { | 900 | { |
895 | return RestSetSimMethod(String.Empty, "/sims/", param); | 901 | return RestSetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); |
896 | } | 902 | } |
897 | 903 | ||
898 | /// <summary> | 904 | /// <summary> |
@@ -901,8 +907,11 @@ namespace OpenSim.Grid.GridServer | |||
901 | /// <param name="request"></param> | 907 | /// <param name="request"></param> |
902 | /// <param name="path"></param> | 908 | /// <param name="path"></param> |
903 | /// <param name="param">A string representing the sim's UUID</param> | 909 | /// <param name="param">A string representing the sim's UUID</param> |
910 | /// <param name="httpRequest">HTTP request header object</param> | ||
911 | /// <param name="httpResponse">HTTP response header object</param> | ||
904 | /// <returns>Information about the sim in XML</returns> | 912 | /// <returns>Information about the sim in XML</returns> |
905 | public string RestGetSimMethod(string request, string path, string param) | 913 | public string RestGetSimMethod(string request, string path, string param, |
914 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
906 | { | 915 | { |
907 | string respstring = String.Empty; | 916 | string respstring = String.Empty; |
908 | 917 | ||
@@ -946,8 +955,11 @@ namespace OpenSim.Grid.GridServer | |||
946 | /// <param name="request"></param> | 955 | /// <param name="request"></param> |
947 | /// <param name="path"></param> | 956 | /// <param name="path"></param> |
948 | /// <param name="param"></param> | 957 | /// <param name="param"></param> |
958 | /// <param name="httpRequest">HTTP request header object</param> | ||
959 | /// <param name="httpResponse">HTTP response header object</param> | ||
949 | /// <returns>"OK" or an error</returns> | 960 | /// <returns>"OK" or an error</returns> |
950 | public string RestSetSimMethod(string request, string path, string param) | 961 | public string RestSetSimMethod(string request, string path, string param, |
962 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
951 | { | 963 | { |
952 | Console.WriteLine("Processing region update via REST method"); | 964 | Console.WriteLine("Processing region update via REST method"); |
953 | RegionProfileData theSim; | 965 | RegionProfileData theSim; |