summaryrefslogtreecommitdiff
path: root/indra/llxml/llcontrol.h
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
committerBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
commitc4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch)
tree96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/llxml/llcontrol.h
parentb0c449d301299a4ba1b7d83e930f9df6b071b931 (diff)
parentcdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff)
viewer-development merge
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);
}