diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-01-18 19:42:28 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-01-18 19:42:28 +0000 |
| commit | 980d8c4599a7ebb62696126f3d5c5709a62f6a9f (patch) | |
| tree | a02ec78321990d7828673d41a1a086e5f0e71de9 /indra/newview/llviewernetwork.h | |
| parent | 3cb5c6864e0e19de30f3bba0f9fafd1ac695bfd1 (diff) | |
svn merge -r 77823:77835 svn+ssh://svn.lindenlab.com/svn/linden/branches/loginxui-for-merge
QAR-222
Diffstat (limited to 'indra/newview/llviewernetwork.h')
| -rw-r--r-- | indra/newview/llviewernetwork.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h index dbeaf2c1cd..4de73aae7a 100644 --- a/indra/newview/llviewernetwork.h +++ b/indra/newview/llviewernetwork.h @@ -40,21 +40,20 @@ enum EGridInfo GRID_INFO_NONE, GRID_INFO_ADITI, GRID_INFO_AGNI, - GRID_INFO_DMZ, - GRID_INFO_SIVA, + GRID_INFO_ARUNA, GRID_INFO_DURGA, - GRID_INFO_SHAKTI, - GRID_INFO_SOMA, GRID_INFO_GANGA, - GRID_INFO_VAAK, - GRID_INFO_UMA, + GRID_INFO_MITRA, GRID_INFO_MOHINI, - GRID_INFO_YAMI, GRID_INFO_NANDI, - GRID_INFO_MITRA, GRID_INFO_RADHA, GRID_INFO_RAVI, - GRID_INFO_ARUNA, + GRID_INFO_SIVA, + GRID_INFO_SHAKTI, + GRID_INFO_SOMA, + GRID_INFO_UMA, + GRID_INFO_VAAK, + GRID_INFO_YAMI, GRID_INFO_LOCAL, GRID_INFO_OTHER, // IP address set via -user or other command line option GRID_INFO_COUNT |