Merge branch 'uri-settings' of https://github.com/nooperation/radegast into nooperati...

diff --cc Radegast/GUI/Dialogs/Settings.Designer.cs
index d8a3e0c,d44c12d..1650447
--- 1/Radegast/GUI/Dialogs/Settings.Designer.cs
--- 2/Radegast/GUI/Dialogs/Settings.Designer.cs
+++ b/Radegast/GUI/Dialogs/Settings.Designer.cs
@@@ -244,7 -246,10 +247,10 @@@ namespace Radegas
              // 
              // cbMisc
              // 
 -            this.cbMisc.Controls.Add(this.label4);
+             this.cbMisc.Controls.Add(this.txtResolveURITime);
+             this.cbMisc.Controls.Add(this.cbResolveURIs);
              this.cbMisc.Controls.Add(this.cbShowScriptErrors);
++            this.cbMisc.Controls.Add(this.label4);
              this.cbMisc.Controls.Add(this.cbDisableHTTPInventory);
              this.cbMisc.Controls.Add(this.cbHideLoginGraphics);
              this.cbMisc.Controls.Add(this.cbDisableLookAt);
@@@ -262,10 -266,39 +268,39 @@@
              this.cbMisc.Controls.Add(this.cbSyntaxHighlight);
              this.cbMisc.Location = new System.Drawing.Point(270, 6);
              this.cbMisc.Name = "cbMisc";
-             this.cbMisc.Size = new System.Drawing.Size(236, 330);
 -            this.cbMisc.Size = new System.Drawing.Size(236, 345);
++            this.cbMisc.Size = new System.Drawing.Size(236, 371);
              this.cbMisc.TabIndex = 2;
              this.cbMisc.TabStop = false;
              // 
 -            this.txtResolveURITime.Location = new System.Drawing.Point(138, 318);
+             // txtResolveURITime
+             // 
 -            this.label4.Location = new System.Drawing.Point(23, 321);
++            this.txtResolveURITime.Location = new System.Drawing.Point(118, 338);
+             this.txtResolveURITime.Name = "txtResolveURITime";
+             this.txtResolveURITime.Size = new System.Drawing.Size(53, 20);
+             this.txtResolveURITime.TabIndex = 20;
+             this.txtResolveURITime.Text = "100";
+             this.txtResolveURITime.TextChanged += new System.EventHandler(this.txtResolveURITime_TextChanged);
+             // 
+             // label4
+             // 
+             this.label4.AutoSize = true;
 -            this.cbResolveURIs.Location = new System.Drawing.Point(6, 304);
++            this.label4.Location = new System.Drawing.Point(3, 341);
+             this.label4.Name = "label4";
+             this.label4.Size = new System.Drawing.Size(109, 13);
+             this.label4.TabIndex = 19;
+             this.label4.Text = "Resolve Timeout (ms)";
+             // 
+             // cbResolveURIs
+             // 
+             this.cbResolveURIs.AutoSize = true;
++            this.cbResolveURIs.Location = new System.Drawing.Point(6, 322);
+             this.cbResolveURIs.Name = "cbResolveURIs";
+             this.cbResolveURIs.Size = new System.Drawing.Size(92, 17);
+             this.cbResolveURIs.TabIndex = 18;
+             this.cbResolveURIs.Text = "Resolve URIs";
+             this.cbResolveURIs.UseVisualStyleBackColor = true;
+             this.cbResolveURIs.CheckedChanged += new System.EventHandler(this.cbResolveURIs_CheckedChanged);
+             // 
              // cbShowScriptErrors
              // 
              this.cbShowScriptErrors.AutoSize = true;
@@@ -391,17 -424,6 +426,17 @@@
              this.cbRLV.UseVisualStyleBackColor = true;
              this.cbRLV.CheckedChanged += new System.EventHandler(this.cbTrasactChat_CheckedChanged);
              // 
-             //
 +            // cbRLVDebug
-             this.cbRLVDebug.Size = new System.Drawing.Size(130, 17);
++            // 
 +            this.cbRLVDebug.AutoSize = true;
 +            this.cbRLVDebug.Location = new System.Drawing.Point(6, 300);
 +            this.cbRLVDebug.Name = "cbRLVDebug";
-             //
++            this.cbRLVDebug.Size = new System.Drawing.Size(136, 17);
 +            this.cbRLVDebug.TabIndex = 12;
 +            this.cbRLVDebug.Text = "Output RLV commands";
 +            this.cbRLVDebug.UseVisualStyleBackColor = true;
 +            this.cbRLVDebug.CheckedChanged += new System.EventHandler(this.cbTrasactChat_CheckedChanged);
++            // 
              // cbMinToTrey
              // 
              this.cbMinToTrey.AutoSize = true;

diff --cc Radegast/GUI/Dialogs/Settings.cs
Simple merge