aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLInventoryData.cs
diff options
context:
space:
mode:
authorMelanie2009-12-14 00:32:00 +0000
committerMelanie2009-12-14 00:32:00 +0000
commit0813dc8c1d8ff6a2de04dc48e991e803eb3df260 (patch)
tree3aa288c205e41277ef927eac8605dc70845d8065 /OpenSim/Data/MySQL/MySQLInventoryData.cs
parentAdd an option to exit an instance rather than restarting a region within it (diff)
parentTweaking the ModifyLand packet to be async. Advice from Adam (diff)
downloadopensim-SC_OLD-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.zip
opensim-SC_OLD-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.tar.gz
opensim-SC_OLD-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.tar.bz2
opensim-SC_OLD-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLInventoryData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs3
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);