Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-11-23 03:00:09 -08:00
commit 87e565d28d
3 changed files with 7 additions and 1 deletions

View File

@ -697,6 +697,7 @@ namespace OpenSim.Data.SQLite
DataRow landRow = land.Rows.Find(globalID.ToString());
if (landRow != null)
{
landRow.Delete();
land.Rows.Remove(landRow);
}
List<DataRow> rowsToDelete = new List<DataRow>();
@ -707,6 +708,7 @@ namespace OpenSim.Data.SQLite
}
for (int iter = 0; iter < rowsToDelete.Count; iter++)
{
rowsToDelete[iter].Delete();
landaccesslist.Rows.Remove(rowsToDelete[iter]);
}
}
@ -755,6 +757,7 @@ namespace OpenSim.Data.SQLite
}
for (int iter = 0; iter < rowsToDelete.Count; iter++)
{
rowsToDelete[iter].Delete();
landaccesslist.Rows.Remove(rowsToDelete[iter]);
}
rowsToDelete.Clear();

View File

@ -657,6 +657,7 @@ namespace OpenSim.Data.SQLiteLegacy
DataRow landRow = land.Rows.Find(globalID.ToString());
if (landRow != null)
{
landRow.Delete();
land.Rows.Remove(landRow);
}
List<DataRow> rowsToDelete = new List<DataRow>();
@ -667,6 +668,7 @@ namespace OpenSim.Data.SQLiteLegacy
}
for (int iter = 0; iter < rowsToDelete.Count; iter++)
{
rowsToDelete[iter].Delete();
landaccesslist.Rows.Remove(rowsToDelete[iter]);
}
@ -717,6 +719,7 @@ namespace OpenSim.Data.SQLiteLegacy
}
for (int iter = 0; iter < rowsToDelete.Count; iter++)
{
rowsToDelete[iter].Delete();
landaccesslist.Rows.Remove(rowsToDelete[iter]);
}
rowsToDelete.Clear();

View File

@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
List<string> mainParams = ops.Parse(cmdparams);
if (cmdparams.Length > 2)
if (mainParams.Count > 2)
{
ArchiveRegion(mainParams[2], options);
}