diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
| commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
| tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
| parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
| download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz | |
*remove conflicts
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index e28bc9a..7bc0b77 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -70,14 +70,14 @@ namespace OpenSim | |||
| 70 | 70 | ||
| 71 | protected bool m_autoCreateClientStack = true; | 71 | protected bool m_autoCreateClientStack = true; |
| 72 | 72 | ||
| 73 | /// <summary> | 73 | /// <value> |
| 74 | /// The file used to load and save prim backup xml if no filename has been specified | 74 | /// The file used to load and save prim backup xml if no filename has been specified |
| 75 | /// </summary> | 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 | /// <summary> | 78 | /// <value> |
| 79 | /// The file used to load and save an opensimulator archive if no filename has been specified | 79 | /// The file used to load and save an opensimulator archive if no filename has been specified |
| 80 | /// </summary> | 80 | /// </value> |
| 81 | protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar"; | 81 | protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar"; |
| 82 | 82 | ||
| 83 | public ConfigSettings ConfigurationSettings | 83 | public ConfigSettings ConfigurationSettings |