livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIRE-21236] Allow access to the underlying URL for grid status. 

All the button and menus remain consistent, they reference the gridstatus floater
but the floater can now open in the page in an external viewer.
the link that gets opened by the external now uses the Linden alias
https://status.secondlifegrid.net/
and will therefore cause the correct behaviour (as per user setting) when linked in chat.
Beq 2017-06-15 14:02:42 +01:00
parent 1251adf7ed
commit dbc6c8e7be
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloatergridstatus.cpp
View File

@ -39,7 +39,11 @@
#include "llxmltree.h"
std::map<std::string, std::string> LLFloaterGridStatus::sItemsMap;
const std::string DEFAULT_GRID_STATUS_URL = "http://secondlife-status.statuspage.io/";
// <FS:Beq> [FIRE-21236] Changes to improve usability of grid status
// update URL to the "internal" secondlife alias for consistency with link opening preferences
//const std::string DEFAULT_GRID_STATUS_URL = "http://secondlife-status.statuspage.io/";
const std::string DEFAULT_GRID_STATUS_URL = "http://status.secondlifegrid.net";
// </FS:Beq>
LLFloaterGridStatus::LLFloaterGridStatus(const Params& key) :
LLFloaterWebContent(key),
@ -62,6 +66,9 @@ void LLFloaterGridStatus::onOpen(const LLSD& key)
p.allow_address_entry = false;
LLFloaterWebContent::onOpen(p);
// <FS:Beq> [FIRE-21236] Changes to improve usability of grid status
getChildView("popexternal")->setEnabled(true);
// </FS:Beq>
applyPreferredRect();
if (mWebBrowser)
{