diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
| commit | 5d34ac552f3939626840b703b2da380663f25f49 (patch) | |
| tree | ddeacd3365fed0ad193c053d39ebeb39451cc74a /indra/llxml | |
| parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
| parent | 8db983fb8095f25873b8317fd1f4764abce4a31b (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
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); } |