diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp index 0513146e8c376e9a25dee040a30958b47a066302..0b5ac8e798732ac70999dee6e7e262161aa6edc0 100644 --- a/indra/newview/llfloaterevent.cpp +++ b/indra/newview/llfloaterevent.cpp @@ -78,7 +78,6 @@ BOOL LLFloaterEvent::postBuild() if (mBrowser) { mBrowser->addObserver(this); - mBrowser->setTrusted(true); } return TRUE; diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml index 1d16c942dd912ee661a8d1f8f6430effdb97bf51..58f2e555ddeb821d12c3457827f35364a91bc80a 100644 --- a/indra/newview/skins/default/xui/da/floater_event.xml +++ b/indra/newview/skins/default/xui/da/floater_event.xml @@ -20,6 +20,7 @@ Done </floater.string> <web_browser + trusted_content="true" follows="left|right|top|bottom" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml index 13108100f67f3cea8ae354693f5c109efa3a446c..87fb580abaf2cd51e1299e2d598889f968d59ea0 100644 --- a/indra/newview/skins/default/xui/de/floater_event.xml +++ b/indra/newview/skins/default/xui/de/floater_event.xml @@ -20,6 +20,7 @@ Done </floater.string> <web_browser + trusted_content="true" follows="left|right|top|bottom" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index 1be9748711098b4ac8c8c9cb0ee2804815d0184c..7ed020f83235f3ce5a115878121775d8cd58812f 100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -20,6 +20,7 @@ Done </floater.string> <web_browser + trusted_content="true" follows="left|right|top|bottom" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml index f37c722f03795f73e7d783f080271ad623b97a41..8bca7783ab0d570c8dc7ce8cfd8a2b59c3bd92cf 100644 --- a/indra/newview/skins/default/xui/es/floater_event.xml +++ b/indra/newview/skins/default/xui/es/floater_event.xml @@ -20,6 +20,7 @@ Done </floater.string> <web_browser + trusted_content="true" follows="left|right|top|bottom" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml index 72361c0c1af0d98af7bad3e6712c9e76c8f57cf4..3527d89973b6dd7c47db3c58d98de651907eaaf5 100644 --- a/indra/newview/skins/default/xui/fr/floater_event.xml +++ b/indra/newview/skins/default/xui/fr/floater_event.xml @@ -20,6 +20,7 @@ Done </floater.string> <web_browser + trusted_content="true" follows="left|right|top|bottom" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/it/floater_event.xml b/indra/newview/skins/default/xui/it/floater_event.xml index 177305e6480fdd541e75ac9b30e8ef0bbb32986b..9a0105a589b84abbf959fe847e499468972df7ad 100644 --- a/indra/newview/skins/default/xui/it/floater_event.xml +++ b/indra/newview/skins/default/xui/it/floater_event.xml @@ -20,6 +20,7 @@ Done </floater.string> <web_browser + trusted_content="true" follows="left|right|top|bottom" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml index ec4188d30063d6aab3bebdacde000b89f758ddce..9e99c4a931e00e2230db93cae1c561b43587b9f2 100644 --- a/indra/newview/skins/default/xui/ja/floater_event.xml +++ b/indra/newview/skins/default/xui/ja/floater_event.xml @@ -20,6 +20,7 @@ Done </floater.string> <web_browser + trusted_content="true" follows="left|right|top|bottom" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/nl/floater_event.xml b/indra/newview/skins/default/xui/nl/floater_event.xml new file mode 100644 index 0000000000000000000000000000000000000000..45ec58abdf175745543f61f4b216f9d4836dd503 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_event.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + follows="all" + height="400" + can_resize="true" + help_topic="event_details" + label="Event" + layout="topleft" + name="Event" + save_rect="true" + save_visibility="false" + title="EVENT DETAILS" + width="600"> + <floater.string + name="loading_text"> + Laden... + </floater.string> + <floater.string + name="done_text"> + Done + </floater.string> + <web_browser + trusted_content="true" + follows="left|right|top|bottom" + layout="topleft" + left="10" + name="browser" + height="365" + width="580" + top="0"/> + <text + follows="bottom|left" + height="16" + layout="topleft" + left_delta="0" + name="status_text" + top_pad="10" + width="150" /> +</floater> + diff --git a/indra/newview/skins/default/xui/pl/floater_event.xml b/indra/newview/skins/default/xui/pl/floater_event.xml index 632e0b8a44079705bd2d55fd56327e538fff4c13..6b24720d8698745d23857ac5362e192ec9f31aaa 100644 --- a/indra/newview/skins/default/xui/pl/floater_event.xml +++ b/indra/newview/skins/default/xui/pl/floater_event.xml @@ -20,6 +20,7 @@ Done </floater.string> <web_browser + trusted_content="true" follows="left|right|top|bottom" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml index 548c0bff861f23f9a1359461a45d7371333b5231..df4fe9a6a8179dcbfced14c591ccfbdaa11eeaa7 100644 --- a/indra/newview/skins/default/xui/pt/floater_event.xml +++ b/indra/newview/skins/default/xui/pt/floater_event.xml @@ -20,6 +20,7 @@ Done </floater.string> <web_browser + trusted_content="true" follows="left|right|top|bottom" layout="topleft" left="10"