diff --git a/Programs/SLImageUpload/SLImageUpload.cs b/Programs/GridImageUpload/GridImageUpload.cs similarity index 73% rename from Programs/SLImageUpload/SLImageUpload.cs rename to Programs/GridImageUpload/GridImageUpload.cs index 516f5161..be197c34 100644 --- a/Programs/SLImageUpload/SLImageUpload.cs +++ b/Programs/GridImageUpload/GridImageUpload.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Windows.Forms; -namespace SLImageUpload +namespace GridImageUpload { - static class SLImageUpload + static class GridImageUpload { /// /// The main entry point for the application. @@ -14,7 +14,7 @@ namespace SLImageUpload { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new frmSLImageUpload()); + Application.Run(new frmGridImageUpload()); } } } \ No newline at end of file diff --git a/Programs/SLImageUpload/Properties/AssemblyInfo.cs b/Programs/GridImageUpload/Properties/AssemblyInfo.cs similarity index 80% rename from Programs/SLImageUpload/Properties/AssemblyInfo.cs rename to Programs/GridImageUpload/Properties/AssemblyInfo.cs index ff4bb59b..cdbdb584 100644 --- a/Programs/SLImageUpload/Properties/AssemblyInfo.cs +++ b/Programs/GridImageUpload/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ 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("SLImageUpload")] +[assembly: AssemblyTitle("GridImageUpload")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Metaverse Industries LLC")] -[assembly: AssemblyProduct("SLImageUpload")] -[assembly: AssemblyCopyright("Copyright © Metaverse Industries LLC 2007")] +[assembly: AssemblyCompany("openmetaverse.org")] +[assembly: AssemblyProduct("GridImageUpload")] +[assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Programs/SLImageUpload/Properties/Resources.Designer.cs b/Programs/GridImageUpload/Properties/Resources.Designer.cs similarity index 92% rename from Programs/SLImageUpload/Properties/Resources.Designer.cs rename to Programs/GridImageUpload/Properties/Resources.Designer.cs index 2700f07b..13781231 100644 --- a/Programs/SLImageUpload/Properties/Resources.Designer.cs +++ b/Programs/GridImageUpload/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace SLImageUpload.Properties +namespace GridImageUpload.Properties { @@ -44,7 +44,7 @@ namespace SLImageUpload.Properties { if ((resourceMan == null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SLImageUpload.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GridImageUpload.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Programs/SLImageUpload/Properties/Resources.resx b/Programs/GridImageUpload/Properties/Resources.resx similarity index 100% rename from Programs/SLImageUpload/Properties/Resources.resx rename to Programs/GridImageUpload/Properties/Resources.resx diff --git a/Programs/SLImageUpload/Properties/Settings.Designer.cs b/Programs/GridImageUpload/Properties/Settings.Designer.cs similarity index 100% rename from Programs/SLImageUpload/Properties/Settings.Designer.cs rename to Programs/GridImageUpload/Properties/Settings.Designer.cs diff --git a/Programs/SLImageUpload/Properties/Settings.settings b/Programs/GridImageUpload/Properties/Settings.settings similarity index 100% rename from Programs/SLImageUpload/Properties/Settings.settings rename to Programs/GridImageUpload/Properties/Settings.settings diff --git a/Programs/SLImageUpload/frmSLImageUpload.Designer.cs b/Programs/GridImageUpload/frmGridImageUpload.Designer.cs similarity index 96% rename from Programs/SLImageUpload/frmSLImageUpload.Designer.cs rename to Programs/GridImageUpload/frmGridImageUpload.Designer.cs index 3a7083ac..168af5b3 100644 --- a/Programs/SLImageUpload/frmSLImageUpload.Designer.cs +++ b/Programs/GridImageUpload/frmGridImageUpload.Designer.cs @@ -1,6 +1,6 @@ -namespace SLImageUpload +namespace GridImageUpload { - partial class frmSLImageUpload + partial class frmGridImageUpload { /// /// Required designer variable. @@ -230,7 +230,7 @@ namespace SLImageUpload this.cmdUpload.UseVisualStyleBackColor = true; this.cmdUpload.Click += new System.EventHandler(this.cmdUpload_Click); // - // frmSLImageUpload + // frmGridImageUpload // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -240,10 +240,10 @@ namespace SLImageUpload this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(410, 400); this.MinimumSize = new System.Drawing.Size(410, 400); - this.Name = "frmSLImageUpload"; + this.Name = "frmGridImageUpload"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.Text = "SL Image Upload"; - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.frmSLImageUpload_FormClosed); + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.frmGridImageUpload_FormClosed); this.grpLogin.ResumeLayout(false); this.grpLogin.PerformLayout(); this.grpUpload.ResumeLayout(false); diff --git a/Programs/SLImageUpload/frmSLImageUpload.cs b/Programs/GridImageUpload/frmGridImageUpload.cs similarity index 96% rename from Programs/SLImageUpload/frmSLImageUpload.cs rename to Programs/GridImageUpload/frmGridImageUpload.cs index 50455192..e191f060 100644 --- a/Programs/SLImageUpload/frmSLImageUpload.cs +++ b/Programs/GridImageUpload/frmGridImageUpload.cs @@ -10,9 +10,9 @@ using OpenMetaverse; using OpenMetaverse.Capabilities; using OpenMetaverse.Imaging; -namespace SLImageUpload +namespace GridImageUpload { - public partial class frmSLImageUpload : Form + public partial class frmGridImageUpload : Form { private GridClient Client; private byte[] UploadData = null; @@ -21,7 +21,7 @@ namespace SLImageUpload private LLUUID SendToID; private LLUUID AssetID; - public frmSLImageUpload() + public frmGridImageUpload() { InitializeComponent(); InitClient(); @@ -371,7 +371,7 @@ namespace SLImageUpload grpLogin.Enabled = true; } - private void frmSLImageUpload_FormClosed(object sender, FormClosedEventArgs e) + private void frmGridImageUpload_FormClosed(object sender, FormClosedEventArgs e) { if (Client.Network.Connected) Client.Network.Logout(); diff --git a/Programs/SLImageUpload/frmSLImageUpload.resx b/Programs/GridImageUpload/frmGridImageUpload.resx similarity index 100% rename from Programs/SLImageUpload/frmSLImageUpload.resx rename to Programs/GridImageUpload/frmGridImageUpload.resx diff --git a/Programs/SLProxy/SLProxy.cs b/Programs/GridProxy/GridProxy.cs similarity index 99% rename from Programs/SLProxy/SLProxy.cs rename to Programs/GridProxy/GridProxy.cs index 22b9140e..f63f91f1 100644 --- a/Programs/SLProxy/SLProxy.cs +++ b/Programs/GridProxy/GridProxy.cs @@ -1,5 +1,5 @@ /* - * SLProxy.cs: implementation of OpenMetaverse proxy library + * GridProxy.cs: implementation of OpenMetaverse proxy library * * Copyright (c) 2006 Austin Jennings * Pregen modifications made by Andrew Ortman on Dec 10, 2006 -> Dec 20, 2006 @@ -34,7 +34,6 @@ // #define DEBUG_CAPS // #define DEBUG_THREADS -using Nwc.XmlRpc; using System; using System.Collections.Generic; using System.IO; @@ -44,13 +43,13 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Xml; +using Nwc.XmlRpc; using OpenMetaverse; using OpenMetaverse.Capabilities; using OpenMetaverse.StructuredData; using OpenMetaverse.Packets; -// SLProxy: OpenMetaverse proxy library -namespace SLProxy +namespace GridProxy { // ProxyConfig: configuration for proxy objects public class ProxyConfig diff --git a/Programs/SLProxy/SLProxyLoader.cs b/Programs/GridProxy/GridProxyLoader.cs similarity index 96% rename from Programs/SLProxy/SLProxyLoader.cs rename to Programs/GridProxy/GridProxyLoader.cs index 9d144483..1cf87aed 100644 --- a/Programs/SLProxy/SLProxyLoader.cs +++ b/Programs/GridProxy/GridProxyLoader.cs @@ -1,8 +1,3 @@ -using SLProxy; -using OpenMetaverse; -using Nwc.XmlRpc; -using OpenMetaverse.Packets; -using System.Reflection; using System; using System.Collections.Generic; @@ -10,9 +5,14 @@ using System.Globalization; using System.IO; using System.Net; using System.Text.RegularExpressions; +using System.Reflection; +using Nwc.XmlRpc; +using OpenMetaverse; +using OpenMetaverse.Packets; +using GridProxy; -namespace SLProxy +namespace GridProxy { public class ProxyFrame { @@ -56,7 +56,7 @@ namespace SLProxy //bool externalPlugin = false; this.args = args; - ProxyConfig proxyConfig = new ProxyConfig("SLProxy", "Austin Jennings / Andrew Ortman", args); + ProxyConfig proxyConfig = new ProxyConfig("GridProxy", "Austin Jennings / Andrew Ortman", args); proxy = new Proxy(proxyConfig); // add delegates for login @@ -187,7 +187,7 @@ namespace SLProxy public void SayToUser(string message) { ChatFromSimulatorPacket packet = new ChatFromSimulatorPacket(); - packet.ChatData.FromName = Helpers.StringToField("SLProxy"); + packet.ChatData.FromName = Helpers.StringToField("GridProxy"); packet.ChatData.SourceID = LLUUID.Random(); packet.ChatData.OwnerID = agentID; packet.ChatData.SourceType = (byte)2; diff --git a/Programs/SLProxy/SLProxyMain.cs b/Programs/GridProxy/GridProxyMain.cs similarity index 93% rename from Programs/SLProxy/SLProxyMain.cs rename to Programs/GridProxy/GridProxyMain.cs index f3247d12..04430ca7 100644 --- a/Programs/SLProxy/SLProxyMain.cs +++ b/Programs/GridProxy/GridProxyMain.cs @@ -1,6 +1,6 @@ using System; using System.Reflection; -using SLProxy; +using GridProxy; class ProxyMain { diff --git a/Programs/SLProxy/Analyst.cs b/Programs/GridProxy/Plugins/Analyst.cs similarity index 99% rename from Programs/SLProxy/Analyst.cs rename to Programs/GridProxy/Plugins/Analyst.cs index db949683..1f2aa22b 100644 --- a/Programs/SLProxy/Analyst.cs +++ b/Programs/GridProxy/Plugins/Analyst.cs @@ -29,18 +29,18 @@ * POSSIBILITY OF SUCH DAMAGE. */ -using SLProxy; -using OpenMetaverse; -using Nwc.XmlRpc; -using OpenMetaverse.Packets; -using System.Reflection; - using System; using System.Collections; using System.Globalization; using System.IO; using System.Net; using System.Text.RegularExpressions; +using System.Reflection; +using Nwc.XmlRpc; +using OpenMetaverse; +using OpenMetaverse.Packets; +using GridProxy; + public class Analyst : ProxyPlugin { diff --git a/Programs/SLProxy/ClientAO/README.txt b/Programs/GridProxy/Plugins/ClientAO-README.txt similarity index 79% rename from Programs/SLProxy/ClientAO/README.txt rename to Programs/GridProxy/Plugins/ClientAO-README.txt index 78ca3a7b..199d31c1 100644 --- a/Programs/SLProxy/ClientAO/README.txt +++ b/Programs/GridProxy/Plugins/ClientAO-README.txt @@ -1,7 +1,6 @@ ClientAO by Issarlk Chatnoir - What is it? *********** @@ -23,10 +22,8 @@ How to use - Login like usual -- once logged in, load the ClientAO plugin: /load ClientAO.dll - -- Point it to a folder where you have previously put animations and a configuration - notecard, ex: /ao Objects/MyAO/*Default Anims +- Point the plugin to a folder where you have previously put animations and a + configuration notecard, ex: /ao Objects/MyAO/*Default Anims The AO will load the notecard. diff --git a/Programs/SLProxy/ClientAO/configuration sample.txt b/Programs/GridProxy/Plugins/ClientAO-configuration-sample.txt similarity index 100% rename from Programs/SLProxy/ClientAO/configuration sample.txt rename to Programs/GridProxy/Plugins/ClientAO-configuration-sample.txt diff --git a/Programs/SLProxy/ClientAO/ClientAO.cs b/Programs/GridProxy/Plugins/ClientAO.cs similarity index 97% rename from Programs/SLProxy/ClientAO/ClientAO.cs rename to Programs/GridProxy/Plugins/ClientAO.cs index 8a1928b7..ff6d6442 100644 --- a/Programs/SLProxy/ClientAO/ClientAO.cs +++ b/Programs/GridProxy/Plugins/ClientAO.cs @@ -1,5 +1,5 @@ /* - * ClientAO.cs: SLProxy application that acts as a client side animation overrider. + * ClientAO.cs: GridProxy application that acts as a client side animation overrider. * The application will start and stop animations corresponding to the movements * of the avatar on screen. * @@ -38,7 +38,7 @@ using OpenMetaverse; using OpenMetaverse.Packets; using OpenMetaverse.StructuredData; using Nwc.XmlRpc; -using SLProxy; +using GridProxy; public class ClientAO : ProxyPlugin diff --git a/Programs/SLProxy/README.txt b/Programs/GridProxy/README.txt similarity index 100% rename from Programs/SLProxy/README.txt rename to Programs/GridProxy/README.txt diff --git a/Programs/SLProxy/XmlRpcCS/Logger.cs b/Programs/GridProxy/XmlRpcCS/Logger.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/Logger.cs rename to Programs/GridProxy/XmlRpcCS/Logger.cs diff --git a/Programs/SLProxy/XmlRpcCS/SimpleHttpRequest.cs b/Programs/GridProxy/XmlRpcCS/SimpleHttpRequest.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/SimpleHttpRequest.cs rename to Programs/GridProxy/XmlRpcCS/SimpleHttpRequest.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcBoxcarRequest.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcBoxcarRequest.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcBoxcarRequest.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcBoxcarRequest.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcClientProxy.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcClientProxy.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcClientProxy.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcClientProxy.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcDeserializer.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcDeserializer.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcDeserializer.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcDeserializer.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcErrorCodes.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcErrorCodes.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcErrorCodes.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcErrorCodes.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcException.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcException.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcException.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcException.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcExposedAttribute.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcExposedAttribute.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcExposedAttribute.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcExposedAttribute.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcRequest.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcRequest.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcRequest.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcRequest.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcRequestDeserializer.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcRequestDeserializer.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcRequestDeserializer.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcRequestDeserializer.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcRequestSerializer.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcRequestSerializer.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcRequestSerializer.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcRequestSerializer.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcResponder.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcResponder.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcResponder.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcResponder.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcResponse.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcResponse.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcResponse.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcResponse.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcResponseDeserializer.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcResponseDeserializer.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcResponseDeserializer.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcResponseDeserializer.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcResponseSerializer.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcResponseSerializer.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcResponseSerializer.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcResponseSerializer.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcSerializer.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcSerializer.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcSerializer.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcSerializer.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcServer.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcServer.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcServer.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcServer.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcSystemObject.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcSystemObject.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcSystemObject.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcSystemObject.cs diff --git a/Programs/SLProxy/XmlRpcCS/XmlRpcXmlTokens.cs b/Programs/GridProxy/XmlRpcCS/XmlRpcXmlTokens.cs similarity index 100% rename from Programs/SLProxy/XmlRpcCS/XmlRpcXmlTokens.cs rename to Programs/GridProxy/XmlRpcCS/XmlRpcXmlTokens.cs diff --git a/Programs/SecondGlance/frmSecondGlance.cs b/Programs/SecondGlance/frmSecondGlance.cs index cfc336e5..fab0b37b 100644 --- a/Programs/SecondGlance/frmSecondGlance.cs +++ b/Programs/SecondGlance/frmSecondGlance.cs @@ -34,7 +34,7 @@ using System.Net; using System.Windows.Forms; using OpenMetaverse; using OpenMetaverse.Packets; -using SLProxy; +using GridProxy; namespace SecondGlance { diff --git a/Programs/examples/slaccountant/AssemblyInfo.cs b/Programs/examples/GridAccountant/AssemblyInfo.cs similarity index 100% rename from Programs/examples/slaccountant/AssemblyInfo.cs rename to Programs/examples/GridAccountant/AssemblyInfo.cs diff --git a/Programs/examples/slaccountant/frmSLAccountant.cs b/Programs/examples/GridAccountant/frmGridAccountant.cs similarity index 97% rename from Programs/examples/slaccountant/frmSLAccountant.cs rename to Programs/examples/GridAccountant/frmGridAccountant.cs index 67ba3f95..7cb7bbc2 100644 --- a/Programs/examples/slaccountant/frmSLAccountant.cs +++ b/Programs/examples/GridAccountant/frmGridAccountant.cs @@ -33,12 +33,12 @@ using System.Data; using OpenMetaverse; using OpenMetaverse.Packets; -namespace SLAccountant +namespace GridAccountant { /// /// Summary description for Form1. /// - public class frmSLAccountant : System.Windows.Forms.Form + public class frmGridAccountant : System.Windows.Forms.Form { private System.Windows.Forms.GroupBox grpLogin; private System.Windows.Forms.TextBox txtPassword; @@ -69,7 +69,7 @@ namespace SLAccountant private GridClient Client; - public frmSLAccountant() + public frmGridAccountant() { // // Required for Windows Form Designer support @@ -318,7 +318,7 @@ namespace SLAccountant this.colUuid.Text = "UUID"; this.colUuid.Width = 150; // - // frmSLAccountant + // frmGridAccountant // this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); this.ClientSize = new System.Drawing.Size(592, 437); @@ -334,9 +334,9 @@ namespace SLAccountant this.Controls.Add(this.lblName); this.Controls.Add(this.label4); this.Controls.Add(this.grpLogin); - this.Name = "frmSLAccountant"; - this.Text = "SL Accountant"; - this.Load += new System.EventHandler(this.frmSLAccountant_Load); + this.Name = "frmGridAccountant"; + this.Text = "Grid Accountant"; + this.Load += new System.EventHandler(this.frmGridAccountant_Load); this.grpLogin.ResumeLayout(false); this.ResumeLayout(false); @@ -349,7 +349,7 @@ namespace SLAccountant [STAThread] static void Main() { - frmSLAccountant frm = new frmSLAccountant(); + frmGridAccountant frm = new frmGridAccountant(); frm.ShowDialog(); } @@ -389,7 +389,7 @@ namespace SLAccountant } } - private void frmSLAccountant_Load(object sender, System.EventArgs e) + private void frmGridAccountant_Load(object sender, System.EventArgs e) { Client = new GridClient(); @@ -461,7 +461,7 @@ namespace SLAccountant txtFirstName.Enabled = txtLastName.Enabled = txtPassword.Enabled = false; LoginParams loginParams = Client.Network.DefaultLoginParams(txtFirstName.Text, txtLastName.Text, - txtPassword.Text, "slaccountant", "1.0.0"); + txtPassword.Text, "GridAccountant", "1.0.0"); Client.Network.BeginLogin(loginParams); } else @@ -513,7 +513,7 @@ namespace SLAccountant } Client.Self.GiveAvatarMoney(new LLUUID(lstFind.SelectedItems[0].SubItems[2].Text), - amount, "SLAccountant payment"); + amount, "GridAccountant payment"); } } } diff --git a/Programs/examples/slaccountant/frmSLAccountant.resx b/Programs/examples/GridAccountant/frmGridAccountant.resx similarity index 99% rename from Programs/examples/slaccountant/frmSLAccountant.resx rename to Programs/examples/GridAccountant/frmGridAccountant.resx index 85eaf362..637671ea 100644 --- a/Programs/examples/slaccountant/frmSLAccountant.resx +++ b/Programs/examples/GridAccountant/frmGridAccountant.resx @@ -320,7 +320,7 @@ True - frmSLAccountant + frmGridAccountant Private diff --git a/Programs/examples/sldump/sldump.cs b/Programs/examples/PacketDump/PacketDump.cs similarity index 96% rename from Programs/examples/sldump/sldump.cs rename to Programs/examples/PacketDump/PacketDump.cs index c3661ad0..c9a321c9 100644 --- a/Programs/examples/sldump/sldump.cs +++ b/Programs/examples/PacketDump/PacketDump.cs @@ -30,9 +30,9 @@ using System.Threading; using OpenMetaverse; using OpenMetaverse.Packets; -namespace sldump +namespace PacketDump { - class sldump + class PacketDump { static bool LoginSuccess = false; static AutoResetEvent LoginEvent = new AutoResetEvent(false); @@ -65,7 +65,7 @@ namespace sldump if (args.Length == 0 || (args.Length < 4 && args[0] != "--printmap")) { - Console.WriteLine("Usage: sldump [--printmap] [--decrypt] [inputfile] [outputfile] " + Console.WriteLine("Usage: PacketDump [--printmap] [--decrypt] [inputfile] [outputfile] " + "[--protocol] [firstname] [lastname] [password] [seconds (0 for infinite)]"); return; } @@ -117,8 +117,7 @@ namespace sldump client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(DisconnectHandler); client.Network.OnLogin += new NetworkManager.LoginCallback(Network_OnLogin); - client.Network.BeginLogin(client.Network.DefaultLoginParams(args[0], args[1], args[2], "sldump", - "contact@OpenMetaverse.org")); + client.Network.BeginLogin(client.Network.DefaultLoginParams(args[0], args[1], args[2], "PacketDump", "1.0.0")); LoginEvent.WaitOne(); diff --git a/prebuild.xml b/prebuild.xml index 9cc12bfe..3cb78127 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -103,6 +103,31 @@ + + + + + ../../bin/ + + + + + ../../bin/ + + + + ../../bin/ + + + + + + + + + + + @@ -193,7 +218,7 @@ - + frmSecondGlance.resx @@ -201,7 +226,7 @@ - + ../../bin/ @@ -221,12 +246,12 @@ - frmSLImageUpload.resx + frmGridImageUpload.resx - - + + ../../bin/ @@ -241,10 +266,10 @@ ../../bin/ - + - + @@ -370,7 +395,7 @@ - + ../../../bin/ @@ -390,12 +415,12 @@ - frmSLAccountant.resx + frmGridAccountant.resx - + ../../../bin/