Applied 3 patches from CoolViewer, http://sldev.free.fr

Applied slviewer-0-v120130-LandmarksDiscardButton_v2.patch.bz2
Applied slviewer-0-v120160-FriendshipAndCallingcardOffersIgnoreButton.patch.bz2
Applied slviewer-0-v12100-AllowDiscardForCreator.patch.bz2

3 files changed, 18 insertions, 4 deletions

diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index 01d77f6..dba603b 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -90,7 +90,15 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
 {
         
         mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
-        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        if (show_keep_discard)
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap());
+                childSetAction("Discard btn",onDiscardBtn,this);
+        }
+        else
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        }
 
         /*
         childSetCommitCallback("desc_editor", LLPreview::onText, this);
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 0e39026..3c7a0ab 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -833,9 +833,9 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                 //if we are throttled, don't display them - Gigs
                 if (check_offer_throttle(from_name, false))
                 {
-                        // I'm not sure this is a good idea.  JC
-                        bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
-                        //bool show_keep_discard = true;
+                        // I'm not sure this is a good idea.  JC  -  Definitely a bad idea.  HB
+                        //bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
+                        bool show_keep_discard = true;
                         switch(asset_type)
                         {
                         case LLAssetType::AT_NOTECARD:
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 6af19ee..d169741 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -593,6 +593,9 @@ see each other&apos;s online status.)
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="FriendshipAccepted" tip="false">
                 <message name="message">
@@ -616,6 +619,9 @@ so you can quickly IM this resident.
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="RegionRestartMinutes" tip="false">
                 <message name="message">