Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

Browse Source
This commit is contained in:
Shyotl
2013-05-31 05:33:41 -05:00
parent 641ada030e
commit ef3e918558
148 changed files with 15636 additions and 4633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
indra/newview/llpanelweb.cpp
View File

@@ -44,17 +44,6 @@
#include "llviewerwindow.h"
#include "llpluginclassmedia.h"
// helper functions for getting/freeing the web browser media
// if creating/destroying these is too slow, we'll need to create
// a static member and update all our static callbacks
viewer_media_t get_web_media()
{
viewer_media_t media_source = LLViewerMedia::newMediaImpl("", LLUUID::null, 0, 0, 0, 0, "text/html");
return media_source;
}
LLPanelWeb::LLPanelWeb()
{
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_web.xml");
@@ -98,15 +87,14 @@ void LLPanelWeb::apply()
bool value = childGetValue("use_external_browser").asString() == "external" ? true : false;
gSavedSettings.setBOOL("UseExternalBrowser", value);
viewer_media_t media_source = get_web_media();
if (media_source && media_source->hasMedia())
{
media_source->getMediaPlugin()->enable_cookies(childGetValue("cookies_enabled"));
LLViewerMedia::setCookiesEnabled(getChild<LLUICtrl>("cookies_enabled")->getValue());
bool proxy_enable = childGetValue("web_proxy_enabled");
std::string proxy_address = childGetValue("web_proxy_editor");
int proxy_port = childGetValue("web_proxy_port");
media_source->getMediaPlugin()->proxy_setup(proxy_enable, proxy_address, proxy_port);
if (hasChild("web_proxy_enabled") && hasChild("web_proxy_editor") && hasChild("web_proxy_port"))
{
bool proxy_enable = getChild<LLUICtrl>("web_proxy_enabled")->getValue();
std::string proxy_address = getChild<LLUICtrl>("web_proxy_editor")->getValue();
int proxy_port = getChild<LLUICtrl>("web_proxy_port")->getValue();
LLViewerMedia::setProxyConfig(proxy_enable, proxy_address, proxy_port);
}
}
@@ -126,9 +114,7 @@ bool LLPanelWeb::callback_clear_browser_cache(const LLSD& notification, const LL
S32 option = LLNotification::getSelectedOption(notification, response);
if ( option == 0 ) // YES
{
viewer_media_t media_source = get_web_media();
if (media_source && media_source->hasMedia())
media_source->getMediaPlugin()->clear_cache();
LLViewerMedia::clearAllCaches();
}
return false;
}
@@ -145,25 +131,11 @@ bool LLPanelWeb::callback_clear_cookies(const LLSD& notification, const LLSD& re
S32 option = LLNotification::getSelectedOption(notification, response);
if ( option == 0 ) // YES
{
viewer_media_t media_source = get_web_media();
if (media_source && media_source->hasMedia())
media_source->getMediaPlugin()->clear_cookies();
LLViewerMedia::clearAllCookies();
}
return false;
}
// static
void LLPanelWeb::onCommitCookies(LLUICtrl* ctrl, void* data)
{
LLPanelWeb* self = (LLPanelWeb*)data;
LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
if (!self || !check) return;
viewer_media_t media_source = get_web_media();
if (media_source && media_source->hasMedia())
media_source->getMediaPlugin()->enable_cookies(check->get());
}
// static
void LLPanelWeb::onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data)
{
@@ -174,6 +146,4 @@ void LLPanelWeb::onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data)
self->childSetEnabled("web_proxy_editor", check->get());
self->childSetEnabled("web_proxy_port", check->get());
self->childSetEnabled("proxy_text_label", check->get());
}