diff options
author | dolphin <dolphin@lindenlab.com> | 2014-03-10 13:06:06 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-03-10 13:06:06 -0700 |
commit | 34c12d009c232917732e6eeb452da7e76b2ee12e (patch) | |
tree | 847155313ac7588a23f3ee71d3ee8f3ab30580c9 /indra/newview/llsidepaneliteminfo.cpp | |
parent | 7b9817cbcc5acab58d9d4355984b429850bd3ef8 (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
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 072b001890..e2a17c6c88 100755 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -130,7 +130,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) |