diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
| commit | f64a79d9d14fe52dc9ac599bc9e4faf8009254ce (patch) | |
| tree | d14ff8f9cf8bd723b8d479446f47eeb4211e8326 /indra/newview/lltoastnotifypanel.cpp | |
| parent | ee130adc60dea8530f82d90107198ebcbd63fded (diff) | |
| parent | 4539e5c8e93badc83e71045ba87ef81bf8740cab (diff) | |
merge changes for DRTVWR-171
Diffstat (limited to 'indra/newview/lltoastnotifypanel.cpp')
| -rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index a473ee7ce0..d629f3abac 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -457,7 +457,7 @@ button_name_set_t getButtonDisableList(const std::string& notification_name, con { search_map = user_give_item_disable_map; } - else if("TeleportOffered" == notification_name) + else if(("TeleportOffered" == notification_name) || ("TeleportOffered_MaturityExceeded" == notification_name)) { search_map = teleport_offered_disable_map; } |