diff options
author | Jacek Antonelli | 2009-09-10 02:31:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-09-10 02:35:58 -0500 |
commit | f57eabefa1291f4e047aa03416c9c544413b9f0e (patch) | |
tree | 25f1d75d05a8b00f3c2b7207731a9cfafdad9732 /linden/indra/newview/app_settings/default_grids.xml | |
parent | Merged 'armin/grid-manager5' into login-manager (diff) | |
download | meta-impy-f57eabefa1291f4e047aa03416c9c544413b9f0e.zip meta-impy-f57eabefa1291f4e047aa03416c9c544413b9f0e.tar.gz meta-impy-f57eabefa1291f4e047aa03416c9c544413b9f0e.tar.bz2 meta-impy-f57eabefa1291f4e047aa03416c9c544413b9f0e.tar.xz |
Fixed line endings on hippo and grid manager files.
Diffstat (limited to 'linden/indra/newview/app_settings/default_grids.xml')
-rw-r--r-- | linden/indra/newview/app_settings/default_grids.xml | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml index f4feb0c..dabcb0b 100644 --- a/linden/indra/newview/app_settings/default_grids.xml +++ b/linden/indra/newview/app_settings/default_grids.xml | |||
@@ -1,51 +1,51 @@ | |||
1 | <llsd> | 1 | <llsd> |
2 | <array> | 2 | <array> |
3 | 3 | ||
4 | <!-- | 4 | <!-- |
5 | This file contains fallback settings only. | 5 | This file contains fallback settings only. |
6 | The actual list of grids is loaded from a web server. | 6 | The actual list of grids is loaded from a web server. |
7 | --> | 7 | --> |
8 | 8 | ||
9 | <map> | 9 | <map> |
10 | <key>default_grids_version</key><string>0</string> | 10 | <key>default_grids_version</key><string>0</string> |
11 | </map> | 11 | </map> |
12 | 12 | ||
13 | <!-- OSGrid --> | 13 | <!-- OSGrid --> |
14 | <map> | 14 | <map> |
15 | <key>gridnick</key><string>osgrid</string> | 15 | <key>gridnick</key><string>osgrid</string> |
16 | <key>gridname</key><string>OSGrid</string> | 16 | <key>gridname</key><string>OSGrid</string> |
17 | <key>platform</key><string>OpenSim</string> | 17 | <key>platform</key><string>OpenSim</string> |
18 | <key>loginuri</key><string>http://osgrid.org:8002/</string> | 18 | <key>loginuri</key><string>http://osgrid.org:8002/</string> |
19 | <key>loginpage</key><string>http://osgrid.org/loginscreen.php</string> | 19 | <key>loginpage</key><string>http://osgrid.org/loginscreen.php</string> |
20 | <key>helperuri</key><string>http://osgrid.org/</string> | 20 | <key>helperuri</key><string>http://osgrid.org/</string> |
21 | <key>website</key><string>http://osgrid.org/</string> | 21 | <key>website</key><string>http://osgrid.org/</string> |
22 | <key>support</key><string>http://osgrid.org/</string> | 22 | <key>support</key><string>http://osgrid.org/</string> |
23 | <key>register</key><string>http://osgrid.org/index.php?page=create</string> | 23 | <key>register</key><string>http://osgrid.org/index.php?page=create</string> |
24 | <key>password</key><string>http://osgrid.org/index.php?page=change</string> | 24 | <key>password</key><string>http://osgrid.org/index.php?page=change</string> |
25 | </map> | 25 | </map> |
26 | 26 | ||
27 | <!-- Second Life --> | 27 | <!-- Second Life --> |
28 | <map> | 28 | <map> |
29 | <key>gridnick</key><string>secondlife</string> | 29 | <key>gridnick</key><string>secondlife</string> |
30 | <key>gridname</key><string>Second Life</string> | 30 | <key>gridname</key><string>Second Life</string> |
31 | <key>platform</key><string>SecondLife</string> | 31 | <key>platform</key><string>SecondLife</string> |
32 | <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string> | 32 | <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string> |
33 | <key>loginpage</key><string>http://secondlife.com/app/login/</string> | 33 | <key>loginpage</key><string>http://secondlife.com/app/login/</string> |
34 | <key>helperuri</key><string>https://secondlife.com/helpers/</string> | 34 | <key>helperuri</key><string>https://secondlife.com/helpers/</string> |
35 | <key>website</key><string>http://secondlife.com/</string> | 35 | <key>website</key><string>http://secondlife.com/</string> |
36 | <key>support</key><string>http://secondlife.com/support/</string> | 36 | <key>support</key><string>http://secondlife.com/support/</string> |
37 | <key>register</key><string>http://secondlife.com/registration/</string> | 37 | <key>register</key><string>http://secondlife.com/registration/</string> |
38 | <key>password</key><string>http://secondlife.com/account/request.php</string> | 38 | <key>password</key><string>http://secondlife.com/account/request.php</string> |
39 | </map> | 39 | </map> |
40 | 40 | ||
41 | <!-- Local Host --> | 41 | <!-- Local Host --> |
42 | <map> | 42 | <map> |
43 | <key>gridnick</key><string>local</string> | 43 | <key>gridnick</key><string>local</string> |
44 | <key>gridname</key><string>Local Host</string> | 44 | <key>gridname</key><string>Local Host</string> |
45 | <key>platform</key><string>OpenSim</string> | 45 | <key>platform</key><string>OpenSim</string> |
46 | <key>loginuri</key><string>http://127.0.0.1:9000/</string> | 46 | <key>loginuri</key><string>http://127.0.0.1:9000/</string> |
47 | <key>helperuri</key><string>http://127.0.0.1:9000/</string> | 47 | <key>helperuri</key><string>http://127.0.0.1:9000/</string> |
48 | </map> | 48 | </map> |
49 | 49 | ||
50 | </array> | 50 | </array> |
51 | </llsd> | 51 | </llsd> |