diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-01 14:24:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-01 14:24:01 -0400 |
| commit | 2fde4a9ae55a8641a5a7a9091af4d598b7e8d847 (patch) | |
| tree | 1ffa1f6a643579fd32da5fc241f03a5fdd2cbf42 /indra/newview/llplacesinventorybridge.h | |
| parent | e42142005585f580d39036fba02ec060d739cc5f (diff) | |
| parent | 7333731bbca764fdac87173fa5a6e5f2bb46c1d2 (diff) | |
merge changes for 3.5.0-beta7
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; |