summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-08-18 19:16:03 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-08-18 19:16:03 +0300
commitcfe0ba90352c48a2b9f5006c4c8e824dc472cdc9 (patch)
tree58515df5648b7a7819b4cb62e88431c1b4747e79 /indra/llui/llview.cpp
parent61e318564e5c492ff7da70ef05f9596c4af8d369 (diff)
parente8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff)
Merge branch 'master' into DRTVWR-515-maint
# Conflicts: # indra/newview/llimprocessing.cpp
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r--indra/llui/llview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 4a990cea81..bd1b1183a5 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -86,6 +86,11 @@ template class LLView* LLView::getChild<class LLView>(
static LLDefaultChildRegistry::Register<LLView> r("view");
+void deleteView(LLView *aView)
+{
+ delete aView;
+}
+
namespace LLInitParam
{
void TypeValues<LLView::EOrientation>::declareValues()