summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.h
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-07-14 12:14:07 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-07-14 12:14:07 -0700
commit6a3f8068837311b841acea36b904f399424c20df (patch)
treed56a2cbaa58e28ec9242d1e6b989a02c63c92915 /indra/llui/llsdparam.h
parente17c7e6d24d5a25e4c0544ca2bc25fbc0c29d161 (diff)
parentd668270c13fcad8ae6e0fdfdf063a16be6083243 (diff)
merge
Diffstat (limited to 'indra/llui/llsdparam.h')
-rw-r--r--indra/llui/llsdparam.h9
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);
}