summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-29 06:19:06 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-29 06:19:06 +0100
commit0ca09bea5ddfbb41e29fcc2b36e46c7e86171198 (patch)
tree6cea69c52dccf3ed3f5e0e77f80aa77f8ad88e9f /indra/newview/llstartup.cpp
parent383d695fe6d14ba988820475e0cc9b64e18b7de5 (diff)
parent3df90898b18feeda876857acb00f1f3046793e69 (diff)
merge from viewer-public
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