Merge branch 'master' into careminster

This commit is contained in:
Melanie
2009-11-26 17:27:03 +00:00
20 changed files with 194 additions and 147 deletions

View File

@@ -1018,10 +1018,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
{
get { return m_RegionID; }
}
public bool CanBeDeleted()
{
return true;
}
}
}