diff options
| author | Melanie | 2009-11-25 08:39:29 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-25 08:39:29 +0000 |
| commit | 4fbdc538c7beb4015eeda12aa3f85440cc7b9690 (patch) | |
| tree | 6534a0fbb7ffc3dc800d35801be519ae481f95b5 /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Add wildcard to prebuild include. Seems each file can only hold one project (diff) | |
| parent | * Reverting last commit.. because it just made it worse. (diff) | |
| download | opensim-SC-4fbdc538c7beb4015eeda12aa3f85440cc7b9690.zip opensim-SC-4fbdc538c7beb4015eeda12aa3f85440cc7b9690.tar.gz opensim-SC-4fbdc538c7beb4015eeda12aa3f85440cc7b9690.tar.bz2 opensim-SC-4fbdc538c7beb4015eeda12aa3f85440cc7b9690.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index cc18f1a..391856b 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -75,11 +75,6 @@ namespace OpenSim | |||
| 75 | /// </value> | 75 | /// </value> |
| 76 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; | 76 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; |
| 77 | 77 | ||
| 78 | /// <value> | ||
| 79 | /// The file used to load and save an opensimulator archive if no filename has been specified | ||
| 80 | /// </value> | ||
| 81 | protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar"; | ||
| 82 | |||
| 83 | public ConfigSettings ConfigurationSettings | 78 | public ConfigSettings ConfigurationSettings |
| 84 | { | 79 | { |
| 85 | get { return m_configSettings; } | 80 | get { return m_configSettings; } |