diff options
Diffstat (limited to 'OpenSim/Capabilities')
4 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index 7ab30ce..ae95821 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Capabilities.Handlers | |||
64 | m_assetService = assService; | 64 | m_assetService = assService; |
65 | } | 65 | } |
66 | 66 | ||
67 | public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 67 | public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
68 | { | 68 | { |
69 | // Try to parse the texture ID from the request URL | 69 | // Try to parse the texture ID from the request URL |
70 | NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); | 70 | NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); |
@@ -127,7 +127,7 @@ namespace OpenSim.Capabilities.Handlers | |||
127 | /// <param name="textureID"></param> | 127 | /// <param name="textureID"></param> |
128 | /// <param name="format"></param> | 128 | /// <param name="format"></param> |
129 | /// <returns>False for "caller try another codec"; true otherwise</returns> | 129 | /// <returns>False for "caller try another codec"; true otherwise</returns> |
130 | private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format) | 130 | private bool FetchTexture(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, UUID textureID, string format) |
131 | { | 131 | { |
132 | // m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format); | 132 | // m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format); |
133 | AssetBase texture; | 133 | AssetBase texture; |
@@ -211,7 +211,7 @@ namespace OpenSim.Capabilities.Handlers | |||
211 | return true; | 211 | return true; |
212 | } | 212 | } |
213 | 213 | ||
214 | private void WriteTextureData(OSHttpRequest request, OSHttpResponse response, AssetBase texture, string format) | 214 | private void WriteTextureData(IOSHttpRequest request, IOSHttpResponse response, AssetBase texture, string format) |
215 | { | 215 | { |
216 | string range = request.Headers.GetOne("Range"); | 216 | string range = request.Headers.GetOne("Range"); |
217 | 217 | ||
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs index b89fd6a..e0ccc3c 100644 --- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Capabilities.Handlers | |||
73 | /// <param name="httpResponse"></param> | 73 | /// <param name="httpResponse"></param> |
74 | /// <returns>The upload response if the request is successful, null otherwise.</returns> | 74 | /// <returns>The upload response if the request is successful, null otherwise.</returns> |
75 | public string UploadBakedTexture( | 75 | public string UploadBakedTexture( |
76 | string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 76 | string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
77 | { | 77 | { |
78 | try | 78 | try |
79 | { | 79 | { |
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs index 2dade5b..a086c0e 100644 --- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Capabilities.Handlers | |||
57 | m_LibraryService = libService; | 57 | m_LibraryService = libService; |
58 | } | 58 | } |
59 | 59 | ||
60 | public string FetchInventoryDescendentsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 60 | public string FetchInventoryDescendentsRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
61 | { | 61 | { |
62 | // lock (m_fetchLock) | 62 | // lock (m_fetchLock) |
63 | // { | 63 | // { |
diff --git a/OpenSim/Capabilities/LLSDStreamHandler.cs b/OpenSim/Capabilities/LLSDStreamHandler.cs index 7aaa994..c7c1fc9 100644 --- a/OpenSim/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Capabilities/LLSDStreamHandler.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Capabilities | |||
45 | } | 45 | } |
46 | 46 | ||
47 | public override byte[] Handle(string path, Stream request, | 47 | public override byte[] Handle(string path, Stream request, |
48 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 48 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
49 | { | 49 | { |
50 | //Encoding encoding = Util.UTF8; | 50 | //Encoding encoding = Util.UTF8; |
51 | //StreamReader streamReader = new StreamReader(request, false); | 51 | //StreamReader streamReader = new StreamReader(request, false); |