SL-15039 Prune unused preferences #1

List of removed preferences (usused per statistics):
AdvanceOutfitSnapshot
AnimationDebug
AskedAboutCrashReports
AudioLevelDoppler
AudioLevelRolloff
AudioLevelUnderwaterRolloff
AudioLevelWind
AutoAcceptNewInventory
AutoLoadWebProfiles
AvatarBacklight
AvatarPickerSortOrder
AvatarPosFinalOffset
AvatarBakedTextureUploadTimeout
AvatarBakedLocalTextureUpdateTimeout
AnimatedObjectsIgnoreLimits
AnimatedObjectsGlobalScale
AvatarBoundingBoxComplexity
StartUpChannelUUID
NearByChatChannelUUID
NotificationChannelUUID
AlertChannelUUID
AssetStorageLogFrequency
AvatarInspectorTooltipDelay
AllowBottomTrayButtonReordering
AvatarRotateThresholdSlow
AvatarRotateThresholdFast

1 files changed, 5 insertions, 20 deletions

diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 948793681d..a1a82fef7b 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -189,18 +189,6 @@ void inventory_offer_handler(LLOfferInfo* info)
         return;
     }
 
-    bool bAutoAccept(false);
-    // Avoid the Accept/Discard dialog if the user so desires. JC
-    if (gSavedSettings.getBOOL("AutoAcceptNewInventory")
-        && (info->mType == LLAssetType::AT_NOTECARD
-        || info->mType == LLAssetType::AT_LANDMARK
-        || info->mType == LLAssetType::AT_TEXTURE))
-    {
-        // For certain types, just accept the items into the inventory,
-        // and possibly open them on receipt depending upon "ShowNewInventory".
-        bAutoAccept = true;
-    }
-
     // Strip any SLURL from the message display. (DEV-2754)
     std::string msg = info->mDesc;
     int indx = msg.find(" ( http://slurl.com/secondlife/");
@@ -266,7 +254,7 @@ void inventory_offer_handler(LLOfferInfo* info)
     LLNotification::Params p;
 
     // Object -> Agent Inventory Offer
-    if (info->mFromObject && !bAutoAccept)
+    if (info->mFromObject)
     {
         // Inventory Slurls don't currently work for non agent transfers, so only display the object name.
         args["ITEM_SLURL"] = msg;
@@ -312,13 +300,10 @@ void inventory_offer_handler(LLOfferInfo* info)
             send_do_not_disturb_message(gMessageSystem, info->mFromID);
         }
 
-        if (!bAutoAccept) // if we auto accept, do not pester the user
-        {
-            // Inform user that there is a script floater via toast system
-            payload["give_inventory_notification"] = TRUE;
-            p.payload = payload;
-            LLPostponedNotification::add<LLPostponedOfferNotification>(p, info->mFromID, false);
-        }
+        // Inform user that there is a script floater via toast system
+        payload["give_inventory_notification"] = TRUE;
+        p.payload = payload;
+        LLPostponedNotification::add<LLPostponedOfferNotification>(p, info->mFromID, false);        
     }
 
     LLFirstUse::newInventory();