Merge branch 'master' into careminster

This commit is contained in:
Melanie
2011-12-19 21:30:57 +00:00
8 changed files with 108 additions and 62 deletions

View File

@@ -1545,7 +1545,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
options["profile"] = (string)requestData["profile"];
}
if (requestData["noassets"].ToString() == "true")
if ((string)requestData["noassets"] == "true")
{
options["noassets"] = (string)requestData["noassets"] ;
}