diff options
| author | skolb <none@none> | 2009-10-12 11:24:14 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-12 11:24:14 -0700 |
| commit | 1d63b145481021c5d0ed16bd0c10c320170d0cf5 (patch) | |
| tree | 1ce48042a073b62504367570d13c676f24493ea1 /indra | |
| parent | d4b2897700c66354413af42ab055bd1aaa47f91c (diff) | |
Merge changes to llpanelmediasettingsgeneral to handle reset button
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index eb2457744a..5914399638 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -147,7 +147,7 @@ private: #if LL_WINDOWS // Enable plugins - LLQtWebKit::getInstance()->enablePlugins(false); + LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_DARWIN // Disable plugins LLQtWebKit::getInstance()->enablePlugins(false); diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp index a33d9604fe..1ac6330b0f 100644 --- a/indra/newview/llpanelmediasettingsgeneral.cpp +++ b/indra/newview/llpanelmediasettingsgeneral.cpp @@ -32,6 +32,7 @@ #include "llviewerprecompiledheaders.h" +#include "llagent.h" #include "llpanelmediasettingsgeneral.h" #include "llcombobox.h" #include "llcheckboxctrl.h" @@ -47,6 +48,7 @@ #include "llmediaentry.h" #include "llmediactrl.h" #include "llpanelcontents.h" +#include "llpermissions.h" #include "llpluginclassmedia.h" #include "llfloatermediasettings.h" #include "llfloatertools.h" @@ -159,8 +161,8 @@ void LLPanelMediaSettingsGeneral::draw() // current URL can change over time. // updateCurrentURL(); - // enable/disable RESRET button depending on permissions - // since this is the same as a navigate action + LLPermissions perm; + BOOL valid = LLSelectMgr::getInstance()->selectGetPermissions(perm); bool user_can_press_reset = gFloaterTools->selectedMediaEditable(); // several places modify this widget so we must collect states in one place |