diff options
| author | Richard Linden <none@none> | 2010-09-16 17:59:12 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 17:59:12 -0700 |
| commit | 2f233f3eb48730eef4df708021752b0fd9b6c6b2 (patch) | |
| tree | 25fd276c7b941a97629ccff6e7d5fe65fcbf1bb5 /indra/newview | |
| parent | 2dc14c66d4f50dfe4d140b5630cadf2febcee09d (diff) | |
reverted mediaenablepopups to false by default (desired behavior)
always trigger popup notification and rely on ignore machinery to hide it
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f815ae3eb2..efe418f0e8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5195,7 +5195,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>MediaOnAPrimUI</key> <map> diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 7c94627dcb..621f241227 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1042,16 +1042,12 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) std::string target = self->getClickTarget(); std::string uuid = self->getClickUUID(); - if(gSavedSettings.getBOOL("MediaEnablePopups")) - { - - LLNotificationPtr popup_notify = LLNotifications::instance().add("PopupAttempt", - LLSD(), - LLSD().with("target", target).with("url", url).with("uuid", uuid), - boost::bind(&LLMediaCtrl::onPopup, this, _1, _2)); - showNotification(popup_notify); - break; - } + LLNotificationPtr popup_notify = LLNotifications::instance().add("PopupAttempt", + LLSD(), + LLSD().with("target", target).with("url", url).with("uuid", uuid), + boost::bind(&LLMediaCtrl::onPopup, this, _1, _2)); + showNotification(popup_notify); + break; }; case MEDIA_EVENT_CLICK_LINK_NOFOLLOW: |