diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-08 00:45:17 +0000 |
|---|---|---|
| committer | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-08 00:45:17 +0000 |
| commit | 9e89819d55a3b6ee7fc56f3efb36f273e4e05c83 (patch) | |
| tree | 1585010af9cafd82202c22ef9cb0db4967c74394 /indra/newview/llviewernetwork.h | |
| parent | fe71dd340ab396b93bde45df438041af5d85fd47 (diff) | |
DEV-34822 - merge with 1.23
certificate notification code
-r 118191
ignore-dead-branch
Diffstat (limited to 'indra/newview/llviewernetwork.h')
| -rw-r--r-- | indra/newview/llviewernetwork.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h index 7b3ce9c499..0642845d54 100644 --- a/indra/newview/llviewernetwork.h +++ b/indra/newview/llviewernetwork.h @@ -5,7 +5,7 @@ * * $LicenseInfo:firstyear=2006&license=viewergpl$ * - * Copyright (c) 2006-2007, Linden Research, Inc. + * Copyright (c) 2006-2010, Linden Research, Inc. * * Second Life Viewer Source Code * The source code in this file ("Source Code") is provided by Linden Lab @@ -43,6 +43,7 @@ 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" @@ -78,7 +79,6 @@ 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(); |