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

fixing some more merge errors

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-22 00:11:47 -03:00
parent a9803a0f96
commit 9dbe415796
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llinventorymodel.cpp
View File

@@ -3485,7 +3485,6 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(LLInventoryItem* ite
LLVOAvatar* my_avatar = NULL;
switch(item->getType())
{
{
// <edit> I don't even think changing this did anything
//case LLAssetType::AT_CALLINGCARD: