diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Framework/Serialization/ArchiveConstants.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Serialization/ArchiveConstants.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs index ab3c285..9081411 100644 --- a/OpenSim/Framework/Serialization/ArchiveConstants.cs +++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs | |||
| @@ -72,12 +72,12 @@ namespace OpenSim.Framework.Serialization | |||
| 72 | /// Path for region settings. | 72 | /// Path for region settings. |
| 73 | /// </value> | 73 | /// </value> |
| 74 | public const string SETTINGS_PATH = "settings/"; | 74 | public const string SETTINGS_PATH = "settings/"; |
| 75 | 75 | ||
| 76 | /// <value> | 76 | /// <value> |
| 77 | /// Path for region settings. | 77 | /// Path for region settings. |
| 78 | /// </value> | 78 | /// </value> |
| 79 | public const string LANDDATA_PATH = "landdata/"; | 79 | public const string LANDDATA_PATH = "landdata/"; |
| 80 | 80 | ||
| 81 | /// <value> | 81 | /// <value> |
| 82 | /// Path for user profiles | 82 | /// Path for user profiles |
| 83 | /// </value> | 83 | /// </value> |