1.14.507 for the gold

git-svn-id: https://radegast.googlecode.com/svn/trunk@507 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/Radegast/GUI/Consoles/LoginConsole.Designer.cs b/Radegast/GUI/Consoles/LoginConsole.Designer.cs
index ae3402c..fa247bd 100644 (file)
--- a/Radegast/GUI/Consoles/LoginConsole.Designer.cs
+++ b/Radegast/GUI/Consoles/LoginConsole.Designer.cs
@@ -78,8 +78,9 @@ namespace Radegast
             this.panel1 = new System.Windows.Forms.Panel();
             this.pnlSplash = new System.Windows.Forms.Panel();
             this.pnlTos = new System.Windows.Forms.Panel();
-            this.txtTOS = new System.Windows.Forms.TextBox();
             this.cbTOS = new System.Windows.Forms.CheckBox();
+            this.txtTOS = new System.Windows.Forms.TextBox();
+            this.lblVersion = new System.Windows.Forms.Label();
             this.pnlLoginPrompt.SuspendLayout();
             this.pnlLoggingIn.SuspendLayout();
             this.panel1.SuspendLayout();
@@ -273,6 +274,7 @@ namespace Radegast
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.Transparent;
+            this.panel1.Controls.Add(this.lblVersion);
             this.panel1.Controls.Add(this.pnlLoginPrompt);
             this.panel1.Controls.Add(this.btnLogin);
             this.panel1.Controls.Add(this.pnlLoggingIn);
@@ -304,6 +306,18 @@ namespace Radegast
             this.pnlTos.TabIndex = 0;
             this.pnlTos.Visible = false;
             // 
+            // cbTOS
+            // 
+            this.cbTOS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.cbTOS.AutoSize = true;
+            this.cbTOS.Location = new System.Drawing.Point(6, 308);
+            this.cbTOS.Name = "cbTOS";
+            this.cbTOS.Size = new System.Drawing.Size(176, 17);
+            this.cbTOS.TabIndex = 1;
+            this.cbTOS.Text = "I agree to the Terms of Service";
+            this.cbTOS.UseVisualStyleBackColor = true;
+            this.cbTOS.CheckedChanged += new System.EventHandler(this.cbTOS_CheckedChanged);
+            // 
             // txtTOS
             // 
             this.txtTOS.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -316,17 +330,15 @@ namespace Radegast
             this.txtTOS.Size = new System.Drawing.Size(682, 302);
             this.txtTOS.TabIndex = 0;
             // 
-            // cbTOS
+            // lblVersion
             // 
-            this.cbTOS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.cbTOS.AutoSize = true;
-            this.cbTOS.Location = new System.Drawing.Point(6, 308);
-            this.cbTOS.Name = "cbTOS";
-            this.cbTOS.Size = new System.Drawing.Size(176, 17);
-            this.cbTOS.TabIndex = 1;
-            this.cbTOS.Text = "I agree to the Terms of Service";
-            this.cbTOS.UseVisualStyleBackColor = true;
-            this.cbTOS.CheckedChanged += new System.EventHandler(this.cbTOS_CheckedChanged);
+            this.lblVersion.AutoSize = true;
+            this.lblVersion.ForeColor = System.Drawing.Color.Black;
+            this.lblVersion.Location = new System.Drawing.Point(3, 3);
+            this.lblVersion.Name = "lblVersion";
+            this.lblVersion.Size = new System.Drawing.Size(100, 13);
+            this.lblVersion.TabIndex = 18;
+            this.lblVersion.Text = "Radegast 1.24.500";
             // 
             // LoginConsole
             // 
@@ -343,6 +355,7 @@ namespace Radegast
             this.pnlLoginPrompt.PerformLayout();
             this.pnlLoggingIn.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
             this.pnlSplash.ResumeLayout(false);
             this.pnlTos.ResumeLayout(false);
             this.pnlTos.PerformLayout();
@@ -374,6 +387,7 @@ namespace Radegast
         private System.Windows.Forms.Panel pnlTos;
         private System.Windows.Forms.TextBox txtTOS;
         private System.Windows.Forms.CheckBox cbTOS;
+        private System.Windows.Forms.Label lblVersion;
 
     }
 }

diff --git a/Radegast/GUI/Consoles/LoginConsole.cs b/Radegast/GUI/Consoles/LoginConsole.cs
index bf17fb4..e50262b 100644 (file)
--- a/Radegast/GUI/Consoles/LoginConsole.cs
+++ b/Radegast/GUI/Consoles/LoginConsole.cs
@@ -59,6 +59,8 @@ namespace Radegast
                 pnlSplash.BackgroundImage = Properties.Resources.radegast_main_screen2;
 
             instance.GlobalSettings.OnSettingChanged += new Settings.SettingChangedCallback(GlobalSettings_OnSettingChanged);
+
+            lblVersion.Text = Properties.Resources.RadegastTitle + "." + RadegastBuild.CurrentRev;
         }
 
         void MainConsole_Disposed(object sender, EventArgs e)

diff --git a/Radegast/GUI/Dialogs/About.resx b/Radegast/GUI/Dialogs/About.resx
index 14962f3..c3c3335 100644 (file)
--- a/Radegast/GUI/Dialogs/About.resx
+++ b/Radegast/GUI/Dialogs/About.resx
@@ -135,6 +135,10 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 Copyright © 2006-2008, Paul Clement (a.k.a. Delta)\r
 All rights reserved.\r
 \r
+Uses PrimMesher (BSD License)\r
+© 2010 Dahlia Trimble\r
+http://forge.opensimulator.org/gf/project/primmesher/\r
+\r
 Uses AIMLBot (LGPL License)\r
 The AIMLBot library (Program#) is a .NET implementation of the AIML standard.\r
 © 2006 Nicholas H.Tollervey (http://ntoll.org)\r
@@ -164,7 +168,7 @@ All rights reserved.
 \r
 Uses artwork files are licenced under the \r
 Creative Commons Share and Share Alike 3.0\r
-Copyright (C) 2002-2009 Linden Research Inc.</value>\r
+Copyright © 2002-2009 Linden Research Inc.</value>\r
   </data>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r

diff --git a/Radegast/Properties/AssemblyInfo.cs b/Radegast/Properties/AssemblyInfo.cs
index a2f0cce..d1c84d8 100644 (file)
--- a/Radegast/Properties/AssemblyInfo.cs
+++ b/Radegast/Properties/AssemblyInfo.cs
@@ -40,7 +40,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Radegast Development Team")]
 [assembly: AssemblyProduct("Radegast Metaverse Client")]
-[assembly: AssemblyCopyright("Copyright ©  2009 Radegast Development Team")]
+[assembly: AssemblyCopyright("Copyright ©  2009-2010 Radegast Development Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
+[assembly: AssemblyVersion("1.14.507.0")]
+[assembly: AssemblyFileVersion("1.14.507.0")]

diff --git a/Radegast/Properties/Resources.Designer.cs b/Radegast/Properties/Resources.Designer.cs
index b8da436..1963364 100644 (file)
--- a/Radegast/Properties/Resources.Designer.cs
+++ b/Radegast/Properties/Resources.Designer.cs
@@ -622,7 +622,7 @@ namespace Radegast.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Radegast 1.13.
+        ///   Looks up a localized string similar to Radegast 1.14.
         /// </summary>
         public static string RadegastTitle {
             get {

diff --git a/Radegast/Properties/Resources.resx b/Radegast/Properties/Resources.resx
index 6352033..6d99c14 100644 (file)
--- a/Radegast/Properties/Resources.resx
+++ b/Radegast/Properties/Resources.resx
@@ -182,7 +182,7 @@
     <value>../Resources/inv_folder_animation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="RadegastTitle" xml:space="preserve">\r
-    <value>Radegast 1.13</value>\r
+    <value>Radegast 1.14</value>\r
   </data>\r
   <data name="inv_folder_plain_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_folder_plain_closed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r

diff --git a/Radegast/RadegastBuild.cs b/Radegast/RadegastBuild.cs
index 796bee6..83fbca4 100644 (file)
--- a/Radegast/RadegastBuild.cs
+++ b/Radegast/RadegastBuild.cs
@@ -1,5 +1,5 @@
 // Autogenerated: run updatebuildnr.bat/sh to update 
 namespace Radegast 
 { 
-    public static class RadegastBuild { public static int CurrentRev = 473; } 
+    public static class RadegastBuild { public static int CurrentRev = 507; } 
 } 

diff --git a/Radegast/radegast.nsi b/Radegast/radegast.nsi
index 583825c..db006f9 100644 (file)
Binary files a/Radegast/radegast.nsi and b/Radegast/radegast.nsi differ