From b0303445f1af83057e4d27d763f7b860f20f0143 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 21 May 2013 16:56:45 -0400 Subject: more merge fixing --- indra/viewer_components/updater/llupdatechecker.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/viewer_components') 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; -- cgit v1.2.3