diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-26 18:14:32 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-26 18:14:32 -0400 |
| commit | 34ab18d0c2f7de57e42ded0c3d94ee0fec17da28 (patch) | |
| tree | 4f980356e5557e412233ab5c0b9ac4830a56d624 | |
| parent | 4a361046f32a685408ddbc1e4a3138946c448ff1 (diff) | |
EXT-8918 FIXED Incorrect right-click options for library items
Library items have "Share" disabled.
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index f2a91defef..38f3521b2d 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -952,6 +952,8 @@ void LLInvFVBridge::purgeItem(LLInventoryModel *model, const LLUUID &uuid) BOOL LLInvFVBridge::canShare() const { + if (!isAgentInventory()) return FALSE; + const LLInventoryModel* model = getInventoryModel(); if (!model) return FALSE; @@ -963,9 +965,10 @@ BOOL LLInvFVBridge::canShare() const return (BOOL)LLGiveInventory::isInventoryGiveAcceptable(item); } - // All categories can be given. - const LLViewerInventoryCategory* cat = model->getCategory(mUUID); - return (cat != NULL); + // Categories can be given. + if (model->getCategory(mUUID)) return TRUE; + + return FALSE; } // +=================================================+ |