diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewernetwork.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h index 53bb0ab..970e2ce 100644 --- a/linden/indra/newview/llviewernetwork.h +++ b/linden/indra/newview/llviewernetwork.h | |||
@@ -38,23 +38,8 @@ class LLHost; | |||
38 | enum EGridInfo | 38 | enum EGridInfo |
39 | { | 39 | { |
40 | GRID_INFO_NONE, | 40 | GRID_INFO_NONE, |
41 | GRID_INFO_ADITI, | ||
42 | GRID_INFO_AGNI, | 41 | GRID_INFO_AGNI, |
43 | GRID_INFO_ARUNA, | 42 | GRID_INFO_ADITI, |
44 | GRID_INFO_DAMBALLAH, | ||
45 | GRID_INFO_DURGA, | ||
46 | GRID_INFO_GANGA, | ||
47 | GRID_INFO_MITRA, | ||
48 | GRID_INFO_MOHINI, | ||
49 | GRID_INFO_NANDI, | ||
50 | GRID_INFO_RADHA, | ||
51 | GRID_INFO_RAVI, | ||
52 | GRID_INFO_SIVA, | ||
53 | GRID_INFO_SHAKTI, | ||
54 | GRID_INFO_SOMA, | ||
55 | GRID_INFO_UMA, | ||
56 | GRID_INFO_VAAK, | ||
57 | GRID_INFO_YAMI, | ||
58 | GRID_INFO_LOCAL, | 43 | GRID_INFO_LOCAL, |
59 | GRID_INFO_OTHER, // IP address set via command line option | 44 | GRID_INFO_OTHER, // IP address set via command line option |
60 | GRID_INFO_COUNT | 45 | GRID_INFO_COUNT |
@@ -87,6 +72,20 @@ public: | |||
87 | **/ | 72 | **/ |
88 | std::string getGridLabel() const; | 73 | std::string getGridLabel() const; |
89 | 74 | ||
75 | /** | ||
76 | * @brief Get the code name for the grid choice. | ||
77 | * | ||
78 | * Returns the code name for the grid choice, as designated | ||
79 | * by Linden Lab. The SL main grid is Agni, and the beta | ||
80 | * grid is Aditi. There are other LL testing grids with code | ||
81 | * names, but we don't care about those. | ||
82 | * | ||
83 | * This string is used primarily for fetching the proper | ||
84 | * login splash page, since the web server expects "Agni" | ||
85 | * and "Aditi", not "SL Main Grid" and "SL Beta Grid". | ||
86 | */ | ||
87 | std::string getGridCodeName() const; | ||
88 | |||
90 | std::string getKnownGridLabel(EGridInfo grid_index) const; | 89 | std::string getKnownGridLabel(EGridInfo grid_index) const; |
91 | 90 | ||
92 | void getLoginURIs(std::vector<std::string>& uris) const; | 91 | void getLoginURIs(std::vector<std::string>& uris) const; |