diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:34:56 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:34:56 +0100 |
| commit | c1b49a2142f04bde232d65038ac88765423fc7ad (patch) | |
| tree | 54b5fac0adc5c2c80dc8a3c2c243d18915ef4b67 /indra | |
| parent | 5de3e21a38f81559626cdca8a9e5b9e06f955063 (diff) | |
yet more conflict fixing from viewer-trunk merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 2e690493cd..7c156561b9 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -5107,7 +5107,6 @@ void LLLinkFolderBridge::performAction(LLInventoryModel* model, std::string acti return; } LLItemBridge::performAction(model,action); - items.push_back(std::string("Restore Item")); } void LLLinkFolderBridge::gotoItem() { @@ -5125,9 +5124,6 @@ void LLLinkFolderBridge::gotoItem() mRoot->scrollToShowSelection(); } } - - - hide_context_entries(menu, items, disabled_items); } const LLUUID &LLLinkFolderBridge::getFolderID() const { @@ -5138,12 +5134,6 @@ const LLUUID &LLLinkFolderBridge::getFolderID() const const LLUUID& cat_uuid = cat->getUUID(); return cat_uuid; } - case LLAssetType::AT_MESH: - action = new LLMeshBridgeAction(uuid,model); - break; - - - } return LLUUID::null; } |