diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-15 14:38:13 -0800 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-15 14:38:13 -0800 |
commit | 3e95634aaf89a5ecd12d7e08d96679cbb3d1bba8 (patch) | |
tree | 117222bf666e577e517bdec4f99bf6a5f0d66ab3 /indra/viewer_components/updater/tests/llupdaterservice_test.cpp | |
parent | 35fc90e8aaebc10a5a01c58247c29c8103220578 (diff) | |
parent | f47c42bb10cd3291ce966be7b209b422646dff19 (diff) |
merge
Diffstat (limited to 'indra/viewer_components/updater/tests/llupdaterservice_test.cpp')
-rw-r--r-- | indra/viewer_components/updater/tests/llupdaterservice_test.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp index 9b56a04ff6..25fd1b034d 100644 --- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp +++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp @@ -106,6 +106,12 @@ int ll_install_update(std::string const &, std::string const &, LLInstallScriptM return 0;
}
+std::string const & ll_install_failed_marker_path()
+{
+ static std::string wubba;
+ return wubba;
+}
+
/*
#pragma warning(disable: 4273)
llus_mock_llifstream::llus_mock_llifstream(const std::string& _Filename,
|