aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/CMakeLists.txt4
-rw-r--r--linden/indra/newview/app_settings/default_grids.xml19
2 files changed, 17 insertions, 6 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index cdc2a9a..fa306a5 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1251,19 +1251,15 @@ set(viewer_APPSETTINGS_FILES
1251 app_settings/cmd_line.xml 1251 app_settings/cmd_line.xml
1252 app_settings/default_grids.xml 1252 app_settings/default_grids.xml
1253 app_settings/grass.xml 1253 app_settings/grass.xml
1254# app_settings/high_graphics.xml
1255 app_settings/keys.ini 1254 app_settings/keys.ini
1256 app_settings/keywords.ini 1255 app_settings/keywords.ini
1257 app_settings/logcontrol.xml 1256 app_settings/logcontrol.xml
1258# app_settings/low_graphics.xml
1259# app_settings/mid_graphics.xml
1260 app_settings/settings.xml 1257 app_settings/settings.xml
1261 app_settings/settings_crash_behavior.xml 1258 app_settings/settings_crash_behavior.xml
1262 app_settings/settings_files.xml 1259 app_settings/settings_files.xml
1263 app_settings/settings_per_account.xml 1260 app_settings/settings_per_account.xml
1264 app_settings/std_bump.ini 1261 app_settings/std_bump.ini
1265 app_settings/trees.xml 1262 app_settings/trees.xml
1266# app_settings/ultra_graphics.xml
1267 app_settings/viewerart.xml 1263 app_settings/viewerart.xml
1268 ${CMAKE_SOURCE_DIR}/../etc/message.xml 1264 ${CMAKE_SOURCE_DIR}/../etc/message.xml
1269 ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg 1265 ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index bdb0029..8eaa0b2 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -34,14 +34,29 @@
34 <key>loginuri</key> <string>http://grid.infinitegrid.org:8002/</string> 34 <key>loginuri</key> <string>http://grid.infinitegrid.org:8002/</string>
35 <key>loginpage</key> <string>http://webfront.infinitegrid.org/loginscreen.php</string> 35 <key>loginpage</key> <string>http://webfront.infinitegrid.org/loginscreen.php</string>
36 <key>helperuri</key> <string>http://www.infinitegrid.org/helper/</string> 36 <key>helperuri</key> <string>http://www.infinitegrid.org/helper/</string>
37 <key>password</key> <string>http://webfront.infinitegrid.org//</string> 37 <key>password</key> <string>http://webfront.infinitegrid.org/</string>
38 <key>register</key> <string>http://webfront.infinitegrid.org//</string> 38 <key>register</key> <string>http://webfront.infinitegrid.org/</string>
39 <key>support</key> <string>http://www.infinitegrid.org/help</string> 39 <key>support</key> <string>http://www.infinitegrid.org/help</string>
40 <key>website</key> <string>http://www.infinitegrid.org/about/</string> 40 <key>website</key> <string>http://www.infinitegrid.org/about/</string>
41 <key>search</key> <string>http://webi.metaverseink.com/</string> 41 <key>search</key> <string>http://webi.metaverseink.com/</string>
42 <key>version</key> <string>0</string> 42 <key>version</key> <string>0</string>
43 </map> 43 </map>
44 44
45 <!-- Infinite Grid dev-->
46 <map>
47 <key>gridname</key> <string>Infinite Grid dev</string>
48 <key>gridnick</key> <string>infinitegriddev</string>
49 <key>platform</key> <string>OpenSim</string>
50 <key>loginuri</key> <string>http://grid.infinitegrid.org:8502/</string>
51 <key>loginpage</key> <string>http://www.infinitegrid.org/webdev/loginscreen.php</string>
52 <key>helperuri</key> <string>http://www.infinitegrid.org/webdev/helper/</string>
53 <key>password</key> <string>http://www.infinitegrid.org/webdev/</string>
54 <key>register</key> <string>http://www.infinitegrid.org/webdev/</string>
55 <key>support</key> <string>http://www.infinitegrid.org/webdev/help</string>
56 <key>website</key> <string>http://www.infinitegrid.org/webdev/about/</string>
57 <key>version</key> <string>0</string>
58 </map>
59
45 <!-- InWorldz --> 60 <!-- InWorldz -->
46 <map> 61 <map>
47 <key>gridname</key> <string>InWorldz</string> 62 <key>gridname</key> <string>InWorldz</string>