diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-07-20 20:18:12 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-07-20 20:18:12 -0700 |
commit | 95da8c81f3d5afd8d888589398028883e6647333 (patch) | |
tree | c05f27cff294a5ad1a508cc2c8716bc696c8f9ce /indra/llui/llsdparam.h | |
parent | 4dc0850da7469906e5ad052da71830b05005295b (diff) | |
parent | fecf706f1be58f76df81f8bc1a4a5f3307cee6ff (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llui/llsdparam.h')
-rw-r--r-- | indra/llui/llsdparam.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llsdparam.h b/indra/llui/llsdparam.h index 69dab2b411..f776c781b3 100644 --- a/indra/llui/llsdparam.h +++ b/indra/llui/llsdparam.h @@ -93,8 +93,17 @@ class LLSDParamAdapter : public T LLParamSDParser parser; parser.readSD(sd, *this); } + + operator LLSD() const + { + LLParamSDParser parser; + LLSD sd; + parser.writeSD(sd, *this); + return sd; + } LLSDParamAdapter(const T& val) + : T(val) { T::operator=(val); } |