diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-02 13:20:00 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-02 13:20:00 +0200 |
| commit | fb174d1de39a2b551030da09e0dd9262b79278df (patch) | |
| tree | e68c81bfbb13de6eff99436a6acb4b2179dd2012 /indra/newview/llfloateruipreview.cpp | |
| parent | e6538ddbe95f0c297e67b9f5decabfcb6241ed2a (diff) | |
| parent | 9b0518dd8e46dfe74eaa0f7622b1486dbde32b82 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
| -rw-r--r-- | indra/newview/llfloateruipreview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index 645f8ef054..c6e12476bd 100644 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -1091,7 +1091,9 @@ void LLFloaterUIPreview::onClickEditFloater() char *args2 = new char[args.size() + 1]; // Windows requires that the second parameter to CreateProcessA be a writable (non-const) string... strcpy(args2, args.c_str()); - if(!CreateProcessA(exe_path.c_str(), args2, NULL, NULL, FALSE, 0, NULL, exe_dir.c_str(), &sinfo, &pinfo)) + // we don't want the current directory to be the executable directory, since the file path is now relative. By using + // NULL for the current directory instead of exe_dir.c_str(), the path to the target file will work. + if(!CreateProcessA(exe_path.c_str(), args2, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo)) { // DWORD dwErr = GetLastError(); std::string warning = "Creating editor process failed!"; |