diff options
| author | Melanie | 2009-12-14 00:40:56 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-14 00:40:56 +0000 |
| commit | 824d7190c2a5520f1cf6f3d24585b8c47c841e55 (patch) | |
| tree | 0814d0228121249b7f2a33658180a0a446d13f51 /OpenSim/Data | |
| parent | And reverse (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-824d7190c2a5520f1cf6f3d24585b8c47c841e55.zip opensim-SC_OLD-824d7190c2a5520f1cf6f3d24585b8c47c841e55.tar.gz opensim-SC_OLD-824d7190c2a5520f1cf6f3d24585b8c47c841e55.tar.bz2 opensim-SC_OLD-824d7190c2a5520f1cf6f3d24585b8c47c841e55.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 0ea0cb7..d560c5f 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
| @@ -91,6 +91,9 @@ namespace OpenSim.Data.MySQL | |||
| 91 | rollbackStore = GridDataMySqlFile.ParseFileReadValue("rollback") == "true"; | 91 | rollbackStore = GridDataMySqlFile.ParseFileReadValue("rollback") == "true"; |
| 92 | opengridmode = GridDataMySqlFile.ParseFileReadValue("opengridmode") == "true"; | 92 | opengridmode = GridDataMySqlFile.ParseFileReadValue("opengridmode") == "true"; |
| 93 | 93 | ||
| 94 | if(rollbackStore) | ||
| 95 | m_log.Warn("[MysqlInventory] Enabling rollback mode in: " + rollbackDir); | ||
| 96 | |||
| 94 | database = | 97 | database = |
| 95 | new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, | 98 | new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, |
| 96 | settingPort); | 99 | settingPort); |