diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-04 14:58:55 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-04 14:58:55 +0200 |
| commit | 4b62779fd3379561e97fe283ffd1c80d27703e86 (patch) | |
| tree | 2aa0bd09e5a86f3a7d2a6028b061699de67d7a26 | |
| parent | bfcb558f90d1b3108893cfcd3cc07325c47486b6 (diff) | |
SL-12562 Change events URL
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterevent.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index da1e87fda4..b8bc4fe0b9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3775,7 +3775,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://events.secondlife.com/viewer/embed/event/</string> + <string>https://secondlife.com/my/community/events/event.php?id=</string> </map> <key>FastCacheFetchEnabled</key> <map> diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp index 3e303e0932..a6640cc073 100644 --- a/indra/newview/llfloaterevent.cpp +++ b/indra/newview/llfloaterevent.cpp @@ -110,7 +110,7 @@ void LLFloaterEvent::setEventID(const U32 event_id) // get the search URL and expand all of the substitutions // (also adds things like [LANGUAGE], [VERSION], [OS], etc.) std::ostringstream url; - url << gSavedSettings.getString("EventURL") << event_id << "/" << std::endl; + url << gSavedSettings.getString("EventURL") << event_id << std::endl; // and load the URL in the web view mBrowser->navigateTo(url.str()); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 04b5d808ec..6284fe9a4d 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -461,7 +461,7 @@ name="Events"> <menu_item_call.on_click function="Advanced.ShowURL" - parameter="http://events.secondlife.com"/> + parameter="https://secondlife.com/my/community/events"/> </menu_item_call> <menu_item_check label="Search..." diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e3776cdc1a..91e6e03db5 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1493,7 +1493,7 @@ Go to the [SECOND_LIFE] events web page? <tag>confirm</tag> <url option="0" name="url"> - http://secondlife.com/events/ + https://secondlife.com/my/community/events </url> <usetemplate name="okcancelbuttons" |