From cc92525b0df952659102d2e5adcc4140fea7f371 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Mon, 4 May 2009 17:43:26 +0000 Subject: QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql --- indra/llinventory/llinventory.h | 10 ++++++++++ indra/llinventory/llparcel.cpp | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'indra/llinventory') diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 53a52cd324..d34046c310 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -200,6 +200,16 @@ public: // EWearableType enumeration found in newview/llwearable.h // II_FLAGS_WEARABLES_MASK = 0xff, + + // these bits need to be cleared whenever the asset_id is updated + // on a pre-existing inventory item (DEV-28098 and DEV-30997) + II_FLAGS_PERM_OVERWRITE_MASK = II_FLAGS_OBJECT_SLAM_PERM + | II_FLAGS_OBJECT_SLAM_SALE + | II_FLAGS_OBJECT_PERM_OVERWRITE_BASE + | II_FLAGS_OBJECT_PERM_OVERWRITE_OWNER + | II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP + | II_FLAGS_OBJECT_PERM_OVERWRITE_EVERYONE + | II_FLAGS_OBJECT_PERM_OVERWRITE_NEXT_OWNER, }; protected: diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 2689ada80c..9c27476b0a 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -58,8 +58,11 @@ static const std::string PARCEL_OWNERSHIP_STATUS_STRING[LLParcel::OS_COUNT+1] = }; // NOTE: Adding parcel categories also requires updating: -// * newview/app_settings/floater_directory.xml category combobox +// * floater_directory.xml category combobox +// * floater_about_land.xml category combobox // * Web site "create event" tools +// DO NOT DELETE ITEMS FROM THIS LIST WITHOUT DEEPLY UNDERSTANDING WHAT YOU'RE DOING. +// static const std::string PARCEL_CATEGORY_STRING[LLParcel::C_COUNT] = { "none", -- cgit v1.2.3