diff options
| author | cw | 2007-02-12 01:41:44 +0000 |
|---|---|---|
| committer | cw | 2007-02-12 01:41:44 +0000 |
| commit | 1c87bdb464ca90a72d21b7851e89106c348ec8d8 (patch) | |
| tree | b9b728cfe71b1998d39eb28b70c844485b314a2c /AssetManagement.cs | |
| parent | [0000048] Animations (diff) | |
| download | opensim-SC_OLD-1c87bdb464ca90a72d21b7851e89106c348ec8d8.zip opensim-SC_OLD-1c87bdb464ca90a72d21b7851e89106c348ec8d8.tar.gz opensim-SC_OLD-1c87bdb464ca90a72d21b7851e89106c348ec8d8.tar.bz2 opensim-SC_OLD-1c87bdb464ca90a72d21b7851e89106c348ec8d8.tar.xz | |
[0000047] System.IO.Path combine path
Diffstat (limited to 'AssetManagement.cs')
| -rw-r--r-- | AssetManagement.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/AssetManagement.cs b/AssetManagement.cs index ad63733..0656494 100644 --- a/AssetManagement.cs +++ b/AssetManagement.cs | |||
| @@ -218,14 +218,14 @@ namespace OpenSim | |||
| 218 | string folder; | 218 | string folder; |
| 219 | if(Image) | 219 | if(Image) |
| 220 | { | 220 | { |
| 221 | folder = @"\textures\"; | 221 | folder = @"textures"; |
| 222 | } | 222 | } |
| 223 | else | 223 | else |
| 224 | { | 224 | { |
| 225 | folder = @"\assets\"; | 225 | folder = @"assets"; |
| 226 | } | 226 | } |
| 227 | string data_path = System.AppDomain.CurrentDomain.BaseDirectory + folder; | 227 | string data_path = System.IO.Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, folder); |
| 228 | string filename = data_path+@info.filename; | 228 | string filename = System.IO.Path.Combine(data_path, @info.filename); |
| 229 | FileInfo fInfo = new FileInfo(filename); | 229 | FileInfo fInfo = new FileInfo(filename); |
| 230 | 230 | ||
| 231 | long numBytes = fInfo.Length; | 231 | long numBytes = fInfo.Length; |