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

added some options back to the inventory view

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-03 07:04:30 -03:00
parent 46a32e5348
commit b4d14ea59c
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llinventorybridge.cpp
View File

@@ -567,6 +567,14 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, std::vector<std::str
//items.push_back(std::string("Magic Get"));
//items.push_back(std::string("Rez"));
items.push_back(std::string("Open With..."));
// for now, disable reupload
//if(getInventoryType() == LLInventoryType::IT_ANIMATION)
//{
// items.push_back(std::string("Reupload..."));
//}
items.push_back(std::string("Save As..."));
items.push_back(std::string("Save InvCache..."));
// </edit>
items.push_back(std::string("Copy Separator"));

5
indra/newview/llinventorymodel.cpp
View File

@@ -3489,8 +3489,9 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(LLInventoryItem* ite
// <edit> I don't even think changing this did anything
//case LLAssetType::AT_CALLINGCARD:
// // not allowed
// break;
// break;
// </edit>
case LLAssetType::AT_OBJECT:
my_avatar = gAgent.getAvatarObject();
if(my_avatar && !my_avatar->isWearingAttachment(item->getUUID()))