diff options
author | lbsa71 | 2007-10-30 17:13:30 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-30 17:13:30 +0000 |
commit | 90e7c59c11fdc0d0300441818470baa3c80fd7f1 (patch) | |
tree | 1926cece7071db2530fff07974d984f94b53aafe | |
parent | * Now the launcher actually WORKS. Yay. (diff) | |
download | opensim-SC-90e7c59c11fdc0d0300441818470baa3c80fd7f1.zip opensim-SC-90e7c59c11fdc0d0300441818470baa3c80fd7f1.tar.gz opensim-SC-90e7c59c11fdc0d0300441818470baa3c80fd7f1.tar.bz2 opensim-SC-90e7c59c11fdc0d0300441818470baa3c80fd7f1.tar.xz |
* Added OpenLifeGrid to Launcher
-rw-r--r-- | OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs index 5f4d55d..35fd58a 100644 --- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs +++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs | |||
@@ -166,9 +166,13 @@ namespace LaunchSLClient | |||
166 | { | 166 | { |
167 | MessageBox.Show("No OpenSim installed. Showing public grids only", "No OpenSim"); | 167 | MessageBox.Show("No OpenSim installed. Showing public grids only", "No OpenSim"); |
168 | } | 168 | } |
169 | menuItems.Add("DeepGrid - www.deepgrid.com"); | 169 | |
170 | menuItems.Add("OSGrid - www.osgrid.org"); | 170 | menuItems.Add("OSGrid - www.osgrid.org"); |
171 | menuItems.Add("Linden Labs - www.secondlife.com"); | 171 | menuItems.Add("DeepGrid - www.deepgrid.com"); |
172 | menuItems.Add("OpenlifeGrid - www.openlifegrid.com") | ||
173 | |||
174 | // We don't have a proper login uri for SL grid | ||
175 | // menuItems.Add("Linden Labs - www.secondlife.com"); | ||
172 | comboBox1.DataSource=menuItems; | 176 | comboBox1.DataSource=menuItems; |
173 | } | 177 | } |
174 | 178 | ||
@@ -185,6 +189,8 @@ namespace LaunchSLClient | |||
185 | if (comboBox1.Text == "DeepGrid - www.deepgrid.com") { runUrl = " -loginuri " + deepGridUrl; } | 189 | if (comboBox1.Text == "DeepGrid - www.deepgrid.com") { runUrl = " -loginuri " + deepGridUrl; } |
186 | if (comboBox1.Text == "OSGrid - www.osgrid.org") { runUrl = " -loginuri " + osGridUrl; } | 190 | if (comboBox1.Text == "OSGrid - www.osgrid.org") { runUrl = " -loginuri " + osGridUrl; } |
187 | if (comboBox1.Text == "Linden Labs - www.secondlife.com") { runUrl = ""; } | 191 | if (comboBox1.Text == "Linden Labs - www.secondlife.com") { runUrl = ""; } |
192 | if (comboBox1.Text == "OpenlifeGrid - www.openlifegrid.com") { runUrl = "http://logingrid.net:8002"; } | ||
193 | |||
188 | System.Diagnostics.Process proc = new System.Diagnostics.Process(); | 194 | System.Diagnostics.Process proc = new System.Diagnostics.Process(); |
189 | proc.StartInfo.FileName = runLine; | 195 | proc.StartInfo.FileName = runLine; |
190 | proc.StartInfo.Arguments = exeFlags.ToString() + " " + runUrl; | 196 | proc.StartInfo.Arguments = exeFlags.ToString() + " " + runUrl; |