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

Change login page to beta directory

meow-7.2.2
Mobius 2011-06-13 20:33:27 +01:00
parent f5d13a82d3
commit a486e2e957
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewernetwork.cpp
View File

@ -36,7 +36,7 @@
#include "llweb.h"
const char* DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginFS/";
const char* DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginFSbeta/";
const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/";
const char* MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/";

2
indra/newview/skins/default/xui/en/panel_login.xml
View File

@ -14,7 +14,7 @@ top="600"
</panel.string>
<panel.string
name="real_url" translate="false">
http://phoenixviewer.com/app/loginFS/
http://phoenixviewer.com/app/loginFSbeta/
</panel.string>
<string name="reg_in_client_url" translate="false">
http://secondlife.eniac15.lindenlab.com/reg-in-client/

12
indra/newview/tests/llviewernetwork_test.cpp
View File

@ -164,7 +164,7 @@ namespace tut
std::string("https://secondlife.com/helpers/"));
ensure_equals("Agni login page is correct",
grid[GRID_LOGIN_PAGE_VALUE].asString(),
std::string("http://phoenixviewer.com/app/loginFS/"));
std::string("http://phoenixviewer.com/app/loginFSbeta/"));
ensure("Agni is a favorite",
grid.has(GRID_IS_FAVORITE_VALUE));
ensure("Agni is a system grid",
@ -208,7 +208,7 @@ namespace tut
std::string("https://secondlife.com/helpers/"));
ensure_equals("Agni login page the same after grid file",
grid[GRID_LOGIN_PAGE_VALUE].asString(),
std::string("http://phoenixviewer.com/app/loginFS/"));
std::string("http://phoenixviewer.com/app/loginFSbeta/"));
ensure("Agni still a favorite after grid file",
grid.has(GRID_IS_FAVORITE_VALUE));
ensure("Agni system grid still set after grid file",
@ -310,7 +310,7 @@ namespace tut
std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
ensure_equals("Override known grid login uri: login page is not set",
grid[GRID_LOGIN_PAGE_VALUE].asString(),
std::string("http://phoenixviewer.com/app/loginFS/"));
std::string("http://phoenixviewer.com/app/loginFSbeta/"));
// Override with loginuri
// override custom grid
@ -359,7 +359,7 @@ namespace tut
std::string("https://my.helper.uri/mycustomhelpers"));
ensure_equals("Override known grid helper uri: login page is not changed",
grid[GRID_LOGIN_PAGE_VALUE].asString(),
std::string("http://phoenixviewer.com/app/loginFS/"));
std::string("http://phoenixviewer.com/app/loginFSbeta/"));
// Override with helperuri
// override custom grid
@ -451,9 +451,9 @@ namespace tut
ensure_equals("getHelperURI", LLGridManager::getInstance()->getHelperURI(),
std::string("https://secondlife.com/helpers/"));
ensure_equals("getLoginPage", LLGridManager::getInstance()->getLoginPage(),
std::string("http://phoenixviewer.com/app/loginFS/"));
std::string("http://phoenixviewer.com/app/loginFSbeta/"));
ensure_equals("getLoginPage2", LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"),
std::string("http://phoenixviewer.com/app/loginFS/"));
std::string("http://phoenixviewer.com/app/loginFSbeta/"));
ensure("Is Agni a production grid", LLGridManager::getInstance()->isInProductionGrid());
std::vector<std::string> uris;
LLGridManager::getInstance()->getLoginURIs(uris);