diff options
author | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
commit | 3e8bc28c88f16c1b8bba496704ec3a6156a25e1d (patch) | |
tree | aa52be0bc7aa10d578ba000b8cd69d40271477a0 /indra/llxml | |
parent | 7e9ac192d779e77cad0a0b785510190215fbe7a6 (diff) | |
parent | a30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff) |
Merge
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); } |