diff options
| author | Anders Arnholm | 2008-12-13 18:49:24 +0100 |
|---|---|---|
| committer | Anders Arnholm | 2008-12-13 18:49:24 +0100 |
| commit | c7fca44072ae101b986a87c87ebda1e99de5141a (patch) | |
| tree | a9884591ca07983234a0ed41275d7b92dc513f46 /linden/indra/newview/llviewermessage.cpp | |
| parent | Merge 1.0.0 RC2 into openal (diff) | |
| parent | Merge branch 'next' of git://github.com/jacek/imprudence into next (diff) | |
| download | meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.zip meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.gz meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.bz2 meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.xz | |
Merge branch 'next' into openal
Conflicts:
ChangeLog.txt
Diffstat (limited to 'linden/indra/newview/llviewermessage.cpp')
| -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 260265e..28ca198 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) | |||
| 833 | //if we are throttled, don't display them - Gigs | 833 | //if we are throttled, don't display them - Gigs |
| 834 | if (check_offer_throttle(from_name, false)) | 834 | if (check_offer_throttle(from_name, false)) |
| 835 | { | 835 | { |
| 836 | // I'm not sure this is a good idea. JC | 836 | // I'm not sure this is a good idea. JC - Definitely a bad idea. HB |
| 837 | bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID(); | 837 | //bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID(); |
| 838 | //bool show_keep_discard = true; | 838 | bool show_keep_discard = true; |
| 839 | switch(asset_type) | 839 | switch(asset_type) |
| 840 | { | 840 | { |
| 841 | case LLAssetType::AT_NOTECARD: | 841 | case LLAssetType::AT_NOTECARD: |