diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
commit | a7dbaaa0af643fc5bce0b740a92e69dfb931c6e8 (patch) | |
tree | 3eddbd3f421f430c9b03487261e89c95017657b9 /indra/llxml | |
parent | 0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff) | |
parent | 77abdd04a4a390049c2143e1d87542b9b2a06c86 (diff) |
merge changes for DRTVWR-250
Diffstat (limited to 'indra/llxml')
-rw-r--r-- | indra/llxml/llcontrol.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index 9a3a40e476..ee7d1d50b7 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -254,6 +254,7 @@ public: else { llwarns << "Control " << name << " not found." << llendl; + return T(); } return convert_from_llsd<T>(value, type, name); } |