From b06b9cd30464188f68a1125db9ecc588fdf5ca71 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Mon, 5 Mar 2007 23:04:46 +0000 Subject: svn merge -r 58117:58118 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate (into release) Port of fix for SL-35327 which was fixed in release-candidate. --- indra/llinventory/llinventory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llinventory/llinventory.cpp') diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 2e3db2308f..0bc3f19cdf 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -1727,11 +1727,11 @@ bool inventory_and_asset_types_match( static const std::string INV_ITEM_ID_LABEL("item_id"); static const std::string INV_FOLDER_ID_LABEL("folder_id"); static const std::string INV_PARENT_ID_LABEL("parent_id"); -static const std::string INV_ASSET_TYPE_LABEL("asset_type"); +static const std::string INV_ASSET_TYPE_LABEL("type"); static const std::string INV_PREFERRED_TYPE_LABEL("preferred_type"); static const std::string INV_INVENTORY_TYPE_LABEL("inv_type"); static const std::string INV_NAME_LABEL("name"); -static const std::string INV_DESC_LABEL("description"); +static const std::string INV_DESC_LABEL("desc"); static const std::string INV_PERMISSIONS_LABEL("permissions"); static const std::string INV_ASSET_ID_LABEL("asset_id"); static const std::string INV_SALE_INFO_LABEL("sale_info"); -- cgit v1.2.3