sigghhhh, yet more conflict resolution from the viewer-trunk merge. actually builds now. let's see if it runs and works.

1 files changed, 1 insertions, 12 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) {}