diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-07-28 09:48:18 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-07-28 09:48:18 -0400 |
commit | f37d109e251a273a1b620c416cef3991981e6184 (patch) | |
tree | 66403f3d3585d214137666e0cf5eeb656ee84df2 /indra/newview/llinventorylistitem.cpp | |
parent | fd7bfb03c946b0190bf0965e19b1b679eac3c383 (diff) | |
parent | 27cbfef0269146eb296bbd2b810a6d331e5cb7d2 (diff) |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-maint-1175
Diffstat (limited to 'indra/newview/llinventorylistitem.cpp')
-rw-r--r-- | indra/newview/llinventorylistitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp index 5489671430..3e0849a795 100644 --- a/indra/newview/llinventorylistitem.cpp +++ b/indra/newview/llinventorylistitem.cpp @@ -40,7 +40,7 @@ #include "llinventorymodel.h" #include "llviewerinventory.h" -static LLWidgetNameRegistry::StaticRegistrar sRegisterPanelInventoryListItemBaseParams(typeid(LLPanelInventoryListItemBase::Params).name(), "inventory_list_item"); +static LLWidgetNameRegistry::StaticRegistrar sRegisterPanelInventoryListItemBaseParams(&typeid(LLPanelInventoryListItemBase::Params), "inventory_list_item"); static const S32 WIDGET_SPACING = 3; |