diff options
| author | Armin Weatherwax | 2010-06-18 19:51:47 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-07-01 12:05:08 +0200 |
| commit | 441df48deb92325b621935e0252f8c4375ee9af8 (patch) | |
| tree | 16f3df0a50515ef2dff410ccbaaa1376d895b180 /linden/indra | |
| parent | Fixed cmake not finding Mac libxml2 and libpng12. (diff) | |
| download | meta-impy-441df48deb92325b621935e0252f8c4375ee9af8.zip meta-impy-441df48deb92325b621935e0252f8c4375ee9af8.tar.gz meta-impy-441df48deb92325b621935e0252f8c4375ee9af8.tar.bz2 meta-impy-441df48deb92325b621935e0252f8c4375ee9af8.tar.xz | |
Henri Beauchamp: Allow Copy Worn Attachments
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index 1f24d14..fe56ae0 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp | |||
| @@ -1060,19 +1060,6 @@ BOOL LLItemBridge::isItemCopyable() const | |||
| 1060 | LLViewerInventoryItem* item = getItem(); | 1060 | LLViewerInventoryItem* item = getItem(); |
| 1061 | if (item) | 1061 | if (item) |
| 1062 | { | 1062 | { |
| 1063 | // can't copy worn objects. DEV-15183 | ||
| 1064 | LLVOAvatar *avatarp = gAgent.getAvatarObject(); | ||
| 1065 | if( !avatarp ) | ||
| 1066 | { | ||
| 1067 | return FALSE; | ||
| 1068 | } | ||
| 1069 | |||
| 1070 | if( avatarp->isWearingAttachment( mUUID ) ) | ||
| 1071 | { | ||
| 1072 | return FALSE; | ||
| 1073 | } | ||
| 1074 | |||
| 1075 | |||
| 1076 | return (item->getPermissions().allowCopyBy(gAgent.getID())); | 1063 | return (item->getPermissions().allowCopyBy(gAgent.getID())); |
| 1077 | } | 1064 | } |
| 1078 | return FALSE; | 1065 | return FALSE; |