diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-06 16:39:48 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-06 16:39:48 -0500 |
| commit | c70b0a9de66e6b8d93f1027932ba7e801de3473b (patch) | |
| tree | d1157e2897ac8bf1e79ce6f55200406d1bb7fca2 /indra/viewer_components/updater/llupdaterservice.cpp | |
| parent | ce73cc392c3f6e2a80c03e30a7dd975408e69f1c (diff) | |
| parent | 1eabdf70fc61f7f1cff5fe2522e3e769d0e35db5 (diff) | |
merge changes for DRTVWR-278
Diffstat (limited to 'indra/viewer_components/updater/llupdaterservice.cpp')
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index 324b051b21..c1e57122ee 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -65,6 +65,8 @@ namespace { #ifdef LL_WINDOWS std::string scriptFile = "update_install.bat"; +#elif LL_DARWIN + std::string scriptFile = "update_install.py"; #else std::string scriptFile = "update_install"; #endif @@ -76,6 +78,8 @@ namespace #ifdef LL_WINDOWS return LL_COPY_INSTALL_SCRIPT_TO_TEMP; #else + // This is important on Mac because update_install.py looks at its own + // script pathname to discover the viewer app bundle to update. return LL_RUN_INSTALL_SCRIPT_IN_PLACE; #endif }; |