diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-05-21 16:56:45 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-05-21 16:56:45 -0400 |
| commit | b0303445f1af83057e4d27d763f7b860f20f0143 (patch) | |
| tree | fbb5a9cb37f2661605ac07565b715ada7ade7ce0 /indra/viewer_components | |
| parent | a04a706c1bf145505afd2da8d149ba909b56045f (diff) | |
more merge fixing
Diffstat (limited to 'indra/viewer_components')
| -rwxr-xr-x | indra/viewer_components/updater/llupdatechecker.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/viewer_components/updater/llupdatechecker.cpp b/indra/viewer_components/updater/llupdatechecker.cpp index 891a53d011..cdb9b45682 100755 --- a/indra/viewer_components/updater/llupdatechecker.cpp +++ b/indra/viewer_components/updater/llupdatechecker.cpp @@ -140,6 +140,7 @@ void LLUpdateChecker::Implementation::httpCompleted() S32 status = getStatus(); const LLSD& content = getContent(); + const std::string& reason = getReason(); if(status != 200) { std::string server_error; |