summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepaneltaskinfo.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-03-17 14:19:42 -0700
committerCallum Prentice <callum@lindenlab.com>2014-03-17 14:19:42 -0700
commitf232096bba9280dd78ef378612eeb65ae2814307 (patch)
tree17da0d7b1bd17771691c461919bbba5f1780e905 /indra/newview/llsidepaneltaskinfo.cpp
parent4c225e3fc7b92e68a25efdb1ca8927e266e84ae5 (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/llsidepaneltaskinfo.cpp')
-rwxr-xr-xindra/newview/llsidepaneltaskinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 9be6d0c5f1..4428098929 100755
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -71,7 +71,7 @@
LLSidepanelTaskInfo* LLSidepanelTaskInfo::sActivePanel = NULL;
-static LLRegisterPanelClassWrapper<LLSidepanelTaskInfo> t_task_info("sidepanel_task_info");
+static LLPanelInjector<LLSidepanelTaskInfo> t_task_info("sidepanel_task_info");
// Default constructor
LLSidepanelTaskInfo::LLSidepanelTaskInfo()