aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
diff options
context:
space:
mode:
authorBlueWall2011-12-07 07:52:24 -0500
committerBlueWall2011-12-07 07:52:24 -0500
commit6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch)
tree6a71504761c3bfc1fedcf77d6c8467330e874fe1 /OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
parentStop accidentally setting up the UploadTexture caps handler with the same url... (diff)
downloadopensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.zip
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.gz
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.bz2
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs')
-rw-r--r--OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
index afe2f27..645a77f 100644
--- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Server.Handlers.Grid
129 } 129 }
130 130
131 public string RestGetGridInfoMethod(string request, string path, string param, 131 public string RestGetGridInfoMethod(string request, string path, string param,
132 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 132 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
133 { 133 {
134 StringBuilder sb = new StringBuilder(); 134 StringBuilder sb = new StringBuilder();
135 135