diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 13:45:21 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 13:45:21 +0100 |
| commit | bb4836f53d98d987a1702f970d4b853eaa529907 (patch) | |
| tree | c0d16c64f89f10cd383cbbefa1cf2a914d0dc22a /indra/newview/llinventorybridge.cpp | |
| parent | a503cb57465594bf693ed335d04715389725b3b0 (diff) | |
| parent | 68870a1f59c11a173353698b994f4540b214d57f (diff) | |
another hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 9414f2e37b..e394b4dfc1 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -598,7 +598,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, LLViewerInventoryItem* inv_item = gInventory.getItem(mUUID); if (inv_item) { - is_asset_knowable = is_asset_id_knowable(inv_item->getType()); + is_asset_knowable = LLAssetType::lookupIsAssetIDKnowable(inv_item->getType()); } if ( !is_asset_knowable // disable menu item for Inventory items with unknown asset. EXT-5308 || (! ( isItemPermissive() || gAgent.isGodlike() ) ) |