diff --git a/OpenMetaverse.Rendering.Meshmerizer/Extruder.cs b/OpenMetaverse.Rendering.Meshmerizer/Extruder.cs
index 884408be..be31560e 100644
--- a/OpenMetaverse.Rendering.Meshmerizer/Extruder.cs
+++ b/OpenMetaverse.Rendering.Meshmerizer/Extruder.cs
@@ -34,8 +34,6 @@ namespace OpenMetaverse.Rendering
{
class Extruder
{
- public PhysicsVector size;
-
public float taperTopFactorX = 1f;
public float taperTopFactorY = 1f;
public float taperBotFactorX = 1f;
@@ -210,21 +208,6 @@ namespace OpenMetaverse.Rendering
} while (!done); // loop until all the layers in the path are completed
- // scale the mesh to the desired size
- float xScale = size.X;
- float yScale = size.Y;
- float zScale = size.Z;
-
- foreach (MeshmerizerVertex v in result.vertices)
- {
- if (v != null)
- {
- v.X *= xScale;
- v.Y *= yScale;
- v.Z *= zScale;
- }
- }
-
return result;
}
@@ -413,21 +396,6 @@ namespace OpenMetaverse.Rendering
}
} while (!done); // loop until all the layers in the path are completed
- // scale the mesh to the desired size
- float xScale = size.X;
- float yScale = size.Y;
- float zScale = size.Z;
-
- foreach (MeshmerizerVertex v in result.vertices)
- {
- if (v != null)
- {
- v.X *= xScale;
- v.Y *= yScale;
- v.Z *= zScale;
- }
- }
-
return result;
}
}
diff --git a/Programs/Prebuild/src/Core/Targets/VSGenericTarget.cs b/Programs/Prebuild/src/Core/Targets/VSGenericTarget.cs
index ccbeb743..0855d88c 100644
--- a/Programs/Prebuild/src/Core/Targets/VSGenericTarget.cs
+++ b/Programs/Prebuild/src/Core/Targets/VSGenericTarget.cs
@@ -369,7 +369,7 @@ namespace Prebuild.Core.Targets
string autogen_name = file.Substring(0, file.LastIndexOf('.')) + ".Designer.cs";
string dependent_name = file.Substring(0, file.LastIndexOf('.')) + ".cs";
- ps.WriteLine(" {0}", autogen_name);
+ ps.WriteLine(" {0}", Path.GetFileName(autogen_name));
// Check for a parent .cs file with the same name as this designer file
if (File.Exists(dependent_name))
diff --git a/Programs/examples/GUITestClient/GUITestClient.cs b/Programs/examples/GUITestClient/GUITestClient.cs
deleted file mode 100644
index 45e13af6..00000000
--- a/Programs/examples/GUITestClient/GUITestClient.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace OpenMetaverse.GUITestClient
-{
- static class Program
- {
- ///
- /// The main entry point for the application.
- ///
- [STAThread]
- static void Main()
- {
- Application.EnableVisualStyles();
- Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new frmTestClient());
- }
- }
-}
\ No newline at end of file
diff --git a/Programs/examples/GUITestClient/Interface.cs b/Programs/examples/GUITestClient/Interface.cs
deleted file mode 100644
index ddb6d5b2..00000000
--- a/Programs/examples/GUITestClient/Interface.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Windows.Forms;
-using System.Collections.Generic;
-
-namespace OpenMetaverse.GUITestClient
-{
- public abstract class Interface
- {
- public string Name;
- public string Description;
- public GridClient Client;
- public TabPage TabPage;
-
- public abstract void Initialize();
-
- public abstract void Paint(object sender, PaintEventArgs e);
-
- ///
- /// When set to true, think will be called.
- ///
- public bool Active;
- }
-}
diff --git a/Programs/examples/GUITestClient/Interfaces/HeightmapInterface.cs b/Programs/examples/GUITestClient/Interfaces/HeightmapInterface.cs
deleted file mode 100644
index 996ee629..00000000
--- a/Programs/examples/GUITestClient/Interfaces/HeightmapInterface.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Windows.Forms;
-using OpenMetaverse;
-
-namespace OpenMetaverse.GUITestClient
-{
- public class HeightmapInterface : Interface
- {
- private PictureBox[,] Boxes = new PictureBox[16, 16];
-
- public HeightmapInterface(frmTestClient testClient)
- {
- Name = "Heightmap";
- Description = "Displays a graphical heightmap of the current simulator";
- }
-
- public override void Initialize()
- {
- Client.Terrain.OnLandPatch += new TerrainManager.LandPatchCallback(Terrain_OnLandPatch);
- Client.Settings.STORE_LAND_PATCHES = true;
-
- for (int y = 0; y < 16; y++)
- {
- for (int x = 0; x < 16; x++)
- {
- Boxes[x, y] = new System.Windows.Forms.PictureBox();
- PictureBox box = Boxes[x, y];
- ((System.ComponentModel.ISupportInitialize)(box)).BeginInit();
- box.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- box.Name = x + "," + y;
- box.Location = new System.Drawing.Point(x * 16, y * 16);
- box.Size = new System.Drawing.Size(16, 16);
- box.Visible = true;
- //box.MouseUp += new MouseEventHandler(box_MouseUp);
- ((System.ComponentModel.ISupportInitialize)(box)).EndInit();
-
- TabPage.Controls.Add(box);
- }
- }
- }
-
- public override void Paint(object sender, PaintEventArgs e)
- {
- ;
- }
-
- void Terrain_OnLandPatch(Simulator simulator, int x, int y, int width, float[] data)
- {
- if (x >= 16 || y >= 16)
- {
- Console.WriteLine("Bad patch coordinates, x = " + x + ", y = " + y);
- return;
- }
-
- if (width != 16)
- {
- Console.WriteLine("Unhandled patch size " + width + "x" + width);
- return;
- }
-
- Bitmap patch = new Bitmap(16, 16, PixelFormat.Format24bppRgb);
-
- for (int yp = 0; yp < 16; yp++)
- {
- for (int xp = 0; xp < 16; xp++)
- {
- float height = data[yp * 16 + xp];
- int colorVal = Utils.FloatToByte(height, 0.0f, 60.0f);
- int lesserVal = (int)((float)colorVal * 0.75f);
- Color color;
-
- if (height >= simulator.WaterHeight)
- color = Color.FromArgb(lesserVal, colorVal, lesserVal);
- else
- color = Color.FromArgb(lesserVal, lesserVal, colorVal);
-
- patch.SetPixel(xp, yp, color);
- }
- }
-
- Boxes[x, y].Image = (System.Drawing.Image)patch;
- }
- }
-}
diff --git a/Programs/examples/GUITestClient/Interfaces/MinimapInterface.cs b/Programs/examples/GUITestClient/Interfaces/MinimapInterface.cs
deleted file mode 100644
index 022b0f5c..00000000
--- a/Programs/examples/GUITestClient/Interfaces/MinimapInterface.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing.Imaging;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using OpenMetaverse;
-using System.Net;
-using System.Diagnostics;
-
-namespace OpenMetaverse.GUITestClient
-{
- public class MinimapInterface : Interface
- {
- //A magic number to calculate index sim y coord from actual coord
- private const int GRID_Y_OFFSET = 1279;
- //Base URL for web map api sim images
- private const String MAP_IMG_URL = "http://secondlife.com/apps/mapapi/grid/map_image/";
- private PictureBox world = new PictureBox();
- private Button cmdRefresh = new Button();
- private System.Drawing.Image mMapImage = null;
- private string oldSim = String.Empty;
-
- public MinimapInterface(frmTestClient testClient)
- {
- Name = "Minimap";
- Description = "Displays a graphical minimap of the current simulator";
- }
-
- private void map_onclick(object sender, System.EventArgs e)
- {
- ;
- }
-
- private void cmdRefresh_onclick(object sender, System.EventArgs e)
- {
- printMap();
- }
-
- public void printMap()
- {
- Bitmap map = new Bitmap(256, 256, PixelFormat.Format32bppRgb);
- Font font = new Font("Tahoma", 8, FontStyle.Bold);
- Pen mAvPen = new Pen(Brushes.GreenYellow, 1);
- Brush mAvBrush = new SolidBrush(Color.Green);
- String strInfo = String.Empty;
-
- // Get new background map if necessary
- if (mMapImage == null || oldSim != Client.Network.CurrentSim.Name)
- {
- oldSim = Client.Network.CurrentSim.Name;
- mMapImage = DownloadWebMapImage();
- }
-
- // Create in memory bitmap
- using (Graphics g = Graphics.FromImage(map))
- {
- // Draw background map
- g.DrawImage(mMapImage, new Rectangle(0, 0, 256, 256), 0, 0, 256, 256, GraphicsUnit.Pixel);
-
- // Draw all avatars
- Client.Network.CurrentSim.AvatarPositions.ForEach(
- delegate(Vector3 pos)
- {
- Rectangle rect = new Rectangle((int)Math.Round(pos.X, 0) - 2, 255 - ((int)Math.Round(pos.Y, 0) - 2), 4, 4);
- g.FillEllipse(mAvBrush, rect);
- g.DrawEllipse(mAvPen, rect);
- }
- );
-
- // Draw self ;)
- Rectangle myrect = new Rectangle((int)Math.Round(Client.Self.SimPosition.X, 0) - 3, 255 - ((int)Math.Round(Client.Self.SimPosition.Y, 0) - 3), 6, 6);
- g.FillEllipse(new SolidBrush(Color.Yellow), myrect);
- g.DrawEllipse(new Pen(Brushes.Goldenrod, 1), myrect);
-
- // Draw region info
- strInfo = string.Format("Sim {0}/{1}/{2}/{3}\nAvatars {4}", Client.Network.CurrentSim.Name,
- Math.Round(Client.Self.SimPosition.X, 0),
- Math.Round(Client.Self.SimPosition.Y, 0),
- Math.Round(Client.Self.SimPosition.Z, 0),
- Client.Network.CurrentSim.AvatarPositions.Count);
- g.DrawString(strInfo, font, Brushes.DarkOrange, 4, 4);
- }
- // update picture box with new map bitmap
- world.BackgroundImage = map;
- }
-
- public override void Initialize()
- {
- ((System.ComponentModel.ISupportInitialize)(world)).BeginInit();
- world.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- world.Size = new System.Drawing.Size(256, 256);
- world.Visible = true;
- world.Click += new System.EventHandler(this.map_onclick);
- ((System.ComponentModel.ISupportInitialize)(world)).EndInit();
-
- //((System.ComponentModel.ISupportInitialize)(cmdRefresh)).BeginInit();
- cmdRefresh.Text = "Refresh";
- cmdRefresh.Size = new System.Drawing.Size(80, 24);
- cmdRefresh.Left = world.Left + world.Width + 20;
- cmdRefresh.Click += new System.EventHandler(this.cmdRefresh_onclick);
- cmdRefresh.Visible = true;
- //((System.ComponentModel.ISupportInitialize)(world)).EndInit();
-
- TabPage.Controls.Add(world);
- TabPage.Controls.Add(cmdRefresh);
- }
-
- // Ripped from "Terrain Sculptor" by Cadroe with minors changes
- // http://spinmass.blogspot.com/2007/08/terrain-sculptor-maps-sims-and-creates.html
- private System.Drawing.Image DownloadWebMapImage()
- {
- HttpWebRequest request = null;
- HttpWebResponse response = null;
- String imgURL = "";
- GridRegion currRegion;
-
- Client.Grid.GetGridRegion(Client.Network.CurrentSim.Name, GridLayerType.Terrain, out currRegion);
- try
- {
- //Form the URL using the sim coordinates
- imgURL = MAP_IMG_URL + currRegion.X.ToString() + "-" +
- (GRID_Y_OFFSET - currRegion.Y).ToString() + "-1-0";
- //Make the http request
- request = (HttpWebRequest)HttpWebRequest.Create(imgURL);
- request.Timeout = 5000;
- request.ReadWriteTimeout = 20000;
- response = (HttpWebResponse)request.GetResponse();
-
- return System.Drawing.Image.FromStream(response.GetResponseStream());
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.ToString(), "Error Downloading Web Map Image");
- return null;
- }
- }
-
- public override void Paint(object sender, PaintEventArgs e)
- {
- ;
- }
- }
-}
diff --git a/Programs/examples/GUITestClient/Interfaces/TeleportInterface.cs b/Programs/examples/GUITestClient/Interfaces/TeleportInterface.cs
deleted file mode 100644
index ef4cf5aa..00000000
--- a/Programs/examples/GUITestClient/Interfaces/TeleportInterface.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Drawing.Imaging;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using OpenMetaverse;
-
-namespace OpenMetaverse.GUITestClient
-{
- class TeleportInterface : Interface
- {
- private System.Windows.Forms.Button cmdTeleport;
- private System.Windows.Forms.TextBox txtLocation;
- private System.Windows.Forms.Label lblLocation;
-
- public TeleportInterface(frmTestClient testClient)
- {
- Name = "Teleport";
- Description = "Teleport your's agent in SL Grid";
- }
-
- public override void Initialize()
- {
- txtLocation = new System.Windows.Forms.TextBox();
- txtLocation.Size = new System.Drawing.Size(238, 24);
- txtLocation.Top = 100;
- txtLocation.Left = 12;
-
- lblLocation = new System.Windows.Forms.Label();
- lblLocation.Size = new System.Drawing.Size(238, 24);
- lblLocation.Top = txtLocation.Top - 16;
- lblLocation.Left = txtLocation.Left;
- lblLocation.Text = "Location (eg: sim/x/y/z)";
-
- cmdTeleport = new System.Windows.Forms.Button();
- cmdTeleport.Size = new System.Drawing.Size(120, 24);
- cmdTeleport.Top = 100; cmdTeleport.Left = 257;
- cmdTeleport.Text = "Teleport !";
- cmdTeleport.Click += new System.EventHandler(this.cmdTeleport_OnClick);
-
- TabPage.Controls.Add(txtLocation);
- TabPage.Controls.Add(lblLocation);
- TabPage.Controls.Add(cmdTeleport);
- }
-
- private void cmdTeleport_OnClick(object sender, System.EventArgs e)
- {
- String destination = txtLocation.Text.Trim();
-
- string[] tokens = destination.Split(new char[] { '/' });
- if (tokens.Length != 4)
- goto error_handler;
-
- string sim = tokens[0];
- float x, y, z;
- if (!float.TryParse(tokens[1], out x) ||
- !float.TryParse(tokens[2], out y) ||
- !float.TryParse(tokens[3], out z))
- {
- goto error_handler;
- }
-
- if (Client.Self.Teleport(sim, new Vector3(x, y, z)))
- MessageBox.Show("Teleported to " + Client.Network.CurrentSim, "Teleport");
- else
- MessageBox.Show("Teleport failed: " + Client.Self.TeleportMessage, "Teleport");
- return;
-
- error_handler:
- MessageBox.Show("Location must to be sim/x/y/z", "Teleport");
- }
-
- public override void Paint(object sender, PaintEventArgs e)
- {
- ;
- }
- }
-}
diff --git a/Programs/examples/GUITestClient/Properties/AssemblyInfo.cs b/Programs/examples/GUITestClient/Properties/AssemblyInfo.cs
deleted file mode 100644
index 77d43fdc..00000000
--- a/Programs/examples/GUITestClient/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("GUITestClient")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Metaverse Industries LLC")]
-[assembly: AssemblyProduct("GUITestClient")]
-[assembly: AssemblyCopyright("Copyright © Metaverse Industries LLC 2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("07b6c35c-78c2-4850-8ece-d99e1284959f")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Programs/examples/GUITestClient/Properties/Resources.Designer.cs b/Programs/examples/GUITestClient/Properties/Resources.Designer.cs
deleted file mode 100644
index 07df7ab5..00000000
--- a/Programs/examples/GUITestClient/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace GUITestClient.Properties {
- using System;
-
-
- ///
- /// A strongly-typed resource class, for looking up localized strings, etc.
- ///
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
-
- ///
- /// Returns the cached ResourceManager instance used by this class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GUITestClient.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- ///
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
- }
- set {
- resourceCulture = value;
- }
- }
- }
-}
diff --git a/Programs/examples/GUITestClient/Properties/Resources.resx b/Programs/examples/GUITestClient/Properties/Resources.resx
deleted file mode 100644
index ffecec85..00000000
--- a/Programs/examples/GUITestClient/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/Programs/examples/GUITestClient/Properties/Settings.Designer.cs b/Programs/examples/GUITestClient/Properties/Settings.Designer.cs
deleted file mode 100644
index a3ead552..00000000
--- a/Programs/examples/GUITestClient/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace GUITestClient.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default {
- get {
- return defaultInstance;
- }
- }
- }
-}
diff --git a/Programs/examples/GUITestClient/Properties/Settings.settings b/Programs/examples/GUITestClient/Properties/Settings.settings
deleted file mode 100644
index abf36c5d..00000000
--- a/Programs/examples/GUITestClient/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/Programs/examples/GUITestClient/frmTestClient.Designer.cs b/Programs/examples/GUITestClient/frmTestClient.Designer.cs
deleted file mode 100644
index f2e8feee..00000000
--- a/Programs/examples/GUITestClient/frmTestClient.Designer.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-namespace OpenMetaverse.GUITestClient
-{
- partial class frmTestClient
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.tabControl = new System.Windows.Forms.TabControl();
- this.tabLogin = new System.Windows.Forms.TabPage();
- this.cmdConnect = new System.Windows.Forms.Button();
- this.label3 = new System.Windows.Forms.Label();
- this.txtPassword = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.txtLastName = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.txtFirstName = new System.Windows.Forms.TextBox();
- this.tabControl.SuspendLayout();
- this.tabLogin.SuspendLayout();
- this.SuspendLayout();
- //
- // tabControl
- //
- this.tabControl.Controls.Add(this.tabLogin);
- this.tabControl.Location = new System.Drawing.Point(12, 12);
- this.tabControl.Name = "tabControl";
- this.tabControl.SelectedIndex = 0;
- this.tabControl.Size = new System.Drawing.Size(400, 400);
- this.tabControl.TabIndex = 0;
- //
- // tabLogin
- //
- this.tabLogin.Controls.Add(this.cmdConnect);
- this.tabLogin.Controls.Add(this.label3);
- this.tabLogin.Controls.Add(this.txtPassword);
- this.tabLogin.Controls.Add(this.label2);
- this.tabLogin.Controls.Add(this.txtLastName);
- this.tabLogin.Controls.Add(this.label1);
- this.tabLogin.Controls.Add(this.txtFirstName);
- this.tabLogin.Location = new System.Drawing.Point(4, 22);
- this.tabLogin.Name = "tabLogin";
- this.tabLogin.Padding = new System.Windows.Forms.Padding(3);
- this.tabLogin.Size = new System.Drawing.Size(392, 374);
- this.tabLogin.TabIndex = 0;
- this.tabLogin.Text = "Login";
- this.tabLogin.UseVisualStyleBackColor = true;
- //
- // cmdConnect
- //
- this.cmdConnect.Location = new System.Drawing.Point(257, 181);
- this.cmdConnect.Name = "cmdConnect";
- this.cmdConnect.Size = new System.Drawing.Size(120, 24);
- this.cmdConnect.TabIndex = 59;
- this.cmdConnect.Text = "Connect";
- this.cmdConnect.Click += new System.EventHandler(this.cmdConnect_Click);
- //
- // label3
- //
- this.label3.Location = new System.Drawing.Point(257, 139);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(120, 16);
- this.label3.TabIndex = 58;
- this.label3.Text = "Password";
- //
- // txtPassword
- //
- this.txtPassword.Location = new System.Drawing.Point(257, 155);
- this.txtPassword.Name = "txtPassword";
- this.txtPassword.PasswordChar = '*';
- this.txtPassword.Size = new System.Drawing.Size(120, 20);
- this.txtPassword.TabIndex = 57;
- //
- // label2
- //
- this.label2.Location = new System.Drawing.Point(138, 139);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(120, 16);
- this.label2.TabIndex = 56;
- this.label2.Text = "Last Name";
- //
- // txtLastName
- //
- this.txtLastName.Location = new System.Drawing.Point(138, 155);
- this.txtLastName.Name = "txtLastName";
- this.txtLastName.Size = new System.Drawing.Size(112, 20);
- this.txtLastName.TabIndex = 55;
- //
- // label1
- //
- this.label1.Location = new System.Drawing.Point(12, 139);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(120, 16);
- this.label1.TabIndex = 54;
- this.label1.Text = "First Name";
- //
- // txtFirstName
- //
- this.txtFirstName.Location = new System.Drawing.Point(12, 155);
- this.txtFirstName.Name = "txtFirstName";
- this.txtFirstName.Size = new System.Drawing.Size(120, 20);
- this.txtFirstName.TabIndex = 53;
- //
- // frmTestClient
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(427, 420);
- this.Controls.Add(this.tabControl);
- this.Name = "frmTestClient";
- this.Text = "GUI Test Client";
- this.Paint += new System.Windows.Forms.PaintEventHandler(this.frmTestClient_Paint);
- this.tabControl.ResumeLayout(false);
- this.tabLogin.ResumeLayout(false);
- this.tabLogin.PerformLayout();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private System.Windows.Forms.TabControl tabControl;
- private System.Windows.Forms.TabPage tabLogin;
- private System.Windows.Forms.Button cmdConnect;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.TextBox txtPassword;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox txtLastName;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.TextBox txtFirstName;
- }
-}
-
diff --git a/Programs/examples/GUITestClient/frmTestClient.cs b/Programs/examples/GUITestClient/frmTestClient.cs
deleted file mode 100644
index 16d60379..00000000
--- a/Programs/examples/GUITestClient/frmTestClient.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using System.Reflection;
-using OpenMetaverse;
-
-namespace OpenMetaverse.GUITestClient
-{
- public partial class frmTestClient : Form
- {
- private GridClient Client = new GridClient();
- private Dictionary Interfaces = new Dictionary();
-
- public frmTestClient()
- {
- Client.Network.OnLogin += new NetworkManager.LoginCallback(Network_OnLogin);
- Client.Settings.MULTIPLE_SIMS = false;
-
- InitializeComponent();
-
- RegisterAllPlugins(Assembly.GetExecutingAssembly());
- EnablePlugins(false);
- }
-
- private void Network_OnLogin(LoginStatus login, string message)
- {
- if (login == LoginStatus.Success)
- {
- EnablePlugins(true);
- }
- else if (login == LoginStatus.Failed)
- {
- BeginInvoke(
- (MethodInvoker)delegate()
- {
- MessageBox.Show(this, String.Format("Error logging in ({0}): {1}",
- Client.Network.LoginErrorKey, Client.Network.LoginMessage));
- cmdConnect.Text = "Connect";
- txtFirstName.Enabled = txtLastName.Enabled = txtPassword.Enabled = true;
- EnablePlugins(false);
- });
- }
- }
-
- private void cmdConnect_Click(object sender, EventArgs e)
- {
- if (cmdConnect.Text == "Connect")
- {
- cmdConnect.Text = "Disconnect";
- txtFirstName.Enabled = txtLastName.Enabled = txtPassword.Enabled = false;
-
- LoginParams loginParams = Client.Network.DefaultLoginParams(txtFirstName.Text, txtLastName.Text,
- txtPassword.Text, "GUITestClient", "1.0.0");
- Client.Network.BeginLogin(loginParams);
- }
- else
- {
- Client.Network.Logout();
- cmdConnect.Text = "Connect";
- txtFirstName.Enabled = txtLastName.Enabled = txtPassword.Enabled = true;
- EnablePlugins(false);
- }
- }
-
- private void EnablePlugins(bool enable)
- {
- tabControl.TabPages.Clear();
- tabControl.TabPages.Add(tabLogin);
-
- if (enable)
- {
- lock (Interfaces)
- {
- foreach (TabPage page in Interfaces.Values)
- {
- tabControl.TabPages.Add(page);
- }
- }
- }
- }
-
- private void RegisterAllPlugins(Assembly assembly)
- {
- foreach (Type t in assembly.GetTypes())
- {
- try
- {
- if (t.IsSubclassOf(typeof(Interface)))
- {
- ConstructorInfo[] infos = t.GetConstructors();
- Interface iface = (Interface)infos[0].Invoke(new object[] { this });
- RegisterPlugin(iface);
- }
- }
- catch (Exception e)
- {
- MessageBox.Show(e.ToString());
- }
- }
- }
-
- private void RegisterPlugin(Interface iface)
- {
- TabPage page = new TabPage();
- tabControl.TabPages.Add(page);
-
- iface.Client = Client;
- iface.TabPage = page;
-
- if (!Interfaces.ContainsKey(iface))
- {
- lock (Interfaces) Interfaces.Add(iface, page);
- }
-
- iface.Initialize();
-
- page.Text = iface.Name;
- page.ToolTipText = iface.Description;
- }
-
- private void frmTestClient_Paint(object sender, PaintEventArgs e)
- {
- lock (Interfaces)
- {
- foreach (Interface iface in Interfaces.Keys)
- {
- iface.Paint(sender, e);
- }
- }
- }
- }
-}
diff --git a/Programs/examples/GUITestClient/frmTestClient.resx b/Programs/examples/GUITestClient/frmTestClient.resx
deleted file mode 100644
index ff31a6db..00000000
--- a/Programs/examples/GUITestClient/frmTestClient.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index cc2f25ee..d09fa34a 100644
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
diff --git a/prebuild.xml b/prebuild.xml
index 4268070d..f048d4e7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -580,32 +580,6 @@
-
-
-
- ../../../bin/
-
-
-
-
- ../../../bin/
-
-
-
- ../../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-