diff options
| author | Melanie | 2012-09-16 04:11:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:11:20 +0100 |
| commit | db774d4292588db1e2ac4a9fafe977ddbec353ee (patch) | |
| tree | 5fc381d7cb96cc0d2b47e4807821f488c339ec13 /OpenSim/Framework/Serialization | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.zip opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.gz opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.bz2 opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
Diffstat (limited to 'OpenSim/Framework/Serialization')
| -rw-r--r-- | OpenSim/Framework/Serialization/ArchiveConstants.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs index 2c5e001..48f1c4f 100644 --- a/OpenSim/Framework/Serialization/ArchiveConstants.cs +++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs | |||
| @@ -53,6 +53,11 @@ namespace OpenSim.Framework.Serialization | |||
| 53 | public const string INVENTORY_PATH = "inventory/"; | 53 | public const string INVENTORY_PATH = "inventory/"; |
| 54 | 54 | ||
| 55 | /// <value> | 55 | /// <value> |
| 56 | /// Path for regions in a multi-region archive | ||
| 57 | /// </value> | ||
| 58 | public const string REGIONS_PATH = "regions/"; | ||
| 59 | |||
| 60 | /// <value> | ||
| 56 | /// Path for the prims file | 61 | /// Path for the prims file |
| 57 | /// </value> | 62 | /// </value> |
| 58 | public const string OBJECTS_PATH = "objects/"; | 63 | public const string OBJECTS_PATH = "objects/"; |