diff options
author | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
commit | ec3b4e05a43fec4414924eb92a483bc164fb0ec2 (patch) | |
tree | 01c2626f55bef0db287eeca17d00b77e3391cbfb /indra/llxml | |
parent | c2785a740eb98d28ba705c981f4b6b289501d2e5 (diff) | |
parent | b7cd89da5f74663a9fd547af77afaed06cdb05fd (diff) |
Merge with latest viewer-dev-materials.
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); } |