diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Serialization/ArchiveConstants.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs index 3143e3b..7a9b33d 100644 --- a/OpenSim/Framework/Serialization/ArchiveConstants.cs +++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs | |||
@@ -157,9 +157,9 @@ namespace OpenSim.Framework.Serialization | |||
157 | public static string CreateOarObjectFilename(string objectName, UUID uuid, Vector3 pos) | 157 | public static string CreateOarObjectFilename(string objectName, UUID uuid, Vector3 pos) |
158 | { | 158 | { |
159 | return string.Format( | 159 | return string.Format( |
160 | OAR_OBJECT_FILENAME_TEMPLATE, objectName, | 160 | OAR_OBJECT_FILENAME_TEMPLATE, objectName, |
161 | Math.Round(pos.X), Math.Round(pos.Y), Math.Round(pos.Z), | 161 | Math.Round(pos.X), Math.Round(pos.Y), Math.Round(pos.Z), |
162 | uuid); | 162 | uuid); |
163 | } | 163 | } |
164 | 164 | ||
165 | /// <summary> | 165 | /// <summary> |
@@ -171,9 +171,9 @@ namespace OpenSim.Framework.Serialization | |||
171 | /// <returns></returns> | 171 | /// <returns></returns> |
172 | public static string CreateOarObjectPath(string objectName, UUID uuid, Vector3 pos) | 172 | public static string CreateOarObjectPath(string objectName, UUID uuid, Vector3 pos) |
173 | { | 173 | { |
174 | return OBJECTS_PATH + CreateOarObjectFilename(objectName, uuid, pos); | 174 | return OBJECTS_PATH + CreateOarObjectFilename(objectName, uuid, pos); |
175 | } | 175 | } |
176 | 176 | ||
177 | /// <summary> | 177 | /// <summary> |
178 | /// Extract a plain path from an IAR path | 178 | /// Extract a plain path from an IAR path |
179 | /// </summary> | 179 | /// </summary> |
@@ -184,18 +184,18 @@ namespace OpenSim.Framework.Serialization | |||
184 | List<string> plainDirs = new List<string>(); | 184 | List<string> plainDirs = new List<string>(); |
185 | 185 | ||
186 | string[] iarDirs = iarPath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); | 186 | string[] iarDirs = iarPath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); |
187 | 187 | ||
188 | foreach (string iarDir in iarDirs) | 188 | foreach (string iarDir in iarDirs) |
189 | { | 189 | { |
190 | if (!iarDir.Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR)) | 190 | if (!iarDir.Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR)) |
191 | plainDirs.Add(iarDir); | 191 | plainDirs.Add(iarDir); |
192 | 192 | ||
193 | int i = iarDir.LastIndexOf(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR); | 193 | int i = iarDir.LastIndexOf(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR); |
194 | 194 | ||
195 | plainDirs.Add(iarDir.Remove(i)); | 195 | plainDirs.Add(iarDir.Remove(i)); |
196 | } | 196 | } |
197 | 197 | ||
198 | return string.Join("/", plainDirs.ToArray()); | 198 | return string.Join("/", plainDirs.ToArray()); |
199 | } | 199 | } |
200 | } | 200 | } |
201 | } \ No newline at end of file | 201 | } |