2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5792f61..93440bb 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-10-03 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Reverted slviewer-0-v12100-AllowDiscardForCreator.patch.
+          (Was causing usability issues with new notecard creation).
+        
+          modified:   linden/indra/newview/llviewermessage.cpp
+          
+          
         * Added confirmation alerts for double-click tp and auto-pilot.
         
           modified:   linden/indra/newview/llviewermenu.cpp
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9b7ec48..cecef95 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -837,9 +837,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  -  Definitely a bad idea.  HB
-                        //bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
-                        bool show_keep_discard = true;
+                        // I'm not sure this is a good idea.  JC
+                        bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
+                        //bool show_keep_discard = true;
                         switch(asset_type)
                         {
                         case LLAssetType::AT_NOTECARD: