diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
| commit | 8bb3d0891dfd87b54cd45dfe199c2f1bf21205b3 (patch) | |
| tree | 30f038fde12f74908f94be9079cdee759481c5a0 /indra/llxml | |
| parent | 66c75202a8a99adeb7de443ce5ebe3d834f91c24 (diff) | |
| parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) | |
merge up to 3.4.5-release
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); } |