diff options
author | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
commit | faae38daaaf30fd96b217316cf3eafb095ff35bc (patch) | |
tree | e73c2991dcfffa2c4d4260fff6102d65be1e1312 /indra/llxml | |
parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) | |
parent | e7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff) |
Pull merge from lindenlab/viewer-developement
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); } |