OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2011-05-09 01:04:55 +01:00
parent 7cc5286f2d 00f10c900a
commit 66a5906548
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
View File

@ -73,7 +73,7 @@ namespace OpenSim.Capabilities.Handlers
string textureStr = query.GetOne("texture_id"); string textureStr = query.GetOne("texture_id");
string format = query.GetOne("format"); string format = query.GetOne("format");
m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr); //m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr);
if (m_assetService == null) if (m_assetService == null)
{ {

2
OpenSim/Framework/WebUtil.cs
View File

@ -841,7 +841,7 @@ namespace OpenSim.Framework
{ {
if ((verb == "POST") || (verb == "PUT")) if ((verb == "POST") || (verb == "PUT"))
{ {
request.ContentType = "text/www-form-urlencoded"; request.ContentType = "application/x-www-form-urlencoded";
int length = 0; int length = 0;
using (StreamWriter writer = new StreamWriter(buffer)) using (StreamWriter writer = new StreamWriter(buffer))