Merge branch 'master' into careminster-presence-refactor
commit
66a5906548
|
@ -73,7 +73,7 @@ namespace OpenSim.Capabilities.Handlers
|
|||
string textureStr = query.GetOne("texture_id");
|
||||
string format = query.GetOne("format");
|
||||
|
||||
m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr);
|
||||
//m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr);
|
||||
|
||||
if (m_assetService == null)
|
||||
{
|
||||
|
|
|
@ -841,7 +841,7 @@ namespace OpenSim.Framework
|
|||
{
|
||||
if ((verb == "POST") || (verb == "PUT"))
|
||||
{
|
||||
request.ContentType = "text/www-form-urlencoded";
|
||||
request.ContentType = "application/x-www-form-urlencoded";
|
||||
|
||||
int length = 0;
|
||||
using (StreamWriter writer = new StreamWriter(buffer))
|
||||
|
|
Loading…
Reference in New Issue