diff options
| author | McCabe Maxsted | 2009-10-03 23:19:49 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-03 23:19:49 -0700 |
| commit | 49734bd3e51516690f71f104a4a3249aabfb669e (patch) | |
| tree | a1ede0b88014a52f59b5f662a7701f8f61710e39 /linden/indra/newview | |
| parent | Added confirmation alerts for double-click tp and auto-pilot (diff) | |
| download | meta-impy-49734bd3e51516690f71f104a4a3249aabfb669e.zip meta-impy-49734bd3e51516690f71f104a4a3249aabfb669e.tar.gz meta-impy-49734bd3e51516690f71f104a4a3249aabfb669e.tar.bz2 meta-impy-49734bd3e51516690f71f104a4a3249aabfb669e.tar.xz | |
Reverted slviewer-0-v12100-AllowDiscardForCreator.patch (Was causing usability issues with new notecard creation)
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llviewermessage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
| 837 | //if we are throttled, don't display them - Gigs | 837 | //if we are throttled, don't display them - Gigs |
| 838 | if (check_offer_throttle(from_name, false)) | 838 | if (check_offer_throttle(from_name, false)) |
| 839 | { | 839 | { |
| 840 | // I'm not sure this is a good idea. JC - Definitely a bad idea. HB | 840 | // I'm not sure this is a good idea. JC |
| 841 | //bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID(); | 841 | bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID(); |
| 842 | bool show_keep_discard = true; | 842 | //bool show_keep_discard = true; |
| 843 | switch(asset_type) | 843 | switch(asset_type) |
| 844 | { | 844 | { |
| 845 | case LLAssetType::AT_NOTECARD: | 845 | case LLAssetType::AT_NOTECARD: |