diff options
author | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
commit | a8a62201ba762e98dff92cf49033e577fc34d8d4 (patch) | |
tree | 11f8513c5cdc222f2fac0c93eb724c089803c200 /linden/indra/newview/llviewernetwork.h | |
parent | Second Life viewer sources 1.18.6.4-RC (diff) | |
download | meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.zip meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.gz meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.bz2 meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.xz |
Second Life viewer sources 1.19.0.0
Diffstat (limited to 'linden/indra/newview/llviewernetwork.h')
-rw-r--r-- | linden/indra/newview/llviewernetwork.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h index 034e4c6..87678f6 100644 --- a/linden/indra/newview/llviewernetwork.h +++ b/linden/indra/newview/llviewernetwork.h | |||
@@ -13,12 +13,12 @@ | |||
13 | * ("GPL"), unless you have obtained a separate licensing agreement | 13 | * ("GPL"), unless you have obtained a separate licensing agreement |
14 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 14 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
15 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 15 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
16 | * online at http://secondlife.com/developers/opensource/gplv2 | 16 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
17 | * | 17 | * |
18 | * There are special exceptions to the terms and conditions of the GPL as | 18 | * There are special exceptions to the terms and conditions of the GPL as |
19 | * it is applied to this Source Code. View the full text of the exception | 19 | * it is applied to this Source Code. View the full text of the exception |
20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
21 | * online at http://secondlife.com/developers/opensource/flossexception | 21 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
22 | * | 22 | * |
23 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
24 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -40,21 +40,20 @@ enum EGridInfo | |||
40 | GRID_INFO_NONE, | 40 | GRID_INFO_NONE, |
41 | GRID_INFO_ADITI, | 41 | GRID_INFO_ADITI, |
42 | GRID_INFO_AGNI, | 42 | GRID_INFO_AGNI, |
43 | GRID_INFO_DMZ, | 43 | GRID_INFO_ARUNA, |
44 | GRID_INFO_SIVA, | ||
45 | GRID_INFO_DURGA, | 44 | GRID_INFO_DURGA, |
46 | GRID_INFO_SHAKTI, | ||
47 | GRID_INFO_SOMA, | ||
48 | GRID_INFO_GANGA, | 45 | GRID_INFO_GANGA, |
49 | GRID_INFO_VAAK, | 46 | GRID_INFO_MITRA, |
50 | GRID_INFO_UMA, | ||
51 | GRID_INFO_MOHINI, | 47 | GRID_INFO_MOHINI, |
52 | GRID_INFO_YAMI, | ||
53 | GRID_INFO_NANDI, | 48 | GRID_INFO_NANDI, |
54 | GRID_INFO_MITRA, | ||
55 | GRID_INFO_RADHA, | 49 | GRID_INFO_RADHA, |
56 | GRID_INFO_RAVI, | 50 | GRID_INFO_RAVI, |
57 | GRID_INFO_ARUNA, | 51 | GRID_INFO_SIVA, |
52 | GRID_INFO_SHAKTI, | ||
53 | GRID_INFO_SOMA, | ||
54 | GRID_INFO_UMA, | ||
55 | GRID_INFO_VAAK, | ||
56 | GRID_INFO_YAMI, | ||
58 | GRID_INFO_LOCAL, | 57 | GRID_INFO_LOCAL, |
59 | GRID_INFO_OTHER, // IP address set via -user or other command line option | 58 | GRID_INFO_OTHER, // IP address set via -user or other command line option |
60 | GRID_INFO_COUNT | 59 | GRID_INFO_COUNT |