diff options
author | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
commit | 6137e120d1836ea37ea8f5f6723d86db94f31bd8 (patch) | |
tree | 16341e6203400d52e89189d96206c26e899dbe44 /indra/newview/llsidepaneliteminfo.cpp | |
parent | b0c1dd4790847364ebcab1cb1d4103500f64072e (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
3.7.4. merge
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.cpp')
-rwxr-xr-x | indra/newview/llsidepaneliteminfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index 92c2863ffd..e52b2f2559 100755 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -127,7 +127,7 @@ void LLObjectInventoryObserver::inventoryChanged(LLViewerObject* object, /// Class LLSidepanelItemInfo ///---------------------------------------------------------------------------- -static LLRegisterPanelClassWrapper<LLSidepanelItemInfo> t_item_info("sidepanel_item_info"); +static LLPanelInjector<LLSidepanelItemInfo> t_item_info("sidepanel_item_info"); // Default constructor LLSidepanelItemInfo::LLSidepanelItemInfo(const LLPanel::Params& p) |