ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into presence-refactor

Browse Source 
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
This commit is contained in:
Melanie
2010-02-08 15:53:20 +00:00
parent b18e95b3a2 70a0d7aa46
commit baaf660511
63 changed files with 5627 additions and 3494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
View File

@@ -63,7 +63,7 @@ namespace OpenSim.Server.Handlers.Asset
if (p.Length > 0)
{
result = m_AssetService.Delete(p[0]);
// result = m_AssetService.Delete(p[0]);
}
XmlSerializer xs = new XmlSerializer(typeof(bool));