summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-05-28 17:01:46 -0400
committerLoren Shih <seraph@lindenlab.com>2010-05-28 17:01:46 -0400
commitea7047579da5d252aac34e69dabe9e9e9002a2fb (patch)
treefcb26ecad7417083d6b2f0fcee651f95364d2ec8 /indra/newview/llstartup.cpp
parent7efaa216a1c42ed85663bcf2c7d0ef6df718c780 (diff)
parentbb973c38e30bc0711265ba04630a8475a3f98c59 (diff)
automated merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index d8b5618d8f..6418551517 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2732,7 +2732,8 @@ LLSD transform_cert_args(LLPointer<LLCertificate> cert)
{
LLSD args = LLSD::emptyMap();
std::string value;
- LLSD cert_info = cert->getLLSD();
+ LLSD cert_info;
+ cert->getLLSD(cert_info);
// convert all of the elements in the cert into
// args for the xml dialog, so we have flexability to
// display various parts of the cert by only modifying