diff options
| author | dahlia | 2009-10-11 01:30:24 -0700 |
|---|---|---|
| committer | dahlia | 2009-10-11 01:30:24 -0700 |
| commit | 41b27ef0642ffb7510b46614c5c61c7d220ecc02 (patch) | |
| tree | 3dde3adb1baf4dc898a7759599e39b9874088125 | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-41b27ef0642ffb7510b46614c5c61c7d220ecc02.zip opensim-SC_OLD-41b27ef0642ffb7510b46614c5c61c7d220ecc02.tar.gz opensim-SC_OLD-41b27ef0642ffb7510b46614c5c61c7d220ecc02.tar.bz2 opensim-SC_OLD-41b27ef0642ffb7510b46614c5c61c7d220ecc02.tar.xz | |
disambiguate System.Path (preparation for new PrimMesher)
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Mesh.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs index ff1f816..94d926a 100644 --- a/OpenSim/Region/Physics/Meshing/Mesh.cs +++ b/OpenSim/Region/Physics/Meshing/Mesh.cs | |||
| @@ -308,7 +308,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 308 | if (path == null) | 308 | if (path == null) |
| 309 | return; | 309 | return; |
| 310 | String fileName = name + "_" + title + ".raw"; | 310 | String fileName = name + "_" + title + ".raw"; |
| 311 | String completePath = Path.Combine(path, fileName); | 311 | String completePath = System.IO.Path.Combine(path, fileName); |
| 312 | StreamWriter sw = new StreamWriter(completePath); | 312 | StreamWriter sw = new StreamWriter(completePath); |
| 313 | foreach (Triangle t in m_triangles) | 313 | foreach (Triangle t in m_triangles) |
| 314 | { | 314 | { |