summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2014-01-15 21:33:09 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2014-01-15 21:33:09 +0000
commit81170ed939ce88ec9996ed5ecf2ae34684d199ec (patch)
treec0f075388c3e0a1f112f4ca58a1ce0cee00d4932 /indra/llui
parent11f7dd8cc7516a75aaf012cc47b90d33c3289033 (diff)
Adding error output for attributes containing MAP or ARRAY elements.
Diffstat (limited to 'indra/llui')
-rwxr-xr-xindra/llui/llkeywords.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 0395334b6e..34dff22729 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -340,10 +340,14 @@ void LLKeywords::processTokensGroup(LLSD& Tokens, const std::string Group)
arguments = innerIt->second;
}
}
- else
+ else if (!innerIt->second.isMap() && !innerIt->second.isArray())
{
mAttributes[innerIt->first] = innerIt->second.asString();
}
+ else
+ {
+ LL_ERRS("SyntaxLSL") << "Not a valid attribute" << LL_ENDL;
+ }
}
std::string tooltip = "";