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

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2010-01-03 21:43:39 +00:00
parent 71fdc24f5c e69ec1108f
commit 61ce884336
56 changed files with 1095 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Data/MySQL/MySQLInventoryData.cs
View File

@@ -91,7 +91,7 @@ namespace OpenSim.Data.MySQL
rollbackStore = GridDataMySqlFile.ParseFileReadValue("rollback") == "true";
opengridmode = GridDataMySqlFile.ParseFileReadValue("opengridmode") == "true";
if(rollbackStore)
if (rollbackStore)
m_log.Warn("[MysqlInventory] Enabling rollback mode in: " + rollbackDir);
database =
@@ -264,7 +264,7 @@ namespace OpenSim.Data.MySQL
{
database.Reconnect();
m_log.Error(e.ToString());
return null;
throw;
}
}
@@ -552,7 +552,7 @@ namespace OpenSim.Data.MySQL
private void StoreRollbackItem(UUID ItemID)
{
if(rollbackStore == true)
if (rollbackStore == true)
{
string todaysPath = RollbackGetTodaysPath();
@@ -1008,7 +1008,7 @@ namespace OpenSim.Data.MySQL
StoreRollbackFolder(f.ID);
deleteOneFolder(f.ID);
if(rollbackStore)
if (rollbackStore)
{
foreach (InventoryItemBase itemBase in getInventoryInFolder(f.ID))
{