diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
commit | e1c1428569b03bbb20e7597ebec7d707151ce802 (patch) | |
tree | 69ca6d0fd05300346ddc14664b6d44bd4206a8b4 /indra/viewer_components/updater/llupdateinstaller.cpp | |
parent | f356d7eb9fd730f5f6f5a29fb0706e20876ad3bd (diff) | |
parent | ab4104d2d785199722f93d027e72af40d16f5703 (diff) |
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
Diffstat (limited to 'indra/viewer_components/updater/llupdateinstaller.cpp')
-rwxr-xr-x | indra/viewer_components/updater/llupdateinstaller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp index 2f87d59373..a0e2c0b362 100755 --- a/indra/viewer_components/updater/llupdateinstaller.cpp +++ b/indra/viewer_components/updater/llupdateinstaller.cpp @@ -75,7 +75,7 @@ int ll_install_update(std::string const & script, llassert(!"unpossible copy mode"); } - llinfos << "UpdateInstaller: installing " << updatePath << " using " << + LL_INFOS("Updater") << "UpdateInstaller: installing " << updatePath << " using " << actualScriptPath << LL_ENDL; LLProcess::Params params; |