diff options
author | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:52:14 -0700 |
---|---|---|
committer | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:52:14 -0700 |
commit | 450b64981c878f558b597a2855bc18318555a532 (patch) | |
tree | d84598caf68980baa4eb3f058ada5b3ffb1c4dff /indra/newview/llsidepaneliteminfo.cpp | |
parent | 42daa3497b6626cbb5f32ba54162558cd025069b (diff) | |
parent | 44c7c6feaa824f4049d326965cb066e76ebefee3 (diff) |
Merge for STORM-1482
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.cpp')
-rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index fbd2f7ca83..1ce05da849 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -130,9 +130,10 @@ void LLObjectInventoryObserver::inventoryChanged(LLViewerObject* object, static LLRegisterPanelClassWrapper<LLSidepanelItemInfo> t_item_info("sidepanel_item_info"); // Default constructor -LLSidepanelItemInfo::LLSidepanelItemInfo() - : mItemID(LLUUID::null) - , mObjectInventoryObserver(NULL) +LLSidepanelItemInfo::LLSidepanelItemInfo(const LLPanel::Params& p) + : LLSidepanelInventorySubpanel(p) + , mItemID(LLUUID::null) + , mObjectInventoryObserver(NULL) { mPropertiesObserver = new LLItemPropertiesObserver(this); } |