Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-02-22 01:28:54 +00:00
141 changed files with 12110 additions and 779 deletions

View File

@@ -1445,7 +1445,7 @@ namespace OpenSim.Region.ClientStack.Linden
string param, IOSHttpRequest httpRequest,
IOSHttpResponse httpResponse)
{
OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
// OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
OSDMap resp = new OSDMap();
OSDMap accessPrefs = new OSDMap();