diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-19 15:25:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-19 15:25:22 -0400 |
| commit | 6807214bb988e09e678534f23c8380e811df8831 (patch) | |
| tree | fc030ee780f7c929c70d7a65d0343fa57b2c739d /indra/newview/llplacesinventorybridge.h | |
| parent | ca17a74f1848b16b8a4f2412ed093aef4bad5830 (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
merge changes for 3.5.0-beta3 (chui)
Diffstat (limited to 'indra/newview/llplacesinventorybridge.h')
| -rw-r--r-- | indra/newview/llplacesinventorybridge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llplacesinventorybridge.h b/indra/newview/llplacesinventorybridge.h index 52beacef9c..07d18d03c5 100644 --- a/indra/newview/llplacesinventorybridge.h +++ b/indra/newview/llplacesinventorybridge.h @@ -82,13 +82,14 @@ protected: * * It builds Bridges for Landmarks and Folders in Places Landmarks Panel */ -class LLPlacesInventoryBridgeBuilder : public LLInventoryFVBridgeBuilder +class LLPlacesInventoryBridgeBuilder : public LLInventoryFolderViewModelBuilder { public: /*virtual*/ LLInvFVBridge* createBridge(LLAssetType::EType asset_type, LLAssetType::EType actual_asset_type, LLInventoryType::EType inv_type, LLInventoryPanel* inventory, + LLFolderViewModelInventory* view_model, LLFolderView* root, const LLUUID& uuid, U32 flags = 0x00) const; |