aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorDiva Canto2009-08-17 13:27:22 -0700
committerDiva Canto2009-08-17 13:27:22 -0700
commit59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e (patch)
treec2e3b45589a756c58c88e85b274719fd3f7e3c5e /OpenSim/Region/Application
parentBumping the interface number down again, because this *may* not be a breaking... (diff)
parentno-op to poke panda (diff)
downloadopensim-SC_OLD-59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e.zip
opensim-SC_OLD-59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e.tar.gz
opensim-SC_OLD-59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e.tar.bz2
opensim-SC_OLD-59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs8
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