aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tools/OpenSim.GUI
diff options
context:
space:
mode:
authorSean Dague2007-09-17 12:52:03 +0000
committerSean Dague2007-09-17 12:52:03 +0000
commitb8d9737a47696952bedec33dface8f18df47341f (patch)
tree9279f45510f8a9285ac5b9c9165ab6c741009eac /OpenSim/Tools/OpenSim.GUI
parentI think this is the last bits for a consistant pristine (diff)
downloadopensim-SC-b8d9737a47696952bedec33dface8f18df47341f.zip
opensim-SC-b8d9737a47696952bedec33dface8f18df47341f.tar.gz
opensim-SC-b8d9737a47696952bedec33dface8f18df47341f.tar.bz2
opensim-SC-b8d9737a47696952bedec33dface8f18df47341f.tar.xz
fixing me some line endings
Diffstat (limited to 'OpenSim/Tools/OpenSim.GUI')
-rw-r--r--OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs176
-rw-r--r--OpenSim/Tools/OpenSim.GUI/Main.Designer.cs786
-rw-r--r--OpenSim/Tools/OpenSim.GUI/Main.cs482
-rw-r--r--OpenSim/Tools/OpenSim.GUI/ProcessManager.cs142
-rw-r--r--OpenSim/Tools/OpenSim.GUI/Program.cs38
-rw-r--r--OpenSim/Tools/OpenSim.GUI/Properties/AssemblyInfo.cs66
-rw-r--r--OpenSim/Tools/OpenSim.GUI/Properties/Resources.Designer.cs142
-rw-r--r--OpenSim/Tools/OpenSim.GUI/Properties/Settings.Designer.cs60
-rw-r--r--OpenSim/Tools/OpenSim.GUI/frmConfiguration.Designer.cs120
-rw-r--r--OpenSim/Tools/OpenSim.GUI/frmConfiguration.cs34
10 files changed, 1023 insertions, 1023 deletions
diff --git a/OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs b/OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs
index 91b3f60..47ff65a 100644
--- a/OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs
+++ b/OpenSim/Tools/OpenSim.GUI/InputTextBoxControl.cs
@@ -1,88 +1,88 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using System.Windows.Forms; 4using System.Windows.Forms;
5 5
6namespace OpenSim.GUI 6namespace OpenSim.GUI
7{ 7{
8 class InputTextBoxControl:System.Windows.Forms.TextBox 8 class InputTextBoxControl:System.Windows.Forms.TextBox
9 { 9 {
10 public InputTextBoxControl() 10 public InputTextBoxControl()
11 { 11 {
12 this.KeyDown += new System.Windows.Forms.KeyEventHandler(TextInputControl_KeyDown); 12 this.KeyDown += new System.Windows.Forms.KeyEventHandler(TextInputControl_KeyDown);
13 } 13 }
14 14
15 15
16 private List<string> CommandHistory = new List<string>(); 16 private List<string> CommandHistory = new List<string>();
17 private bool InHistory = false; 17 private bool InHistory = false;
18 private int HistoryPosition = -1; 18 private int HistoryPosition = -1;
19 19
20 void TextInputControl_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e) 20 void TextInputControl_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
21 { 21 {
22 22
23 23
24 if (e.KeyCode == Keys.Enter && InHistory == false) 24 if (e.KeyCode == Keys.Enter && InHistory == false)
25 { 25 {
26 CommandHistory.Add(this.Text); 26 CommandHistory.Add(this.Text);
27 } 27 }
28 28
29 29
30 if (e.KeyCode == Keys.Up || e.KeyCode == Keys.Down) 30 if (e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
31 { 31 {
32 // if not inside buffer, enter 32 // if not inside buffer, enter
33 // InBuffer = true 33 // InBuffer = true
34 //Console.WriteLine("History: Check"); 34 //Console.WriteLine("History: Check");
35 if (InHistory == false) 35 if (InHistory == false)
36 { 36 {
37 if (this.Text != "") 37 if (this.Text != "")
38 { 38 {
39 //Console.WriteLine("History: Add"); 39 //Console.WriteLine("History: Add");
40 CommandHistory.Add(this.Text); 40 CommandHistory.Add(this.Text);
41 HistoryPosition = CommandHistory.Count; 41 HistoryPosition = CommandHistory.Count;
42 } 42 }
43 else 43 else
44 { 44 {
45 //HistoryPosition = CommandHistory.Count + 1; 45 //HistoryPosition = CommandHistory.Count + 1;
46 } 46 }
47 //Console.WriteLine("History: InHistory"); 47 //Console.WriteLine("History: InHistory");
48 InHistory = true; 48 InHistory = true;
49 } 49 }
50 50
51 if (e.KeyCode == Keys.Up) 51 if (e.KeyCode == Keys.Up)
52 HistoryPosition -= 1; 52 HistoryPosition -= 1;
53 if (e.KeyCode == Keys.Down) 53 if (e.KeyCode == Keys.Down)
54 HistoryPosition += 1; 54 HistoryPosition += 1;
55 55
56 if (HistoryPosition > CommandHistory.Count - 1) 56 if (HistoryPosition > CommandHistory.Count - 1)
57 HistoryPosition = -1; 57 HistoryPosition = -1;
58 if (HistoryPosition < -1) 58 if (HistoryPosition < -1)
59 HistoryPosition = CommandHistory.Count - 1; 59 HistoryPosition = CommandHistory.Count - 1;
60 60
61 //Console.WriteLine("History: Pos: " + HistoryPosition); 61 //Console.WriteLine("History: Pos: " + HistoryPosition);
62 //Console.WriteLine("History: HaveInHistCount: " + CommandHistory.Count); 62 //Console.WriteLine("History: HaveInHistCount: " + CommandHistory.Count);
63 if (CommandHistory.Count != 0) 63 if (CommandHistory.Count != 0)
64 { 64 {
65 if (HistoryPosition != -1) 65 if (HistoryPosition != -1)
66 { 66 {
67 //Console.WriteLine("History: Getting"); 67 //Console.WriteLine("History: Getting");
68 //this.Text = CommandHistory.Item(HistoryPosition); 68 //this.Text = CommandHistory.Item(HistoryPosition);
69 this.Text = CommandHistory[HistoryPosition]; 69 this.Text = CommandHistory[HistoryPosition];
70 this.SelectionStart = this.Text.Length; 70 this.SelectionStart = this.Text.Length;
71 this.SelectionLength = 0; 71 this.SelectionLength = 0;
72 } 72 }
73 else 73 else
74 { 74 {
75 //Console.WriteLine("History: Nothing"); 75 //Console.WriteLine("History: Nothing");
76 this.Text = ""; 76 this.Text = "";
77 } 77 }
78 } 78 }
79 e.Handled = true; 79 e.Handled = true;
80 } else { 80 } else {
81 InHistory = false; 81 InHistory = false;
82 HistoryPosition = -1; 82 HistoryPosition = -1;
83 } 83 }
84 } 84 }
85 85
86 86
87 } 87 }
88} 88}
diff --git a/OpenSim/Tools/OpenSim.GUI/Main.Designer.cs b/OpenSim/Tools/OpenSim.GUI/Main.Designer.cs
index 6350c57..c08f26d 100644
--- a/OpenSim/Tools/OpenSim.GUI/Main.Designer.cs
+++ b/OpenSim/Tools/OpenSim.GUI/Main.Designer.cs
@@ -1,393 +1,393 @@
1namespace OpenSim.GUI 1namespace OpenSim.GUI
2{ 2{
3 partial class Main 3 partial class Main
4 { 4 {
5 /// <summary> 5 /// <summary>
6 /// Required designer variable. 6 /// Required designer variable.
7 /// </summary> 7 /// </summary>
8 private System.ComponentModel.IContainer components = null; 8 private System.ComponentModel.IContainer components = null;
9 9
10 /// <summary> 10 /// <summary>
11 /// Clean up any resources being used. 11 /// Clean up any resources being used.
12 /// </summary> 12 /// </summary>
13 /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> 13 /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
14 protected override void Dispose(bool disposing) 14 protected override void Dispose(bool disposing)
15 { 15 {
16 if (disposing && (components != null)) 16 if (disposing && (components != null))
17 { 17 {
18 components.Dispose(); 18 components.Dispose();
19 } 19 }
20 base.Dispose(disposing); 20 base.Dispose(disposing);
21 } 21 }
22 22
23 #region Windows Form Designer generated code 23 #region Windows Form Designer generated code
24 24
25 /// <summary> 25 /// <summary>
26 /// Required method for Designer support - do not modify 26 /// Required method for Designer support - do not modify
27 /// the contents of this method with the code editor. 27 /// the contents of this method with the code editor.
28 /// </summary> 28 /// </summary>
29 private void InitializeComponent() 29 private void InitializeComponent()
30 { 30 {
31 this.tabLogs = new System.Windows.Forms.TabControl(); 31 this.tabLogs = new System.Windows.Forms.TabControl();
32 this.tabMainLog = new System.Windows.Forms.TabPage(); 32 this.tabMainLog = new System.Windows.Forms.TabPage();
33 this.txtMainLog = new System.Windows.Forms.TextBox(); 33 this.txtMainLog = new System.Windows.Forms.TextBox();
34 this.tabRegionServer = new System.Windows.Forms.TabPage(); 34 this.tabRegionServer = new System.Windows.Forms.TabPage();
35 this.label1 = new System.Windows.Forms.Label(); 35 this.label1 = new System.Windows.Forms.Label();
36 this.txtInputRegionServer = new OpenSim.GUI.InputTextBoxControl(); 36 this.txtInputRegionServer = new OpenSim.GUI.InputTextBoxControl();
37 this.txtOpenSim = new System.Windows.Forms.TextBox(); 37 this.txtOpenSim = new System.Windows.Forms.TextBox();
38 this.tabUserServer = new System.Windows.Forms.TabPage(); 38 this.tabUserServer = new System.Windows.Forms.TabPage();
39 this.label2 = new System.Windows.Forms.Label(); 39 this.label2 = new System.Windows.Forms.Label();
40 this.txtInputUserServer = new OpenSim.GUI.InputTextBoxControl(); 40 this.txtInputUserServer = new OpenSim.GUI.InputTextBoxControl();
41 this.txtUserServer = new System.Windows.Forms.TextBox(); 41 this.txtUserServer = new System.Windows.Forms.TextBox();
42 this.tabAssetServer = new System.Windows.Forms.TabPage(); 42 this.tabAssetServer = new System.Windows.Forms.TabPage();
43 this.label3 = new System.Windows.Forms.Label(); 43 this.label3 = new System.Windows.Forms.Label();
44 this.txtInputAssetServer = new OpenSim.GUI.InputTextBoxControl(); 44 this.txtInputAssetServer = new OpenSim.GUI.InputTextBoxControl();
45 this.txtAssetServer = new System.Windows.Forms.TextBox(); 45 this.txtAssetServer = new System.Windows.Forms.TextBox();
46 this.tabGridServer = new System.Windows.Forms.TabPage(); 46 this.tabGridServer = new System.Windows.Forms.TabPage();
47 this.label4 = new System.Windows.Forms.Label(); 47 this.label4 = new System.Windows.Forms.Label();
48 this.txtInputGridServer = new OpenSim.GUI.InputTextBoxControl(); 48 this.txtInputGridServer = new OpenSim.GUI.InputTextBoxControl();
49 this.txtGridServer = new System.Windows.Forms.TextBox(); 49 this.txtGridServer = new System.Windows.Forms.TextBox();
50 this.gbLog = new System.Windows.Forms.GroupBox(); 50 this.gbLog = new System.Windows.Forms.GroupBox();
51 this.btnStart = new System.Windows.Forms.Button(); 51 this.btnStart = new System.Windows.Forms.Button();
52 this.btnStop = new System.Windows.Forms.Button(); 52 this.btnStop = new System.Windows.Forms.Button();
53 this.rbGridRegionMode = new System.Windows.Forms.RadioButton(); 53 this.rbGridRegionMode = new System.Windows.Forms.RadioButton();
54 this.rbStandAloneMode = new System.Windows.Forms.RadioButton(); 54 this.rbStandAloneMode = new System.Windows.Forms.RadioButton();
55 this.rbGridServer = new System.Windows.Forms.RadioButton(); 55 this.rbGridServer = new System.Windows.Forms.RadioButton();
56 this.tabLogs.SuspendLayout(); 56 this.tabLogs.SuspendLayout();
57 this.tabMainLog.SuspendLayout(); 57 this.tabMainLog.SuspendLayout();
58 this.tabRegionServer.SuspendLayout(); 58 this.tabRegionServer.SuspendLayout();
59 this.tabUserServer.SuspendLayout(); 59 this.tabUserServer.SuspendLayout();
60 this.tabAssetServer.SuspendLayout(); 60 this.tabAssetServer.SuspendLayout();
61 this.tabGridServer.SuspendLayout(); 61 this.tabGridServer.SuspendLayout();
62 this.gbLog.SuspendLayout(); 62 this.gbLog.SuspendLayout();
63 this.SuspendLayout(); 63 this.SuspendLayout();
64 // 64 //
65 // tabLogs 65 // tabLogs
66 // 66 //
67 this.tabLogs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 67 this.tabLogs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
68 | System.Windows.Forms.AnchorStyles.Left) 68 | System.Windows.Forms.AnchorStyles.Left)
69 | System.Windows.Forms.AnchorStyles.Right))); 69 | System.Windows.Forms.AnchorStyles.Right)));
70 this.tabLogs.Controls.Add(this.tabMainLog); 70 this.tabLogs.Controls.Add(this.tabMainLog);
71 this.tabLogs.Controls.Add(this.tabRegionServer); 71 this.tabLogs.Controls.Add(this.tabRegionServer);
72 this.tabLogs.Controls.Add(this.tabUserServer); 72 this.tabLogs.Controls.Add(this.tabUserServer);
73 this.tabLogs.Controls.Add(this.tabAssetServer); 73 this.tabLogs.Controls.Add(this.tabAssetServer);
74 this.tabLogs.Controls.Add(this.tabGridServer); 74 this.tabLogs.Controls.Add(this.tabGridServer);
75 this.tabLogs.Location = new System.Drawing.Point(6, 19); 75 this.tabLogs.Location = new System.Drawing.Point(6, 19);
76 this.tabLogs.Name = "tabLogs"; 76 this.tabLogs.Name = "tabLogs";
77 this.tabLogs.SelectedIndex = 0; 77 this.tabLogs.SelectedIndex = 0;
78 this.tabLogs.Size = new System.Drawing.Size(562, 230); 78 this.tabLogs.Size = new System.Drawing.Size(562, 230);
79 this.tabLogs.TabIndex = 0; 79 this.tabLogs.TabIndex = 0;
80 // 80 //
81 // tabMainLog 81 // tabMainLog
82 // 82 //
83 this.tabMainLog.Controls.Add(this.txtMainLog); 83 this.tabMainLog.Controls.Add(this.txtMainLog);
84 this.tabMainLog.Location = new System.Drawing.Point(4, 22); 84 this.tabMainLog.Location = new System.Drawing.Point(4, 22);
85 this.tabMainLog.Name = "tabMainLog"; 85 this.tabMainLog.Name = "tabMainLog";
86 this.tabMainLog.Size = new System.Drawing.Size(554, 204); 86 this.tabMainLog.Size = new System.Drawing.Size(554, 204);
87 this.tabMainLog.TabIndex = 4; 87 this.tabMainLog.TabIndex = 4;
88 this.tabMainLog.Text = "Main log"; 88 this.tabMainLog.Text = "Main log";
89 this.tabMainLog.UseVisualStyleBackColor = true; 89 this.tabMainLog.UseVisualStyleBackColor = true;
90 // 90 //
91 // txtMainLog 91 // txtMainLog
92 // 92 //
93 this.txtMainLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 93 this.txtMainLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
94 | System.Windows.Forms.AnchorStyles.Left) 94 | System.Windows.Forms.AnchorStyles.Left)
95 | System.Windows.Forms.AnchorStyles.Right))); 95 | System.Windows.Forms.AnchorStyles.Right)));
96 this.txtMainLog.Location = new System.Drawing.Point(6, 5); 96 this.txtMainLog.Location = new System.Drawing.Point(6, 5);
97 this.txtMainLog.Multiline = true; 97 this.txtMainLog.Multiline = true;
98 this.txtMainLog.Name = "txtMainLog"; 98 this.txtMainLog.Name = "txtMainLog";
99 this.txtMainLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; 99 this.txtMainLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
100 this.txtMainLog.Size = new System.Drawing.Size(542, 195); 100 this.txtMainLog.Size = new System.Drawing.Size(542, 195);
101 this.txtMainLog.TabIndex = 1; 101 this.txtMainLog.TabIndex = 1;
102 // 102 //
103 // tabRegionServer 103 // tabRegionServer
104 // 104 //
105 this.tabRegionServer.Controls.Add(this.label1); 105 this.tabRegionServer.Controls.Add(this.label1);
106 this.tabRegionServer.Controls.Add(this.txtInputRegionServer); 106 this.tabRegionServer.Controls.Add(this.txtInputRegionServer);
107 this.tabRegionServer.Controls.Add(this.txtOpenSim); 107 this.tabRegionServer.Controls.Add(this.txtOpenSim);
108 this.tabRegionServer.Location = new System.Drawing.Point(4, 22); 108 this.tabRegionServer.Location = new System.Drawing.Point(4, 22);
109 this.tabRegionServer.Name = "tabRegionServer"; 109 this.tabRegionServer.Name = "tabRegionServer";
110 this.tabRegionServer.Padding = new System.Windows.Forms.Padding(3); 110 this.tabRegionServer.Padding = new System.Windows.Forms.Padding(3);
111 this.tabRegionServer.Size = new System.Drawing.Size(554, 204); 111 this.tabRegionServer.Size = new System.Drawing.Size(554, 204);
112 this.tabRegionServer.TabIndex = 0; 112 this.tabRegionServer.TabIndex = 0;
113 this.tabRegionServer.Text = "Region server"; 113 this.tabRegionServer.Text = "Region server";
114 this.tabRegionServer.UseVisualStyleBackColor = true; 114 this.tabRegionServer.UseVisualStyleBackColor = true;
115 // 115 //
116 // label1 116 // label1
117 // 117 //
118 this.label1.AutoSize = true; 118 this.label1.AutoSize = true;
119 this.label1.Location = new System.Drawing.Point(6, 183); 119 this.label1.Location = new System.Drawing.Point(6, 183);
120 this.label1.Name = "label1"; 120 this.label1.Name = "label1";
121 this.label1.Size = new System.Drawing.Size(57, 13); 121 this.label1.Size = new System.Drawing.Size(57, 13);
122 this.label1.TabIndex = 4; 122 this.label1.TabIndex = 4;
123 this.label1.Text = "Command:"; 123 this.label1.Text = "Command:";
124 // 124 //
125 // txtInputRegionServer 125 // txtInputRegionServer
126 // 126 //
127 this.txtInputRegionServer.Location = new System.Drawing.Point(69, 180); 127 this.txtInputRegionServer.Location = new System.Drawing.Point(69, 180);
128 this.txtInputRegionServer.Name = "txtInputRegionServer"; 128 this.txtInputRegionServer.Name = "txtInputRegionServer";
129 this.txtInputRegionServer.Size = new System.Drawing.Size(479, 20); 129 this.txtInputRegionServer.Size = new System.Drawing.Size(479, 20);
130 this.txtInputRegionServer.TabIndex = 0; 130 this.txtInputRegionServer.TabIndex = 0;
131 // 131 //
132 // txtOpenSim 132 // txtOpenSim
133 // 133 //
134 this.txtOpenSim.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 134 this.txtOpenSim.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
135 | System.Windows.Forms.AnchorStyles.Left) 135 | System.Windows.Forms.AnchorStyles.Left)
136 | System.Windows.Forms.AnchorStyles.Right))); 136 | System.Windows.Forms.AnchorStyles.Right)));
137 this.txtOpenSim.Location = new System.Drawing.Point(6, 6); 137 this.txtOpenSim.Location = new System.Drawing.Point(6, 6);
138 this.txtOpenSim.Multiline = true; 138 this.txtOpenSim.Multiline = true;
139 this.txtOpenSim.Name = "txtOpenSim"; 139 this.txtOpenSim.Name = "txtOpenSim";
140 this.txtOpenSim.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; 140 this.txtOpenSim.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
141 this.txtOpenSim.Size = new System.Drawing.Size(542, 168); 141 this.txtOpenSim.Size = new System.Drawing.Size(542, 168);
142 this.txtOpenSim.TabIndex = 0; 142 this.txtOpenSim.TabIndex = 0;
143 // 143 //
144 // tabUserServer 144 // tabUserServer
145 // 145 //
146 this.tabUserServer.Controls.Add(this.label2); 146 this.tabUserServer.Controls.Add(this.label2);
147 this.tabUserServer.Controls.Add(this.txtInputUserServer); 147 this.tabUserServer.Controls.Add(this.txtInputUserServer);
148 this.tabUserServer.Controls.Add(this.txtUserServer); 148 this.tabUserServer.Controls.Add(this.txtUserServer);
149 this.tabUserServer.Location = new System.Drawing.Point(4, 22); 149 this.tabUserServer.Location = new System.Drawing.Point(4, 22);
150 this.tabUserServer.Name = "tabUserServer"; 150 this.tabUserServer.Name = "tabUserServer";
151 this.tabUserServer.Padding = new System.Windows.Forms.Padding(3); 151 this.tabUserServer.Padding = new System.Windows.Forms.Padding(3);
152 this.tabUserServer.Size = new System.Drawing.Size(554, 204); 152 this.tabUserServer.Size = new System.Drawing.Size(554, 204);
153 this.tabUserServer.TabIndex = 1; 153 this.tabUserServer.TabIndex = 1;
154 this.tabUserServer.Text = "User server"; 154 this.tabUserServer.Text = "User server";
155 this.tabUserServer.UseVisualStyleBackColor = true; 155 this.tabUserServer.UseVisualStyleBackColor = true;
156 // 156 //
157 // label2 157 // label2
158 // 158 //
159 this.label2.AutoSize = true; 159 this.label2.AutoSize = true;
160 this.label2.Location = new System.Drawing.Point(6, 181); 160 this.label2.Location = new System.Drawing.Point(6, 181);
161 this.label2.Name = "label2"; 161 this.label2.Name = "label2";
162 this.label2.Size = new System.Drawing.Size(57, 13); 162 this.label2.Size = new System.Drawing.Size(57, 13);
163 this.label2.TabIndex = 6; 163 this.label2.TabIndex = 6;
164 this.label2.Text = "Command:"; 164 this.label2.Text = "Command:";
165 // 165 //
166 // txtInputUserServer 166 // txtInputUserServer
167 // 167 //
168 this.txtInputUserServer.Location = new System.Drawing.Point(69, 178); 168 this.txtInputUserServer.Location = new System.Drawing.Point(69, 178);
169 this.txtInputUserServer.Name = "txtInputUserServer"; 169 this.txtInputUserServer.Name = "txtInputUserServer";
170 this.txtInputUserServer.Size = new System.Drawing.Size(479, 20); 170 this.txtInputUserServer.Size = new System.Drawing.Size(479, 20);
171 this.txtInputUserServer.TabIndex = 5; 171 this.txtInputUserServer.TabIndex = 5;
172 // 172 //
173 // txtUserServer 173 // txtUserServer
174 // 174 //
175 this.txtUserServer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 175 this.txtUserServer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
176 | System.Windows.Forms.AnchorStyles.Left) 176 | System.Windows.Forms.AnchorStyles.Left)
177 | System.Windows.Forms.AnchorStyles.Right))); 177 | System.Windows.Forms.AnchorStyles.Right)));
178 this.txtUserServer.Location = new System.Drawing.Point(6, 5); 178 this.txtUserServer.Location = new System.Drawing.Point(6, 5);
179 this.txtUserServer.Multiline = true; 179 this.txtUserServer.Multiline = true;
180 this.txtUserServer.Name = "txtUserServer"; 180 this.txtUserServer.Name = "txtUserServer";
181 this.txtUserServer.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; 181 this.txtUserServer.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
182 this.txtUserServer.Size = new System.Drawing.Size(542, 168); 182 this.txtUserServer.Size = new System.Drawing.Size(542, 168);
183 this.txtUserServer.TabIndex = 1; 183 this.txtUserServer.TabIndex = 1;
184 // 184 //
185 // tabAssetServer 185 // tabAssetServer
186 // 186 //
187 this.tabAssetServer.Controls.Add(this.label3); 187 this.tabAssetServer.Controls.Add(this.label3);
188 this.tabAssetServer.Controls.Add(this.txtInputAssetServer); 188 this.tabAssetServer.Controls.Add(this.txtInputAssetServer);
189 this.tabAssetServer.Controls.Add(this.txtAssetServer); 189 this.tabAssetServer.Controls.Add(this.txtAssetServer);
190 this.tabAssetServer.Location = new System.Drawing.Point(4, 22); 190 this.tabAssetServer.Location = new System.Drawing.Point(4, 22);
191 this.tabAssetServer.Name = "tabAssetServer"; 191 this.tabAssetServer.Name = "tabAssetServer";
192 this.tabAssetServer.Size = new System.Drawing.Size(554, 204); 192 this.tabAssetServer.Size = new System.Drawing.Size(554, 204);
193 this.tabAssetServer.TabIndex = 2; 193 this.tabAssetServer.TabIndex = 2;
194 this.tabAssetServer.Text = "Asset server"; 194 this.tabAssetServer.Text = "Asset server";
195 this.tabAssetServer.UseVisualStyleBackColor = true; 195 this.tabAssetServer.UseVisualStyleBackColor = true;
196 // 196 //
197 // label3 197 // label3
198 // 198 //
199 this.label3.AutoSize = true; 199 this.label3.AutoSize = true;
200 this.label3.Location = new System.Drawing.Point(6, 182); 200 this.label3.Location = new System.Drawing.Point(6, 182);
201 this.label3.Name = "label3"; 201 this.label3.Name = "label3";
202 this.label3.Size = new System.Drawing.Size(57, 13); 202 this.label3.Size = new System.Drawing.Size(57, 13);
203 this.label3.TabIndex = 6; 203 this.label3.TabIndex = 6;
204 this.label3.Text = "Command:"; 204 this.label3.Text = "Command:";
205 // 205 //
206 // txtInputAssetServer 206 // txtInputAssetServer
207 // 207 //
208 this.txtInputAssetServer.Location = new System.Drawing.Point(69, 179); 208 this.txtInputAssetServer.Location = new System.Drawing.Point(69, 179);
209 this.txtInputAssetServer.Name = "txtInputAssetServer"; 209 this.txtInputAssetServer.Name = "txtInputAssetServer";
210 this.txtInputAssetServer.Size = new System.Drawing.Size(479, 20); 210 this.txtInputAssetServer.Size = new System.Drawing.Size(479, 20);
211 this.txtInputAssetServer.TabIndex = 5; 211 this.txtInputAssetServer.TabIndex = 5;
212 // 212 //
213 // txtAssetServer 213 // txtAssetServer
214 // 214 //
215 this.txtAssetServer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 215 this.txtAssetServer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
216 | System.Windows.Forms.AnchorStyles.Left) 216 | System.Windows.Forms.AnchorStyles.Left)
217 | System.Windows.Forms.AnchorStyles.Right))); 217 | System.Windows.Forms.AnchorStyles.Right)));
218 this.txtAssetServer.Location = new System.Drawing.Point(6, 5); 218 this.txtAssetServer.Location = new System.Drawing.Point(6, 5);
219 this.txtAssetServer.Multiline = true; 219 this.txtAssetServer.Multiline = true;
220 this.txtAssetServer.Name = "txtAssetServer"; 220 this.txtAssetServer.Name = "txtAssetServer";
221 this.txtAssetServer.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; 221 this.txtAssetServer.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
222 this.txtAssetServer.Size = new System.Drawing.Size(542, 168); 222 this.txtAssetServer.Size = new System.Drawing.Size(542, 168);
223 this.txtAssetServer.TabIndex = 1; 223 this.txtAssetServer.TabIndex = 1;
224 // 224 //
225 // tabGridServer 225 // tabGridServer
226 // 226 //
227 this.tabGridServer.Controls.Add(this.label4); 227 this.tabGridServer.Controls.Add(this.label4);
228 this.tabGridServer.Controls.Add(this.txtInputGridServer); 228 this.tabGridServer.Controls.Add(this.txtInputGridServer);
229 this.tabGridServer.Controls.Add(this.txtGridServer); 229 this.tabGridServer.Controls.Add(this.txtGridServer);
230 this.tabGridServer.Location = new System.Drawing.Point(4, 22); 230 this.tabGridServer.Location = new System.Drawing.Point(4, 22);
231 this.tabGridServer.Name = "tabGridServer"; 231 this.tabGridServer.Name = "tabGridServer";
232 this.tabGridServer.Size = new System.Drawing.Size(554, 204); 232 this.tabGridServer.Size = new System.Drawing.Size(554, 204);
233 this.tabGridServer.TabIndex = 3; 233 this.tabGridServer.TabIndex = 3;
234 this.tabGridServer.Text = "Grid server"; 234 this.tabGridServer.Text = "Grid server";
235 this.tabGridServer.UseVisualStyleBackColor = true; 235 this.tabGridServer.UseVisualStyleBackColor = true;
236 // 236 //
237 // label4 237 // label4
238 // 238 //
239 this.label4.AutoSize = true; 239 this.label4.AutoSize = true;
240 this.label4.Location = new System.Drawing.Point(6, 182); 240 this.label4.Location = new System.Drawing.Point(6, 182);
241 this.label4.Name = "label4"; 241 this.label4.Name = "label4";
242 this.label4.Size = new System.Drawing.Size(57, 13); 242 this.label4.Size = new System.Drawing.Size(57, 13);
243 this.label4.TabIndex = 6; 243 this.label4.TabIndex = 6;
244 this.label4.Text = "Command:"; 244 this.label4.Text = "Command:";
245 // 245 //
246 // txtInputGridServer 246 // txtInputGridServer
247 // 247 //
248 this.txtInputGridServer.Location = new System.Drawing.Point(69, 179); 248 this.txtInputGridServer.Location = new System.Drawing.Point(69, 179);
249 this.txtInputGridServer.Name = "txtInputGridServer"; 249 this.txtInputGridServer.Name = "txtInputGridServer";
250 this.txtInputGridServer.Size = new System.Drawing.Size(479, 20); 250 this.txtInputGridServer.Size = new System.Drawing.Size(479, 20);
251 this.txtInputGridServer.TabIndex = 5; 251 this.txtInputGridServer.TabIndex = 5;
252 // 252 //
253 // txtGridServer 253 // txtGridServer
254 // 254 //
255 this.txtGridServer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 255 this.txtGridServer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
256 | System.Windows.Forms.AnchorStyles.Left) 256 | System.Windows.Forms.AnchorStyles.Left)
257 | System.Windows.Forms.AnchorStyles.Right))); 257 | System.Windows.Forms.AnchorStyles.Right)));
258 this.txtGridServer.Location = new System.Drawing.Point(6, 5); 258 this.txtGridServer.Location = new System.Drawing.Point(6, 5);
259 this.txtGridServer.Multiline = true; 259 this.txtGridServer.Multiline = true;
260 this.txtGridServer.Name = "txtGridServer"; 260 this.txtGridServer.Name = "txtGridServer";
261 this.txtGridServer.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; 261 this.txtGridServer.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
262 this.txtGridServer.Size = new System.Drawing.Size(542, 168); 262 this.txtGridServer.Size = new System.Drawing.Size(542, 168);
263 this.txtGridServer.TabIndex = 1; 263 this.txtGridServer.TabIndex = 1;
264 // 264 //
265 // gbLog 265 // gbLog
266 // 266 //
267 this.gbLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 267 this.gbLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
268 | System.Windows.Forms.AnchorStyles.Left) 268 | System.Windows.Forms.AnchorStyles.Left)
269 | System.Windows.Forms.AnchorStyles.Right))); 269 | System.Windows.Forms.AnchorStyles.Right)));
270 this.gbLog.Controls.Add(this.tabLogs); 270 this.gbLog.Controls.Add(this.tabLogs);
271 this.gbLog.Location = new System.Drawing.Point(2, 41); 271 this.gbLog.Location = new System.Drawing.Point(2, 41);
272 this.gbLog.Name = "gbLog"; 272 this.gbLog.Name = "gbLog";
273 this.gbLog.Size = new System.Drawing.Size(574, 255); 273 this.gbLog.Size = new System.Drawing.Size(574, 255);
274 this.gbLog.TabIndex = 1; 274 this.gbLog.TabIndex = 1;
275 this.gbLog.TabStop = false; 275 this.gbLog.TabStop = false;
276 this.gbLog.Text = "Logs"; 276 this.gbLog.Text = "Logs";
277 // 277 //
278 // btnStart 278 // btnStart
279 // 279 //
280 this.btnStart.Location = new System.Drawing.Point(8, 12); 280 this.btnStart.Location = new System.Drawing.Point(8, 12);
281 this.btnStart.Name = "btnStart"; 281 this.btnStart.Name = "btnStart";
282 this.btnStart.Size = new System.Drawing.Size(75, 23); 282 this.btnStart.Size = new System.Drawing.Size(75, 23);
283 this.btnStart.TabIndex = 2; 283 this.btnStart.TabIndex = 2;
284 this.btnStart.Text = "Start"; 284 this.btnStart.Text = "Start";
285 this.btnStart.UseVisualStyleBackColor = true; 285 this.btnStart.UseVisualStyleBackColor = true;
286 this.btnStart.Click += new System.EventHandler(this.btnStart_Click); 286 this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
287 // 287 //
288 // btnStop 288 // btnStop
289 // 289 //
290 this.btnStop.Location = new System.Drawing.Point(89, 12); 290 this.btnStop.Location = new System.Drawing.Point(89, 12);
291 this.btnStop.Name = "btnStop"; 291 this.btnStop.Name = "btnStop";
292 this.btnStop.Size = new System.Drawing.Size(75, 23); 292 this.btnStop.Size = new System.Drawing.Size(75, 23);
293 this.btnStop.TabIndex = 3; 293 this.btnStop.TabIndex = 3;
294 this.btnStop.Text = "Stop"; 294 this.btnStop.Text = "Stop";
295 this.btnStop.UseVisualStyleBackColor = true; 295 this.btnStop.UseVisualStyleBackColor = true;
296 this.btnStop.Click += new System.EventHandler(this.btnStop_Click); 296 this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
297 // 297 //
298 // rbGridRegionMode 298 // rbGridRegionMode
299 // 299 //
300 this.rbGridRegionMode.AutoSize = true; 300 this.rbGridRegionMode.AutoSize = true;
301 this.rbGridRegionMode.Location = new System.Drawing.Point(407, 18); 301 this.rbGridRegionMode.Location = new System.Drawing.Point(407, 18);
302 this.rbGridRegionMode.Name = "rbGridRegionMode"; 302 this.rbGridRegionMode.Name = "rbGridRegionMode";
303 this.rbGridRegionMode.Size = new System.Drawing.Size(76, 17); 303 this.rbGridRegionMode.Size = new System.Drawing.Size(76, 17);
304 this.rbGridRegionMode.TabIndex = 4; 304 this.rbGridRegionMode.TabIndex = 4;
305 this.rbGridRegionMode.Text = "Grid region"; 305 this.rbGridRegionMode.Text = "Grid region";
306 this.rbGridRegionMode.UseVisualStyleBackColor = true; 306 this.rbGridRegionMode.UseVisualStyleBackColor = true;
307 this.rbGridRegionMode.CheckedChanged += new System.EventHandler(this.rbGridRegionMode_CheckedChanged); 307 this.rbGridRegionMode.CheckedChanged += new System.EventHandler(this.rbGridRegionMode_CheckedChanged);
308 // 308 //
309 // rbStandAloneMode 309 // rbStandAloneMode
310 // 310 //
311 this.rbStandAloneMode.AutoSize = true; 311 this.rbStandAloneMode.AutoSize = true;
312 this.rbStandAloneMode.Checked = true; 312 this.rbStandAloneMode.Checked = true;
313 this.rbStandAloneMode.Location = new System.Drawing.Point(319, 18); 313 this.rbStandAloneMode.Location = new System.Drawing.Point(319, 18);
314 this.rbStandAloneMode.Name = "rbStandAloneMode"; 314 this.rbStandAloneMode.Name = "rbStandAloneMode";
315 this.rbStandAloneMode.Size = new System.Drawing.Size(82, 17); 315 this.rbStandAloneMode.Size = new System.Drawing.Size(82, 17);
316 this.rbStandAloneMode.TabIndex = 5; 316 this.rbStandAloneMode.TabIndex = 5;
317 this.rbStandAloneMode.TabStop = true; 317 this.rbStandAloneMode.TabStop = true;
318 this.rbStandAloneMode.Text = "Stand alone"; 318 this.rbStandAloneMode.Text = "Stand alone";
319 this.rbStandAloneMode.UseVisualStyleBackColor = true; 319 this.rbStandAloneMode.UseVisualStyleBackColor = true;
320 this.rbStandAloneMode.CheckedChanged += new System.EventHandler(this.rbStandAloneMode_CheckedChanged); 320 this.rbStandAloneMode.CheckedChanged += new System.EventHandler(this.rbStandAloneMode_CheckedChanged);
321 // 321 //
322 // rbGridServer 322 // rbGridServer
323 // 323 //
324 this.rbGridServer.AutoSize = true; 324 this.rbGridServer.AutoSize = true;
325 this.rbGridServer.Location = new System.Drawing.Point(484, 18); 325 this.rbGridServer.Location = new System.Drawing.Point(484, 18);
326 this.rbGridServer.Name = "rbGridServer"; 326 this.rbGridServer.Name = "rbGridServer";
327 this.rbGridServer.Size = new System.Drawing.Size(76, 17); 327 this.rbGridServer.Size = new System.Drawing.Size(76, 17);
328 this.rbGridServer.TabIndex = 6; 328 this.rbGridServer.TabIndex = 6;
329 this.rbGridServer.Text = "Grid server"; 329 this.rbGridServer.Text = "Grid server";
330 this.rbGridServer.UseVisualStyleBackColor = true; 330 this.rbGridServer.UseVisualStyleBackColor = true;
331 this.rbGridServer.CheckedChanged += new System.EventHandler(this.rbGridServer_CheckedChanged); 331 this.rbGridServer.CheckedChanged += new System.EventHandler(this.rbGridServer_CheckedChanged);
332 // 332 //
333 // Main 333 // Main
334 // 334 //
335 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 335 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
336 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 336 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
337 this.ClientSize = new System.Drawing.Size(583, 299); 337 this.ClientSize = new System.Drawing.Size(583, 299);
338 this.Controls.Add(this.rbGridServer); 338 this.Controls.Add(this.rbGridServer);
339 this.Controls.Add(this.rbStandAloneMode); 339 this.Controls.Add(this.rbStandAloneMode);
340 this.Controls.Add(this.rbGridRegionMode); 340 this.Controls.Add(this.rbGridRegionMode);
341 this.Controls.Add(this.btnStop); 341 this.Controls.Add(this.btnStop);
342 this.Controls.Add(this.btnStart); 342 this.Controls.Add(this.btnStart);
343 this.Controls.Add(this.gbLog); 343 this.Controls.Add(this.gbLog);
344 this.Name = "Main"; 344 this.Name = "Main";
345 this.Text = "OpenSim"; 345 this.Text = "OpenSim";
346 this.Load += new System.EventHandler(this.Main_Load); 346 this.Load += new System.EventHandler(this.Main_Load);
347 this.tabLogs.ResumeLayout(false); 347 this.tabLogs.ResumeLayout(false);
348 this.tabMainLog.ResumeLayout(false); 348 this.tabMainLog.ResumeLayout(false);
349 this.tabMainLog.PerformLayout(); 349 this.tabMainLog.PerformLayout();
350 this.tabRegionServer.ResumeLayout(false); 350 this.tabRegionServer.ResumeLayout(false);
351 this.tabRegionServer.PerformLayout(); 351 this.tabRegionServer.PerformLayout();
352 this.tabUserServer.ResumeLayout(false); 352 this.tabUserServer.ResumeLayout(false);
353 this.tabUserServer.PerformLayout(); 353 this.tabUserServer.PerformLayout();
354 this.tabAssetServer.ResumeLayout(false); 354 this.tabAssetServer.ResumeLayout(false);
355 this.tabAssetServer.PerformLayout(); 355 this.tabAssetServer.PerformLayout();
356 this.tabGridServer.ResumeLayout(false); 356 this.tabGridServer.ResumeLayout(false);
357 this.tabGridServer.PerformLayout(); 357 this.tabGridServer.PerformLayout();
358 this.gbLog.ResumeLayout(false); 358 this.gbLog.ResumeLayout(false);
359 this.ResumeLayout(false); 359 this.ResumeLayout(false);
360 this.PerformLayout(); 360 this.PerformLayout();
361 361
362 } 362 }
363 363
364 #endregion 364 #endregion
365 365
366 private System.Windows.Forms.TabControl tabLogs; 366 private System.Windows.Forms.TabControl tabLogs;
367 private System.Windows.Forms.TabPage tabRegionServer; 367 private System.Windows.Forms.TabPage tabRegionServer;
368 private System.Windows.Forms.TabPage tabUserServer; 368 private System.Windows.Forms.TabPage tabUserServer;
369 private System.Windows.Forms.GroupBox gbLog; 369 private System.Windows.Forms.GroupBox gbLog;
370 private System.Windows.Forms.TextBox txtOpenSim; 370 private System.Windows.Forms.TextBox txtOpenSim;
371 private System.Windows.Forms.TextBox txtUserServer; 371 private System.Windows.Forms.TextBox txtUserServer;
372 private System.Windows.Forms.TabPage tabAssetServer; 372 private System.Windows.Forms.TabPage tabAssetServer;
373 private System.Windows.Forms.TextBox txtAssetServer; 373 private System.Windows.Forms.TextBox txtAssetServer;
374 private System.Windows.Forms.TabPage tabGridServer; 374 private System.Windows.Forms.TabPage tabGridServer;
375 private System.Windows.Forms.TextBox txtGridServer; 375 private System.Windows.Forms.TextBox txtGridServer;
376 private System.Windows.Forms.TabPage tabMainLog; 376 private System.Windows.Forms.TabPage tabMainLog;
377 private System.Windows.Forms.Button btnStart; 377 private System.Windows.Forms.Button btnStart;
378 private System.Windows.Forms.Button btnStop; 378 private System.Windows.Forms.Button btnStop;
379 private System.Windows.Forms.TextBox txtMainLog; 379 private System.Windows.Forms.TextBox txtMainLog;
380 private System.Windows.Forms.Label label1; 380 private System.Windows.Forms.Label label1;
381 private System.Windows.Forms.Label label2; 381 private System.Windows.Forms.Label label2;
382 private System.Windows.Forms.Label label3; 382 private System.Windows.Forms.Label label3;
383 private System.Windows.Forms.Label label4; 383 private System.Windows.Forms.Label label4;
384 private InputTextBoxControl txtInputRegionServer; 384 private InputTextBoxControl txtInputRegionServer;
385 private InputTextBoxControl txtInputUserServer; 385 private InputTextBoxControl txtInputUserServer;
386 private InputTextBoxControl txtInputAssetServer; 386 private InputTextBoxControl txtInputAssetServer;
387 private InputTextBoxControl txtInputGridServer; 387 private InputTextBoxControl txtInputGridServer;
388 private System.Windows.Forms.RadioButton rbGridRegionMode; 388 private System.Windows.Forms.RadioButton rbGridRegionMode;
389 private System.Windows.Forms.RadioButton rbStandAloneMode; 389 private System.Windows.Forms.RadioButton rbStandAloneMode;
390 private System.Windows.Forms.RadioButton rbGridServer; 390 private System.Windows.Forms.RadioButton rbGridServer;
391 } 391 }
392} 392}
393 393
diff --git a/OpenSim/Tools/OpenSim.GUI/Main.cs b/OpenSim/Tools/OpenSim.GUI/Main.cs
index 0b5af28..5de4af4 100644
--- a/OpenSim/Tools/OpenSim.GUI/Main.cs
+++ b/OpenSim/Tools/OpenSim.GUI/Main.cs
@@ -1,242 +1,242 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.ComponentModel; 3using System.ComponentModel;
4using System.Data; 4using System.Data;
5using System.Drawing; 5using System.Drawing;
6using System.Text; 6using System.Text;
7using System.Windows.Forms; 7using System.Windows.Forms;
8 8
9namespace OpenSim.GUI 9namespace OpenSim.GUI
10{ 10{
11 public partial class Main : Form 11 public partial class Main : Form
12 { 12 {
13 13
14 public ProcessManager proc_OpenSim; 14 public ProcessManager proc_OpenSim;
15 public ProcessManager proc_UserServer; 15 public ProcessManager proc_UserServer;
16 public ProcessManager proc_GridServer; 16 public ProcessManager proc_GridServer;
17 public ProcessManager proc_AssetServer; 17 public ProcessManager proc_AssetServer;
18 18
19 public Main() 19 public Main()
20 { 20 {
21 InitializeComponent(); 21 InitializeComponent();
22 } 22 }
23 23
24 private void Main_Load(object sender, EventArgs e) 24 private void Main_Load(object sender, EventArgs e)
25 { 25 {
26 txtInputUserServer.KeyPress += new KeyPressEventHandler(txtInputUserServer_KeyPress); 26 txtInputUserServer.KeyPress += new KeyPressEventHandler(txtInputUserServer_KeyPress);
27 txtInputGridServer.KeyPress += new KeyPressEventHandler(txtInputGridServer_KeyPress); 27 txtInputGridServer.KeyPress += new KeyPressEventHandler(txtInputGridServer_KeyPress);
28 txtInputAssetServer.KeyPress += new KeyPressEventHandler(txtInputAssetServer_KeyPress); 28 txtInputAssetServer.KeyPress += new KeyPressEventHandler(txtInputAssetServer_KeyPress);
29 txtInputRegionServer.KeyPress += new KeyPressEventHandler(txtInputRegionServer_KeyPress); 29 txtInputRegionServer.KeyPress += new KeyPressEventHandler(txtInputRegionServer_KeyPress);
30 30
31 tabLogs.Selected += new TabControlEventHandler(tabLogs_Selected); 31 tabLogs.Selected += new TabControlEventHandler(tabLogs_Selected);
32 32
33 UpdateTabVisibility(); 33 UpdateTabVisibility();
34 } 34 }
35 35
36 void tabLogs_Selected(object sender, TabControlEventArgs e) 36 void tabLogs_Selected(object sender, TabControlEventArgs e)
37 { 37 {
38 if (e.TabPage == tabUserServer) 38 if (e.TabPage == tabUserServer)
39 txtInputUserServer.Focus(); 39 txtInputUserServer.Focus();
40 if (e.TabPage == tabGridServer) 40 if (e.TabPage == tabGridServer)
41 txtInputGridServer.Focus(); 41 txtInputGridServer.Focus();
42 if (e.TabPage == tabAssetServer) 42 if (e.TabPage == tabAssetServer)
43 txtInputAssetServer.Focus(); 43 txtInputAssetServer.Focus();
44 if (e.TabPage == tabRegionServer) 44 if (e.TabPage == tabRegionServer)
45 txtInputRegionServer.Focus(); 45 txtInputRegionServer.Focus();
46 } 46 }
47 47
48 void txtInputUserServer_KeyPress(object sender, KeyPressEventArgs e) 48 void txtInputUserServer_KeyPress(object sender, KeyPressEventArgs e)
49 { 49 {
50 50
51 if (e.KeyChar == 13) 51 if (e.KeyChar == 13)
52 { 52 {
53 // We got a command 53 // We got a command
54 e.Handled = true; 54 e.Handled = true;
55 proc_UserServer.StandardInput.WriteLine(txtInputUserServer.Text + "\r\n"); 55 proc_UserServer.StandardInput.WriteLine(txtInputUserServer.Text + "\r\n");
56 txtInputUserServer.Text = ""; 56 txtInputUserServer.Text = "";
57 } 57 }
58 } 58 }
59 59
60 void txtInputGridServer_KeyPress(object sender, KeyPressEventArgs e) 60 void txtInputGridServer_KeyPress(object sender, KeyPressEventArgs e)
61 { 61 {
62 if (e.KeyChar == 13) 62 if (e.KeyChar == 13)
63 { 63 {
64 // We got a command 64 // We got a command
65 e.Handled = true; 65 e.Handled = true;
66 proc_GridServer.StandardInput.WriteLine(txtInputGridServer.Text + "\r\n"); 66 proc_GridServer.StandardInput.WriteLine(txtInputGridServer.Text + "\r\n");
67 txtInputGridServer.Text = ""; 67 txtInputGridServer.Text = "";
68 } 68 }
69 } 69 }
70 70
71 void txtInputAssetServer_KeyPress(object sender, KeyPressEventArgs e) 71 void txtInputAssetServer_KeyPress(object sender, KeyPressEventArgs e)
72 { 72 {
73 if (e.KeyChar == 13) 73 if (e.KeyChar == 13)
74 { 74 {
75 // We got a command 75 // We got a command
76 e.Handled = true; 76 e.Handled = true;
77 proc_AssetServer.StandardInput.WriteLine(txtInputAssetServer.Text + "\r\n"); 77 proc_AssetServer.StandardInput.WriteLine(txtInputAssetServer.Text + "\r\n");
78 txtInputAssetServer.Text = ""; 78 txtInputAssetServer.Text = "";
79 } 79 }
80 } 80 }
81 81
82 void txtInputRegionServer_KeyPress(object sender, KeyPressEventArgs e) 82 void txtInputRegionServer_KeyPress(object sender, KeyPressEventArgs e)
83 { 83 {
84 if (e.KeyChar == 13) 84 if (e.KeyChar == 13)
85 { 85 {
86 // We got a command 86 // We got a command
87 e.Handled = true; 87 e.Handled = true;
88 proc_OpenSim.StandardInput.WriteLine(txtInputRegionServer.Text + "\r\n"); 88 proc_OpenSim.StandardInput.WriteLine(txtInputRegionServer.Text + "\r\n");
89 txtInputRegionServer.Text = ""; 89 txtInputRegionServer.Text = "";
90 } 90 }
91 } 91 }
92 92
93 private void btnStart_Click(object sender, EventArgs e) 93 private void btnStart_Click(object sender, EventArgs e)
94 { 94 {
95 95
96 // 96 //
97 // THIS PART NEEDS TO BE MOVED TO A SEPARATE THREAD OR A TIMER OF SOME SORT 97 // THIS PART NEEDS TO BE MOVED TO A SEPARATE THREAD OR A TIMER OF SOME SORT
98 // should not block on wait 98 // should not block on wait
99 // ALSO - IF SOME SERVICES ARE NOT CONFIGURED, POP UP CONFIGURATION BOX FOR THAT SERVICE! 99 // ALSO - IF SOME SERVICES ARE NOT CONFIGURED, POP UP CONFIGURATION BOX FOR THAT SERVICE!
100 // 100 //
101 101
102 btnStart.Enabled = false; 102 btnStart.Enabled = false;
103 btnStop.Enabled = false; 103 btnStop.Enabled = false;
104 104
105 105
106 106
107 if (rbGridServer.Checked) 107 if (rbGridServer.Checked)
108 { 108 {
109 // Start UserServer 109 // Start UserServer
110 proc_UserServer = new ProcessManager("OpenSim.Grid.UserServer.exe", ""); 110 proc_UserServer = new ProcessManager("OpenSim.Grid.UserServer.exe", "");
111 txtMainLog.AppendText("Starting: User server" + "\r\n"); 111 txtMainLog.AppendText("Starting: User server" + "\r\n");
112 proc_UserServer.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_UserServer_DataReceived); 112 proc_UserServer.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_UserServer_DataReceived);
113 proc_UserServer.ErrorDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_UserServer_DataReceived); 113 proc_UserServer.ErrorDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_UserServer_DataReceived);
114 proc_UserServer.StartProcess(); 114 proc_UserServer.StartProcess();
115 System.Threading.Thread.Sleep(3000); 115 System.Threading.Thread.Sleep(3000);
116 116
117 // Start GridServer 117 // Start GridServer
118 proc_GridServer = new ProcessManager("OpenSim.Grid.GridServer.exe", ""); 118 proc_GridServer = new ProcessManager("OpenSim.Grid.GridServer.exe", "");
119 txtMainLog.AppendText("Starting: Grid server" + "\r\n"); 119 txtMainLog.AppendText("Starting: Grid server" + "\r\n");
120 proc_GridServer.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_GridServer_DataReceived); 120 proc_GridServer.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_GridServer_DataReceived);
121 proc_GridServer.ErrorDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_GridServer_DataReceived); 121 proc_GridServer.ErrorDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_GridServer_DataReceived);
122 proc_GridServer.StartProcess(); 122 proc_GridServer.StartProcess();
123 System.Threading.Thread.Sleep(3000); 123 System.Threading.Thread.Sleep(3000);
124 124
125 // Start AssetServer 125 // Start AssetServer
126 proc_AssetServer = new ProcessManager("OpenSim.Grid.AssetServer.exe", ""); 126 proc_AssetServer = new ProcessManager("OpenSim.Grid.AssetServer.exe", "");
127 txtMainLog.AppendText("Starting: Asset server" + "\r\n"); 127 txtMainLog.AppendText("Starting: Asset server" + "\r\n");
128 proc_AssetServer.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_AssetServer_DataReceived); 128 proc_AssetServer.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_AssetServer_DataReceived);
129 proc_AssetServer.ErrorDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_AssetServer_DataReceived); 129 proc_AssetServer.ErrorDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_AssetServer_DataReceived);
130 proc_AssetServer.StartProcess(); 130 proc_AssetServer.StartProcess();
131 System.Threading.Thread.Sleep(3000); 131 System.Threading.Thread.Sleep(3000);
132 } 132 }
133 133
134 // Start OpenSim 134 // Start OpenSim
135 string p = ""; 135 string p = "";
136 if (rbGridServer.Checked) 136 if (rbGridServer.Checked)
137 p = "-gridmode=true"; 137 p = "-gridmode=true";
138 138
139 proc_OpenSim = new ProcessManager("OpenSim.EXE", p); 139 proc_OpenSim = new ProcessManager("OpenSim.EXE", p);
140 txtMainLog.AppendText("Starting: OpenSim (Region server)" + "\r\n"); 140 txtMainLog.AppendText("Starting: OpenSim (Region server)" + "\r\n");
141 proc_OpenSim.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_OpenSim_DataReceived); 141 proc_OpenSim.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_OpenSim_DataReceived);
142 proc_OpenSim.ErrorDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_OpenSim_DataReceived); 142 proc_OpenSim.ErrorDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_OpenSim_DataReceived);
143 proc_OpenSim.StartProcess(); 143 proc_OpenSim.StartProcess();
144 144
145 btnStart.Enabled = false; 145 btnStart.Enabled = false;
146 btnStop.Enabled = true; 146 btnStop.Enabled = true;
147 147
148 } 148 }
149 public delegate void AppendText(string Text); 149 public delegate void AppendText(string Text);
150 void proc_UserServer_DataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e) 150 void proc_UserServer_DataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e)
151 { 151 {
152 this.Invoke(new AppendText(txtUserServer.AppendText), new object[] { e.Data + "\r\n" }); 152 this.Invoke(new AppendText(txtUserServer.AppendText), new object[] { e.Data + "\r\n" });
153 this.Invoke(new AppendText(txtMainLog.AppendText), new object[] { "UserServer: " + e.Data + "\r\n" }); 153 this.Invoke(new AppendText(txtMainLog.AppendText), new object[] { "UserServer: " + e.Data + "\r\n" });
154 } 154 }
155 void proc_GridServer_DataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e) 155 void proc_GridServer_DataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e)
156 { 156 {
157 this.Invoke(new AppendText(txtGridServer.AppendText), new object[] { e.Data + "\r\n" }); 157 this.Invoke(new AppendText(txtGridServer.AppendText), new object[] { e.Data + "\r\n" });
158 this.Invoke(new AppendText(txtMainLog.AppendText), new object[] { "GridServer: " + e.Data + "\r\n" }); 158 this.Invoke(new AppendText(txtMainLog.AppendText), new object[] { "GridServer: " + e.Data + "\r\n" });
159 } 159 }
160 void proc_AssetServer_DataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e) 160 void proc_AssetServer_DataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e)
161 { 161 {
162 this.Invoke(new AppendText(txtAssetServer.AppendText), new object[] { e.Data + "\r\n" }); 162 this.Invoke(new AppendText(txtAssetServer.AppendText), new object[] { e.Data + "\r\n" });
163 this.Invoke(new AppendText(txtMainLog.AppendText), new object[] { "AssetServer: " + e.Data + "\r\n" }); 163 this.Invoke(new AppendText(txtMainLog.AppendText), new object[] { "AssetServer: " + e.Data + "\r\n" });
164 } 164 }
165 void proc_OpenSim_DataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e) 165 void proc_OpenSim_DataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e)
166 { 166 {
167 this.Invoke(new AppendText(txtOpenSim.AppendText), new object[] { e.Data + "\r\n" }); 167 this.Invoke(new AppendText(txtOpenSim.AppendText), new object[] { e.Data + "\r\n" });
168 this.Invoke(new AppendText(txtMainLog.AppendText), new object[] { "OpenSim: " + e.Data + "\r\n" }); 168 this.Invoke(new AppendText(txtMainLog.AppendText), new object[] { "OpenSim: " + e.Data + "\r\n" });
169 } 169 }
170 170
171 private void btnStop_Click(object sender, EventArgs e) 171 private void btnStop_Click(object sender, EventArgs e)
172 { 172 {
173 btnStart.Enabled = false; 173 btnStart.Enabled = false;
174 btnStop.Enabled = false; 174 btnStop.Enabled = false;
175 175
176 if (proc_UserServer != null) 176 if (proc_UserServer != null)
177 { 177 {
178 txtMainLog.AppendText("Shutting down UserServer. CPU time used: " + proc_UserServer.TotalProcessorTime.ToString() + "\r\n"); 178 txtMainLog.AppendText("Shutting down UserServer. CPU time used: " + proc_UserServer.TotalProcessorTime.ToString() + "\r\n");
179 proc_UserServer.StopProcess(); 179 proc_UserServer.StopProcess();
180 } 180 }
181 if (proc_GridServer != null) 181 if (proc_GridServer != null)
182 { 182 {
183 txtMainLog.AppendText("Shutting down GridServer. CPU time used: " + proc_GridServer.TotalProcessorTime.ToString() + "\r\n"); 183 txtMainLog.AppendText("Shutting down GridServer. CPU time used: " + proc_GridServer.TotalProcessorTime.ToString() + "\r\n");
184 proc_GridServer.StopProcess(); 184 proc_GridServer.StopProcess();
185 } 185 }
186 if (proc_AssetServer != null) 186 if (proc_AssetServer != null)
187 { 187 {
188 txtMainLog.AppendText("Shutting down AssetServer. CPU time used: " + proc_AssetServer.TotalProcessorTime.ToString() + "\r\n"); 188 txtMainLog.AppendText("Shutting down AssetServer. CPU time used: " + proc_AssetServer.TotalProcessorTime.ToString() + "\r\n");
189 proc_AssetServer.StopProcess(); 189 proc_AssetServer.StopProcess();
190 } 190 }
191 if (proc_OpenSim != null) 191 if (proc_OpenSim != null)
192 { 192 {
193 txtMainLog.AppendText("Shutting down OpenSim. CPU time used: " + proc_OpenSim.TotalProcessorTime.ToString() + "\r\n"); 193 txtMainLog.AppendText("Shutting down OpenSim. CPU time used: " + proc_OpenSim.TotalProcessorTime.ToString() + "\r\n");
194 proc_OpenSim.StopProcess(); 194 proc_OpenSim.StopProcess();
195 } 195 }
196 196
197 btnStart.Enabled = true; 197 btnStart.Enabled = true;
198 btnStop.Enabled = false; 198 btnStop.Enabled = false;
199 199
200 200
201 } 201 }
202 202
203 private void UpdateTabVisibility() 203 private void UpdateTabVisibility()
204 { 204 {
205 if (rbStandAloneMode.Checked) 205 if (rbStandAloneMode.Checked)
206 { 206 {
207 if (tabLogs.TabPages.Contains(tabUserServer)) 207 if (tabLogs.TabPages.Contains(tabUserServer))
208 tabLogs.TabPages.Remove(tabUserServer); 208 tabLogs.TabPages.Remove(tabUserServer);
209 if (tabLogs.TabPages.Contains(tabGridServer)) 209 if (tabLogs.TabPages.Contains(tabGridServer))
210 tabLogs.TabPages.Remove(tabGridServer); 210 tabLogs.TabPages.Remove(tabGridServer);
211 if (tabLogs.TabPages.Contains(tabAssetServer)) 211 if (tabLogs.TabPages.Contains(tabAssetServer))
212 tabLogs.TabPages.Remove(tabAssetServer); 212 tabLogs.TabPages.Remove(tabAssetServer);
213 } 213 }
214 else 214 else
215 { 215 {
216 if (!tabLogs.TabPages.Contains(tabUserServer)) 216 if (!tabLogs.TabPages.Contains(tabUserServer))
217 tabLogs.TabPages.Add(tabUserServer); 217 tabLogs.TabPages.Add(tabUserServer);
218 if (!tabLogs.TabPages.Contains(tabGridServer)) 218 if (!tabLogs.TabPages.Contains(tabGridServer))
219 tabLogs.TabPages.Add(tabGridServer); 219 tabLogs.TabPages.Add(tabGridServer);
220 if (!tabLogs.TabPages.Contains(tabAssetServer)) 220 if (!tabLogs.TabPages.Contains(tabAssetServer))
221 tabLogs.TabPages.Add(tabAssetServer); 221 tabLogs.TabPages.Add(tabAssetServer);
222 } 222 }
223 223
224 } 224 }
225 225
226 private void rbStandAloneMode_CheckedChanged(object sender, EventArgs e) 226 private void rbStandAloneMode_CheckedChanged(object sender, EventArgs e)
227 { 227 {
228 UpdateTabVisibility(); 228 UpdateTabVisibility();
229 } 229 }
230 230
231 private void rbGridRegionMode_CheckedChanged(object sender, EventArgs e) 231 private void rbGridRegionMode_CheckedChanged(object sender, EventArgs e)
232 { 232 {
233 UpdateTabVisibility(); 233 UpdateTabVisibility();
234 } 234 }
235 235
236 private void rbGridServer_CheckedChanged(object sender, EventArgs e) 236 private void rbGridServer_CheckedChanged(object sender, EventArgs e)
237 { 237 {
238 UpdateTabVisibility(); 238 UpdateTabVisibility();
239 } 239 }
240 240
241 } 241 }
242} \ No newline at end of file 242} \ No newline at end of file
diff --git a/OpenSim/Tools/OpenSim.GUI/ProcessManager.cs b/OpenSim/Tools/OpenSim.GUI/ProcessManager.cs
index 0ab074e..8c019fb 100644
--- a/OpenSim/Tools/OpenSim.GUI/ProcessManager.cs
+++ b/OpenSim/Tools/OpenSim.GUI/ProcessManager.cs
@@ -1,71 +1,71 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using System.Diagnostics; 4using System.Diagnostics;
5 5
6namespace OpenSim.GUI 6namespace OpenSim.GUI
7{ 7{
8 public class ProcessManager : Process 8 public class ProcessManager : Process
9 { 9 {
10 private string m_FileName; 10 private string m_FileName;
11 private string m_Arguments; 11 private string m_Arguments;
12 public ProcessManager(string FileName,string Arguments) 12 public ProcessManager(string FileName,string Arguments)
13 { 13 {
14 m_FileName = FileName; 14 m_FileName = FileName;
15 m_Arguments = Arguments; 15 m_Arguments = Arguments;
16 16
17// MyProc = new Process(); 17// MyProc = new Process();
18 StartInfo.WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory; 18 StartInfo.WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory;
19 Console.WriteLine("WorkingDirectory: " + StartInfo.WorkingDirectory); 19 Console.WriteLine("WorkingDirectory: " + StartInfo.WorkingDirectory);
20 StartInfo.FileName = m_FileName; 20 StartInfo.FileName = m_FileName;
21 21
22 //p.StartInfo.Arguments = ""; 22 //p.StartInfo.Arguments = "";
23 StartInfo.UseShellExecute = false; 23 StartInfo.UseShellExecute = false;
24 StartInfo.RedirectStandardError = true; 24 StartInfo.RedirectStandardError = true;
25 StartInfo.RedirectStandardInput = true; 25 StartInfo.RedirectStandardInput = true;
26 StartInfo.RedirectStandardOutput = true; 26 StartInfo.RedirectStandardOutput = true;
27 StartInfo.CreateNoWindow = true; 27 StartInfo.CreateNoWindow = true;
28 28
29 29
30 30
31 } 31 }
32 32
33 public void StartProcess() 33 public void StartProcess()
34 { 34 {
35 try 35 try
36 { 36 {
37 Start(); 37 Start();
38 BeginOutputReadLine(); 38 BeginOutputReadLine();
39 BeginErrorReadLine(); 39 BeginErrorReadLine();
40 } 40 }
41 catch (Exception ex) 41 catch (Exception ex)
42 { 42 {
43 Console.WriteLine("Exception Occurred :{0},{1}", 43 Console.WriteLine("Exception Occurred :{0},{1}",
44 ex.Message, ex.StackTrace.ToString()); 44 ex.Message, ex.StackTrace.ToString());
45 } 45 }
46 } 46 }
47 public void StopProcess() 47 public void StopProcess()
48 { 48 {
49 try 49 try
50 { 50 {
51 CancelErrorRead(); 51 CancelErrorRead();
52 CancelErrorRead(); 52 CancelErrorRead();
53 if (!HasExited) 53 if (!HasExited)
54 { 54 {
55 StandardInput.WriteLine("quit"); 55 StandardInput.WriteLine("quit");
56 StandardInput.WriteLine("shutdown"); 56 StandardInput.WriteLine("shutdown");
57 System.Threading.Thread.Sleep(500); 57 System.Threading.Thread.Sleep(500);
58 if (!HasExited) 58 if (!HasExited)
59 { 59 {
60 Kill(); 60 Kill();
61 } 61 }
62 } 62 }
63 } 63 }
64 catch (Exception ex) 64 catch (Exception ex)
65 { 65 {
66 Console.WriteLine("Exception Occurred :{0},{1}", 66 Console.WriteLine("Exception Occurred :{0},{1}",
67 ex.Message, ex.StackTrace.ToString()); 67 ex.Message, ex.StackTrace.ToString());
68 } 68 }
69 } 69 }
70 } 70 }
71} 71}
diff --git a/OpenSim/Tools/OpenSim.GUI/Program.cs b/OpenSim/Tools/OpenSim.GUI/Program.cs
index a849b1b..3766ee6 100644
--- a/OpenSim/Tools/OpenSim.GUI/Program.cs
+++ b/OpenSim/Tools/OpenSim.GUI/Program.cs
@@ -1,20 +1,20 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Windows.Forms; 3using System.Windows.Forms;
4 4
5namespace OpenSim.GUI 5namespace OpenSim.GUI
6{ 6{
7 static class Program 7 static class Program
8 { 8 {
9 /// <summary> 9 /// <summary>
10 /// The main entry point for the application. 10 /// The main entry point for the application.
11 /// </summary> 11 /// </summary>
12 [STAThread] 12 [STAThread]
13 static void Main() 13 static void Main()
14 { 14 {
15 Application.EnableVisualStyles(); 15 Application.EnableVisualStyles();
16 Application.SetCompatibleTextRenderingDefault(false); 16 Application.SetCompatibleTextRenderingDefault(false);
17 Application.Run(new Main()); 17 Application.Run(new Main());
18 } 18 }
19 } 19 }
20} \ No newline at end of file 20} \ No newline at end of file
diff --git a/OpenSim/Tools/OpenSim.GUI/Properties/AssemblyInfo.cs b/OpenSim/Tools/OpenSim.GUI/Properties/AssemblyInfo.cs
index 3e86b1c..adc2285 100644
--- a/OpenSim/Tools/OpenSim.GUI/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/OpenSim.GUI/Properties/AssemblyInfo.cs
@@ -1,33 +1,33 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.GUI")] 8[assembly: AssemblyTitle("OpenSim.GUI")]
9[assembly: AssemblyDescription("")] 9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")] 10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("")] 11[assembly: AssemblyCompany("")]
12[assembly: AssemblyProduct("OpenSim.GUI")] 12[assembly: AssemblyProduct("OpenSim.GUI")]
13[assembly: AssemblyCopyright("Copyright © 2007")] 13[assembly: AssemblyCopyright("Copyright © 2007")]
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
22// The following GUID is for the ID of the typelib if this project is exposed to COM 22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("c8dbda49-66bd-476b-93b3-71774870b73e")] 23[assembly: Guid("c8dbda49-66bd-476b-93b3-71774870b73e")]
24 24
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
32[assembly: AssemblyVersion("1.0.0.0")] 32[assembly: AssemblyVersion("1.0.0.0")]
33[assembly: AssemblyFileVersion("1.0.0.0")] 33[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Tools/OpenSim.GUI/Properties/Resources.Designer.cs b/OpenSim/Tools/OpenSim.GUI/Properties/Resources.Designer.cs
index f7de4f0..33e67d4 100644
--- a/OpenSim/Tools/OpenSim.GUI/Properties/Resources.Designer.cs
+++ b/OpenSim/Tools/OpenSim.GUI/Properties/Resources.Designer.cs
@@ -1,71 +1,71 @@
1//------------------------------------------------------------------------------ 1//------------------------------------------------------------------------------
2// <auto-generated> 2// <auto-generated>
3// This code was generated by a tool. 3// This code was generated by a tool.
4// Runtime Version:2.0.50727.312 4// Runtime Version:2.0.50727.312
5// 5//
6// Changes to this file may cause incorrect behavior and will be lost if 6// Changes to this file may cause incorrect behavior and will be lost if
7// the code is regenerated. 7// the code is regenerated.
8// </auto-generated> 8// </auto-generated>
9//------------------------------------------------------------------------------ 9//------------------------------------------------------------------------------
10 10
11namespace OpenSim.GUI.Properties 11namespace OpenSim.GUI.Properties
12{ 12{
13 13
14 14
15 /// <summary> 15 /// <summary>
16 /// A strongly-typed resource class, for looking up localized strings, etc. 16 /// A strongly-typed resource class, for looking up localized strings, etc.
17 /// </summary> 17 /// </summary>
18 // This class was auto-generated by the StronglyTypedResourceBuilder 18 // This class was auto-generated by the StronglyTypedResourceBuilder
19 // class via a tool like ResGen or Visual Studio. 19 // class via a tool like ResGen or Visual Studio.
20 // To add or remove a member, edit your .ResX file then rerun ResGen 20 // To add or remove a member, edit your .ResX file then rerun ResGen
21 // with the /str option, or rebuild your VS project. 21 // with the /str option, or rebuild your VS project.
22 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] 22 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
23 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 23 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
24 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 24 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
25 internal class Resources 25 internal class Resources
26 { 26 {
27 27
28 private static global::System.Resources.ResourceManager resourceMan; 28 private static global::System.Resources.ResourceManager resourceMan;
29 29
30 private static global::System.Globalization.CultureInfo resourceCulture; 30 private static global::System.Globalization.CultureInfo resourceCulture;
31 31
32 [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] 32 [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
33 internal Resources() 33 internal Resources()
34 { 34 {
35 } 35 }
36 36
37 /// <summary> 37 /// <summary>
38 /// Returns the cached ResourceManager instance used by this class. 38 /// Returns the cached ResourceManager instance used by this class.
39 /// </summary> 39 /// </summary>
40 [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] 40 [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
41 internal static global::System.Resources.ResourceManager ResourceManager 41 internal static global::System.Resources.ResourceManager ResourceManager
42 { 42 {
43 get 43 get
44 { 44 {
45 if ((resourceMan == null)) 45 if ((resourceMan == null))
46 { 46 {
47 global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenSim.GUI.Properties.Resources", typeof(Resources).Assembly); 47 global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenSim.GUI.Properties.Resources", typeof(Resources).Assembly);
48 resourceMan = temp; 48 resourceMan = temp;
49 } 49 }
50 return resourceMan; 50 return resourceMan;
51 } 51 }
52 } 52 }
53 53
54 /// <summary> 54 /// <summary>
55 /// Overrides the current thread's CurrentUICulture property for all 55 /// Overrides the current thread's CurrentUICulture property for all
56 /// resource lookups using this strongly typed resource class. 56 /// resource lookups using this strongly typed resource class.
57 /// </summary> 57 /// </summary>
58 [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] 58 [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
59 internal static global::System.Globalization.CultureInfo Culture 59 internal static global::System.Globalization.CultureInfo Culture
60 { 60 {
61 get 61 get
62 { 62 {
63 return resourceCulture; 63 return resourceCulture;
64 } 64 }
65 set 65 set
66 { 66 {
67 resourceCulture = value; 67 resourceCulture = value;
68 } 68 }
69 } 69 }
70 } 70 }
71} 71}
diff --git a/OpenSim/Tools/OpenSim.GUI/Properties/Settings.Designer.cs b/OpenSim/Tools/OpenSim.GUI/Properties/Settings.Designer.cs
index e23862a..dd1db86 100644
--- a/OpenSim/Tools/OpenSim.GUI/Properties/Settings.Designer.cs
+++ b/OpenSim/Tools/OpenSim.GUI/Properties/Settings.Designer.cs
@@ -1,30 +1,30 @@
1//------------------------------------------------------------------------------ 1//------------------------------------------------------------------------------
2// <auto-generated> 2// <auto-generated>
3// This code was generated by a tool. 3// This code was generated by a tool.
4// Runtime Version:2.0.50727.312 4// Runtime Version:2.0.50727.312
5// 5//
6// Changes to this file may cause incorrect behavior and will be lost if 6// Changes to this file may cause incorrect behavior and will be lost if
7// the code is regenerated. 7// the code is regenerated.
8// </auto-generated> 8// </auto-generated>
9//------------------------------------------------------------------------------ 9//------------------------------------------------------------------------------
10 10
11namespace OpenSim.GUI.Properties 11namespace OpenSim.GUI.Properties
12{ 12{
13 13
14 14
15 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 15 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
16 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] 16 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
17 internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase 17 internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
18 { 18 {
19 19
20 private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); 20 private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
21 21
22 public static Settings Default 22 public static Settings Default
23 { 23 {
24 get 24 get
25 { 25 {
26 return defaultInstance; 26 return defaultInstance;
27 } 27 }
28 } 28 }
29 } 29 }
30} 30}
diff --git a/OpenSim/Tools/OpenSim.GUI/frmConfiguration.Designer.cs b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.Designer.cs
index 1777fbc..bba9361 100644
--- a/OpenSim/Tools/OpenSim.GUI/frmConfiguration.Designer.cs
+++ b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.Designer.cs
@@ -1,61 +1,61 @@
1namespace OpenSim.GUI 1namespace OpenSim.GUI
2{ 2{
3 partial class frmConfiguration 3 partial class frmConfiguration
4 { 4 {
5 /// <summary> 5 /// <summary>
6 /// Required designer variable. 6 /// Required designer variable.
7 /// </summary> 7 /// </summary>
8 private System.ComponentModel.IContainer components = null; 8 private System.ComponentModel.IContainer components = null;
9 9
10 /// <summary> 10 /// <summary>
11 /// Clean up any resources being used. 11 /// Clean up any resources being used.
12 /// </summary> 12 /// </summary>
13 /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> 13 /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
14 protected override void Dispose(bool disposing) 14 protected override void Dispose(bool disposing)
15 { 15 {
16 if (disposing && (components != null)) 16 if (disposing && (components != null))
17 { 17 {
18 components.Dispose(); 18 components.Dispose();
19 } 19 }
20 base.Dispose(disposing); 20 base.Dispose(disposing);
21 } 21 }
22 22
23 #region Windows Form Designer generated code 23 #region Windows Form Designer generated code
24 24
25 /// <summary> 25 /// <summary>
26 /// Required method for Designer support - do not modify 26 /// Required method for Designer support - do not modify
27 /// the contents of this method with the code editor. 27 /// the contents of this method with the code editor.
28 /// </summary> 28 /// </summary>
29 private void InitializeComponent() 29 private void InitializeComponent()
30 { 30 {
31 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmConfiguration)); 31 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmConfiguration));
32 this.textBox1 = new System.Windows.Forms.TextBox(); 32 this.textBox1 = new System.Windows.Forms.TextBox();
33 this.SuspendLayout(); 33 this.SuspendLayout();
34 // 34 //
35 // textBox1 35 // textBox1
36 // 36 //
37 this.textBox1.Location = new System.Drawing.Point(12, 12); 37 this.textBox1.Location = new System.Drawing.Point(12, 12);
38 this.textBox1.Multiline = true; 38 this.textBox1.Multiline = true;
39 this.textBox1.Name = "textBox1"; 39 this.textBox1.Name = "textBox1";
40 this.textBox1.Size = new System.Drawing.Size(570, 190); 40 this.textBox1.Size = new System.Drawing.Size(570, 190);
41 this.textBox1.TabIndex = 0; 41 this.textBox1.TabIndex = 0;
42 this.textBox1.Text = resources.GetString("textBox1.Text"); 42 this.textBox1.Text = resources.GetString("textBox1.Text");
43 // 43 //
44 // frmConfiguration 44 // frmConfiguration
45 // 45 //
46 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 46 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
47 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 47 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
48 this.ClientSize = new System.Drawing.Size(664, 413); 48 this.ClientSize = new System.Drawing.Size(664, 413);
49 this.Controls.Add(this.textBox1); 49 this.Controls.Add(this.textBox1);
50 this.Name = "frmConfiguration"; 50 this.Name = "frmConfiguration";
51 this.Text = "Configuration"; 51 this.Text = "Configuration";
52 this.ResumeLayout(false); 52 this.ResumeLayout(false);
53 this.PerformLayout(); 53 this.PerformLayout();
54 54
55 } 55 }
56 56
57 #endregion 57 #endregion
58 58
59 private System.Windows.Forms.TextBox textBox1; 59 private System.Windows.Forms.TextBox textBox1;
60 } 60 }
61} \ No newline at end of file 61} \ No newline at end of file
diff --git a/OpenSim/Tools/OpenSim.GUI/frmConfiguration.cs b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.cs
index 9acf305..c305657 100644
--- a/OpenSim/Tools/OpenSim.GUI/frmConfiguration.cs
+++ b/OpenSim/Tools/OpenSim.GUI/frmConfiguration.cs
@@ -1,18 +1,18 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.ComponentModel; 3using System.ComponentModel;
4using System.Data; 4using System.Data;
5using System.Drawing; 5using System.Drawing;
6using System.Text; 6using System.Text;
7using System.Windows.Forms; 7using System.Windows.Forms;
8 8
9namespace OpenSim.GUI 9namespace OpenSim.GUI
10{ 10{
11 public partial class frmConfiguration : Form 11 public partial class frmConfiguration : Form
12 { 12 {
13 public frmConfiguration() 13 public frmConfiguration()
14 { 14 {
15 InitializeComponent(); 15 InitializeComponent();
16 } 16 }
17 } 17 }
18} \ No newline at end of file 18} \ No newline at end of file
generated by cgit v1.1 at 2024-12-14 00:42:53 +0000