diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:45:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:45:54 +0100 |
| commit | cbf1ae105a980a439cff39026f9e2c05d4f13859 (patch) | |
| tree | a722a00920ab4e5b5f948a8bffb7b45cc1f60313 /indra | |
| parent | c1b49a2142f04bde232d65038ac88765423fc7ad (diff) | |
sigghhhh, yet more conflict resolution from the viewer-trunk merge. actually builds now. let's see if it runs and works.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 6 |
2 files changed, 4 insertions, 15 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 7c156561b9..83248e9991 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -5389,20 +5389,9 @@ public: LLNotificationsUtil::add("CannotWearInfoNotComplete"); } } - LLInvFVBridgeAction::doIt(); -} - -//virtual -void LLMeshBridgeAction::doIt() -{ - LLViewerInventoryItem* item = getItem(); - if(item) - { - // do it - } - LLInvFVBridgeAction::doIt(); } + virtual ~LLWearableBridgeAction(){} protected: LLWearableBridgeAction(const LLUUID& id,LLInventoryModel* model) : LLInvFVBridgeAction(id,model) {} diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index d6644e16c6..76dee78f3d 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1418,7 +1418,7 @@ public: virtual LLUIImagePtr getIcon() const; virtual void openItem(); - virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action); + virtual void performAction(LLInventoryModel* model, std::string action); virtual void buildContextMenu(LLMenuGL& menu, U32 flags); }; @@ -1442,7 +1442,7 @@ void LLTaskMeshBridge::openItem() // virtual -void LLTaskMeshBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action) +void LLTaskMeshBridge::performAction(LLInventoryModel* model, std::string action) { if (action == "mesh action") { @@ -1452,7 +1452,7 @@ void LLTaskMeshBridge::performAction(LLFolderView* folder, LLInventoryModel* mod // do action } } - LLTaskInvFVBridge::performAction(folder, model, action); + LLTaskInvFVBridge::performAction(model, action); } void LLTaskMeshBridge::buildContextMenu(LLMenuGL& menu, U32 flags) |