diff options
Diffstat (limited to 'OpenSim/Tools')
-rw-r--r-- | OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs | 20 | ||||
-rw-r--r-- | OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs | 4 |
2 files changed, 6 insertions, 18 deletions
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs index b9e905a..38657b0 100644 --- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs +++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs | |||
@@ -58,25 +58,15 @@ namespace LaunchSLClient | |||
58 | this.comboBox1 = new System.Windows.Forms.ComboBox(); | 58 | this.comboBox1 = new System.Windows.Forms.ComboBox(); |
59 | this.textBox1 = new System.Windows.Forms.TextBox(); | 59 | this.textBox1 = new System.Windows.Forms.TextBox(); |
60 | this.SuspendLayout(); | 60 | this.SuspendLayout(); |
61 | // | 61 | |
62 | // comboBox1 | ||
63 | // | ||
64 | this.comboBox1.FormattingEnabled = true; | 62 | this.comboBox1.FormattingEnabled = true; |
65 | this.comboBox1.Items.AddRange(new object[] { | ||
66 | "Local Sandbox", | ||
67 | "Local Grid Server", | ||
68 | "DeepGrid - www.deepgrid.com", | ||
69 | "OSGrid - www.osgrid.org", | ||
70 | "Linden Labs - www.secondlife.com"}); | ||
71 | this.comboBox1.Location = new System.Drawing.Point(37, 83); | 63 | this.comboBox1.Location = new System.Drawing.Point(37, 83); |
72 | this.comboBox1.Name = "comboBox1"; | 64 | this.comboBox1.Name = "comboBox1"; |
73 | this.comboBox1.Size = new System.Drawing.Size(348, 21); | 65 | this.comboBox1.Size = new System.Drawing.Size(348, 21); |
74 | this.comboBox1.TabIndex = 0; | 66 | this.comboBox1.TabIndex = 0; |
75 | this.comboBox1.Text = "Choose from list"; | 67 | this.comboBox1.Text = "Choose from list"; |
76 | this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); | 68 | this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); |
77 | // | 69 | |
78 | // textBox1 | ||
79 | // | ||
80 | this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; | 70 | this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; |
81 | this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); | 71 | this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
82 | this.textBox1.Location = new System.Drawing.Point(37, 32); | 72 | this.textBox1.Location = new System.Drawing.Point(37, 32); |
@@ -84,10 +74,8 @@ namespace LaunchSLClient | |||
84 | this.textBox1.ReadOnly = true; | 74 | this.textBox1.ReadOnly = true; |
85 | this.textBox1.Size = new System.Drawing.Size(292, 19); | 75 | this.textBox1.Size = new System.Drawing.Size(292, 19); |
86 | this.textBox1.TabIndex = 1; | 76 | this.textBox1.TabIndex = 1; |
87 | this.textBox1.Text = "Choose from one of the following:"; | 77 | this.textBox1.Text = "Grid to connect to:"; |
88 | // | 78 | |
89 | // Form1 | ||
90 | // | ||
91 | this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); | 79 | this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); |
92 | this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; | 80 | this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
93 | this.ClientSize = new System.Drawing.Size(501, 339); | 81 | this.ClientSize = new System.Drawing.Size(501, 339); |
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs index a827c76..d53f919 100644 --- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs +++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs | |||
@@ -62,7 +62,7 @@ namespace LaunchSLClient | |||
62 | initializeGrids(); | 62 | initializeGrids(); |
63 | 63 | ||
64 | ArrayList menuItems = new ArrayList(); | 64 | ArrayList menuItems = new ArrayList(); |
65 | menuItems.Add("Please select one:"); | 65 | menuItems.Add(string.Empty); |
66 | 66 | ||
67 | addLocalSims(ref menuItems); | 67 | addLocalSims(ref menuItems); |
68 | 68 | ||
@@ -200,7 +200,7 @@ namespace LaunchSLClient | |||
200 | 200 | ||
201 | private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) | 201 | private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) |
202 | { | 202 | { |
203 | if (comboBox1.Text == "Please select one:") | 203 | if (comboBox1.Text == string.Empty) |
204 | { | 204 | { |
205 | return; | 205 | return; |
206 | } | 206 | } |