diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-09 20:56:23 +0000 |
|---|---|---|
| committer | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-09 20:56:23 +0000 |
| commit | 7a64aad1def1b0612addbf2e66c66db061d7e182 (patch) | |
| tree | 2e011e8b58933e692c0cae738a4382a37e3e222b /indra/newview/llviewernetwork.h | |
| parent | 311aaf7ffd8f7dc95dba84f10fcae97bc93901bb (diff) | |
DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling
ignore dead branch
Diffstat (limited to 'indra/newview/llviewernetwork.h')
| -rw-r--r-- | indra/newview/llviewernetwork.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h index 0642845d54..bcf0c5a8f2 100644 --- a/indra/newview/llviewernetwork.h +++ b/indra/newview/llviewernetwork.h @@ -43,7 +43,6 @@ extern const char* DEFAULT_LOGIN_PAGE; #define GRID_LOGIN_PAGE_VALUE "login_page" #define GRID_IS_SYSTEM_GRID_VALUE "system_grid" #define GRID_IS_FAVORITE_VALUE "favorite" -#define GRID_IS_VISIBLE_VALUE "visible" #define GRID_LOGIN_CREDENTIAL_PAGE_TYPE_VALUE "credential_type" #define GRID_LOGIN_CREDENTIAL_PAGE_TYPE_AGENT "agent" #define GRID_LOGIN_CREDENTIAL_PAGE_TYPE_ACCOUNT "account" @@ -79,6 +78,7 @@ public: // when the grid manager is instantiated, the default grids are automatically // loaded, and the grids favorites list is loaded from the xml file. + LLGridManager(const std::string& grid_file); LLGridManager(); ~LLGridManager(); @@ -112,10 +112,7 @@ public: void setGridChoice(const std::string& grid_name); - std::string getGridLabel() - { - return mGridList[mGridName][GRID_LABEL_VALUE]; - } + std::string getGridLabel() { return mGridList[mGridName][GRID_LABEL_VALUE]; } std::string getGridName() const { return mGridName; } void getLoginURIs(std::vector<std::string>& uris); std::string getHelperURI() {return mGridList[mGridName][GRID_HELPER_URI_VALUE];} @@ -132,6 +129,8 @@ public: LLSD getGridInfo() { return mGridList[mGridName]; } + std::string getGridByLabel( const std::string &grid_label); + bool isSystemGrid(const std::string& grid) { return mGridList.has(grid) && |