Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged Ascent progress - title picker

Browse Source
This commit is contained in:
Siana Gearz
2010-11-08 22:59:46 +01:00
parent 21e10551b3 4763ee7424
commit d7a1575ad2
30 changed files with 2004 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
indra/newview/llinventorybridge.cpp
View File

@@ -4072,7 +4072,6 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
//if( !isInTrash() )
if( !isInTrash() && !(LLXmlImport::sImportInProgress && LLXmlImport::sImportHasAttachments))
// </edit>
@@ -5716,3 +5715,144 @@ void LLWearableBridge::onRemoveFromAvatarArrived(LLWearable* wearable,
delete item_id;
}
/*
// +=================================================+
// | LLLinkItemBridge |
// +=================================================+
// For broken links
std::string LLLinkItemBridge::sPrefix("Link: ");
LLUIImagePtr LLLinkItemBridge::getIcon() const
{
if (LLViewerInventoryItem *item = getItem())
{
U32 attachment_point = (item->getFlags() & 0xff); // low byte of inventory flags
bool is_multi = LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS & item->getFlags();
return get_item_icon(item->getActualType(), item->getInventoryType(), attachment_point, is_multi);
}
return get_item_icon(LLAssetType::AT_LINK, LLInventoryType::IT_NONE, 0, FALSE);
}
void LLLinkItemBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
// *TODO: Translate
lldebugs << "LLLink::buildContextMenu()" << llendl;
std::vector<std::string> items;
std::vector<std::string> disabled_items;
items.push_back(std::string("Find Original"));
disabled_items.push_back(std::string("Find Original"));
if (isInTrash())
{
disabled_items.push_back(std::string("Find Original"));
if (isLinkedObjectMissing())
{
disabled_items.push_back(std::string("Find Original"));
}
items.push_back(std::string("Purge Item"));
items.push_back(std::string("Restore Item"));
}
else
{
items.push_back(std::string("Properties"));
items.push_back(std::string("Find Original"));
if (isLinkedObjectMissing())
{
disabled_items.push_back(std::string("Find Original"));
}
items.push_back(std::string("Delete"));
}
hideContextEntries(menu, items, disabled_items);
}
// +=================================================+
// | LLLinkBridge |
// +=================================================+
// For broken links.
std::string LLLinkFolderBridge::sPrefix("Link: ");
LLUIImagePtr LLLinkFolderBridge::getIcon() const
{
return LLUI::getUIImage("inv_link_folder.tga");
}
void LLLinkFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
// *TODO: Translate
lldebugs << "LLLink::buildContextMenu()" << llendl;
std::vector<std::string> items;
std::vector<std::string> disabled_items;
if (isInTrash())
{
items.push_back(std::string("Find Original"));
if (isLinkedObjectMissing())
{
disabled_items.push_back(std::string("Find Original"));
}
items.push_back(std::string("Purge Item"));
items.push_back(std::string("Restore Item"));
}
else
{
items.push_back(std::string("Find Original"));
if (isLinkedObjectMissing())
{
disabled_items.push_back(std::string("Find Original"));
}
items.push_back(std::string("Delete"));
}
hideContextEntries(menu, items, disabled_items);
}
void LLLinkFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
{
if ("goto" == action)
{
gotoItem(folder);
return;
}
LLItemBridge::performAction(folder,model,action);
}
void LLLinkFolderBridge::gotoItem(LLFolderView *folder)
{
const LLUUID &cat_uuid = getFolderID();
if (!cat_uuid.isNull())
{
if (LLFolderViewItem *base_folder = folder->getItemByID(cat_uuid))
{
if (LLInventoryModel* model = mInventoryPanel->getModel())
{
model->fetchDescendentsOf(cat_uuid);
}
base_folder->setOpen(TRUE);
folder->setSelectionFromRoot(base_folder,TRUE);
folder->scrollToShowSelection();
}
}
}
const LLUUID &LLLinkFolderBridge::getFolderID() const
{
if (LLViewerInventoryItem *link_item = getItem())
{
if (const LLViewerInventoryCategory *cat = link_item->getLinkedCategory())
{
const LLUUID& cat_uuid = cat->getUUID();
return cat_uuid;
}
}
return LLUUID::null;
}
*/