diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
commit | 197c78fa4bf372d09b315b1bad3cf6649627eb48 (patch) | |
tree | d49217ad4a9b10fa907cfbefeba1453042b66f9a /indra/newview/llplacesinventorybridge.cpp | |
parent | 05e15ccb82541494bf7145652140de187d838cda (diff) | |
parent | 367fda833cb5633564c2518f613a00484eb73ec5 (diff) |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llplacesinventorybridge.cpp')
-rw-r--r-- | indra/newview/llplacesinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llplacesinventorybridge.cpp b/indra/newview/llplacesinventorybridge.cpp index 83443687c9..4fe69f295c 100644 --- a/indra/newview/llplacesinventorybridge.cpp +++ b/indra/newview/llplacesinventorybridge.cpp @@ -66,7 +66,7 @@ void LLPlacesLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags) std::vector<std::string> items; std::vector<std::string> disabled_items; - if(isInTrash()) + if(isItemInTrash()) { items.push_back(std::string("Purge Item")); if (!isItemRemovable()) |