summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-24 10:08:13 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-24 10:08:13 -0400
commit76fb5f1542297a7e1afdf983d8a0db459fc0b8ab (patch)
tree0c35366715e4a944361f5ec1cbf61535b04b6ab0 /indra/newview/llinventorybridge.h
parentff42e557848158d5a01cc260bac0bbf974650934 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
merge with viewer tools update
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rwxr-xr-xindra/newview/llinventorybridge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 8dde2c33b7..932fce83ba 100755
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -199,6 +199,7 @@ protected:
class LLInventoryFolderViewModelBuilder
{
public:
+ LLInventoryFolderViewModelBuilder() {}
virtual ~LLInventoryFolderViewModelBuilder() {}
virtual LLInvFVBridge* createBridge(LLAssetType::EType asset_type,
LLAssetType::EType actual_asset_type,
@@ -654,6 +655,7 @@ public:
class LLRecentInventoryBridgeBuilder : public LLInventoryFolderViewModelBuilder
{
public:
+ LLRecentInventoryBridgeBuilder() {}
// Overrides FolderBridge for Recent Inventory Panel.
// It use base functionality for bridges other than FolderBridge.
virtual LLInvFVBridge* createBridge(LLAssetType::EType asset_type,