summaryrefslogtreecommitdiff
path: root/indra/llxml/llcontrol.h
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-04-04 15:57:35 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-04-04 15:57:35 -0700
commit38ea63e084362d01deedf07e617b6e2bf85bbb25 (patch)
treeefaa6b41c40f4f6e4096c31e473ec1d68b3de4d2 /indra/llxml/llcontrol.h
parent819bbce34a2f265287df1e4e9adde90b5a70c8b6 (diff)
parentdabce05d1eed47944e39438e50b3c788b7df649d (diff)
merging in viewer-chui
Diffstat (limited to 'indra/llxml/llcontrol.h')
-rw-r--r--indra/llxml/llcontrol.h1
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);
}