aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewernetwork.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-11-25 18:18:52 -0600
committerJacek Antonelli2008-11-25 18:18:52 -0600
commitc07a4170324b61fc51e38ec72d44b26a52fc326e (patch)
tree549e97dcc039792b4dbeec3f353bc8fca42bcae6 /linden/indra/newview/llviewernetwork.h
parentChanged the grid selector options at login. (diff)
downloadmeta-impy-c07a4170324b61fc51e38ec72d44b26a52fc326e.zip
meta-impy-c07a4170324b61fc51e38ec72d44b26a52fc326e.tar.gz
meta-impy-c07a4170324b61fc51e38ec72d44b26a52fc326e.tar.bz2
meta-impy-c07a4170324b61fc51e38ec72d44b26a52fc326e.tar.xz
Added "code name" field for grid selections.
The code name is used to fetch the proper splash page. This decouples the user-visible label from the name expected by the SL web server.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewernetwork.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index e39507d..39ac879 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -72,6 +72,20 @@ public:
72 **/ 72 **/
73 std::string getGridLabel() const; 73 std::string getGridLabel() const;
74 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
75 std::string getKnownGridLabel(EGridInfo grid_index) const; 89 std::string getKnownGridLabel(EGridInfo grid_index) const;
76 90
77 void getLoginURIs(std::vector<std::string>& uris) const; 91 void getLoginURIs(std::vector<std::string>& uris) const;