diff options
| author | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
| commit | 752b3fdbe044069635a2c6cd000c481561985954 (patch) | |
| tree | a162616b10fbabe65bf3a568c408e10e3cfd253a /indra/llcommon | |
| parent | b092de554c7745d7c3c19bd30803640f36431da2 (diff) | |
| parent | 4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (diff) | |
merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llprocesslauncher.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llprocesslauncher.cpp b/indra/llcommon/llprocesslauncher.cpp index 4b0f6b0251..d46188104f 100644 --- a/indra/llcommon/llprocesslauncher.cpp +++ b/indra/llcommon/llprocesslauncher.cpp @@ -103,7 +103,7 @@ int LLProcessLauncher::launch(void) char *args2 = new char[args.size() + 1]; strcpy(args2, args.c_str()); - if( ! CreateProcessA( NULL, args2, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo ) ) + if( ! CreateProcessA( NULL, args2, NULL, NULL, FALSE, 0, NULL, mWorkingDir.c_str(), &sinfo, &pinfo ) ) { // TODO: do better than returning the OS-specific error code on failure... result = GetLastError(); diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 3838b2b16c..117d96ffa6 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -28,8 +28,8 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 2; -const S32 LL_VERSION_MINOR = 5; -const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_MINOR = 6; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |