summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-05-27 21:22:46 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-05-27 21:22:46 -0700
commite44d0254af990b659a281cf0020cd06a3931bd77 (patch)
tree6091f92ed222d82be55117a3d968b47482fbb944 /indra/newview/llstartup.cpp
parent776fea3764bd1a14a712dcfe22f2b254b188f0a6 (diff)
parentcf05f59dd923d623bc50135214a488a29664ab95 (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 466c154f36..36b8d5b593 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2723,7 +2723,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