summaryrefslogtreecommitdiff
path: root/indra/llxml
diff options
context:
space:
mode:
authormberezhnoy <mberezhnoy@productengine.com>2013-02-01 01:00:52 +0200
committermberezhnoy <mberezhnoy@productengine.com>2013-02-01 01:00:52 +0200
commit8fbc0aada88c6a3743f61dfc57018385a31802f0 (patch)
tree56888fe7f24736cce1980e08d349d20f84b814ed /indra/llxml
parenta12200b91b0ca20dfff2df8aa71c6f53ac0603ee (diff)
parentd2a17e20ca889851406f22907df35b17f5030279 (diff)
merging
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);
}