summaryrefslogtreecommitdiff
path: root/indra/llxml
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-02 09:31:38 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-02 09:31:38 -0700
commit7e7f183f0a80241e3f1eb2fc8338ba2fe9b28819 (patch)
tree25e90f83311fddbc72b6e7719f0ebc676d974f5a /indra/llxml
parent5f75cf57773a017b6d15d07047b98522c0856b4b (diff)
Fixed LLControlGroup::get() template to not crash on missing items. Reviewed
by Kelly
Diffstat (limited to 'indra/llxml')
-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);
}