diff options
author | Adam Frisby | 2009-12-13 03:04:16 +1100 |
---|---|---|
committer | Adam Frisby | 2009-12-13 03:04:16 +1100 |
commit | 963cf25813ad2bd6dceaa39757391fbf94d6f09e (patch) | |
tree | 80244f3026d0d1c06f4d8e0b496470052353b083 /OpenSim/Data/MySQL | |
parent | * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations." (diff) | |
download | opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.zip opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.gz opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.bz2 opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.xz |
* Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
Diffstat (limited to 'OpenSim/Data/MySQL')
-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); |