summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-10-06 19:41:55 -0700
committerRichard Nelson <none@none>2010-10-06 19:41:55 -0700
commit0e05afdac5c8864080748f2c2c30b0743fd80d1a (patch)
tree7099a7433c04370d6b1d79aad789ad63d752c2ec
parentf37e9532016473fb77b11d88f74f551de737a108 (diff)
allow passing LLSD arguments on command line
-rw-r--r--indra/llxml/llcontrol.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index f9a39826f5..2822b767e5 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -170,6 +170,19 @@ LLSD LLControlVariable::getComparableValue(const LLSD& value)
storable_value = false;
}
}
+ else if (TYPE_LLSD == type() && value.isString())
+ {
+ LLPointer<LLSDNotationParser> parser = new LLSDNotationParser;
+ LLSD result;
+ if (parser->parse(std::stringstream(value.asString()), result, LLSDSerialize::SIZE_UNLIMITED) != LLSDParser::PARSE_FAILURE)
+ {
+ storable_value = result;
+ }
+ else
+ {
+ storable_value = value;
+ }
+ }
else
{
storable_value = value;