diff --git a/Decoder/Decoder.cs b/Decoder/Decoder.cs index 05595226..956d4c51 100644 --- a/Decoder/Decoder.cs +++ b/Decoder/Decoder.cs @@ -10,7 +10,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -32,13 +32,13 @@ using System.Globalization; using System.IO; using System.Text.RegularExpressions; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; class Decoder { private static int BUFSIZE = 8096; - private static SecondLife client = new SecondLife(); + private static GridClient client = new GridClient(); private static string grep = null; private static byte[] data = new byte[BUFSIZE]; private static byte[] temp = new byte[BUFSIZE]; @@ -181,7 +181,7 @@ class Decoder { if (grep != null) { bool match = false; - //FIXME: This needs to be updated for the new libsecondlife API + //FIXME: This needs to be updated for the new API //foreach (Block block in packet.Blocks()) //{ // foreach (Field field in block.Fields) diff --git a/Decoder/Decoder.csproj b/Decoder/Decoder.csproj index 4a6b676a..eaf5f5e3 100644 --- a/Decoder/Decoder.csproj +++ b/Decoder/Decoder.csproj @@ -45,9 +45,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse diff --git a/SLImageUpload/SLImageUpload.csproj b/SLImageUpload/SLImageUpload.csproj index 624c58a8..6537432c 100644 --- a/SLImageUpload/SLImageUpload.csproj +++ b/SLImageUpload/SLImageUpload.csproj @@ -79,9 +79,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse diff --git a/SLImageUpload/frmSLImageUpload.cs b/SLImageUpload/frmSLImageUpload.cs index 081b7cba..50455192 100644 --- a/SLImageUpload/frmSLImageUpload.cs +++ b/SLImageUpload/frmSLImageUpload.cs @@ -6,15 +6,15 @@ using System.Drawing; using System.Text; using System.Windows.Forms; using System.Threading; -using libsecondlife; -using libsecondlife.Capabilities; -using libsecondlife.Imaging; +using OpenMetaverse; +using OpenMetaverse.Capabilities; +using OpenMetaverse.Imaging; namespace SLImageUpload { public partial class frmSLImageUpload : Form { - private SecondLife Client; + private GridClient Client; private byte[] UploadData = null; private int Transferred = 0; private string FileName = String.Empty; @@ -29,7 +29,7 @@ namespace SLImageUpload private void InitClient() { - Client = new SecondLife(); + Client = new GridClient(); Client.Network.OnEventQueueRunning += new NetworkManager.EventQueueRunningCallback(Network_OnEventQueueRunning); Client.Network.OnLogin += new NetworkManager.LoginCallback(Network_OnLogin); diff --git a/SLProxy/Analyst.cs b/SLProxy/Analyst.cs index 374316c3..db949683 100644 --- a/SLProxy/Analyst.cs +++ b/SLProxy/Analyst.cs @@ -12,7 +12,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -30,9 +30,9 @@ */ using SLProxy; -using libsecondlife; +using OpenMetaverse; using Nwc.XmlRpc; -using libsecondlife.Packets; +using OpenMetaverse.Packets; using System.Reflection; using System; @@ -49,7 +49,7 @@ public class Analyst : ProxyPlugin private Hashtable loggedPackets = new Hashtable(); private string logGrep = null; private Hashtable modifiedPackets = new Hashtable(); - private Assembly libslAssembly; + private Assembly openmvAssembly; public Analyst(ProxyFrame frame) { @@ -59,8 +59,8 @@ public class Analyst : ProxyPlugin public override void Init() { - libslAssembly = Assembly.Load("libsecondlife"); - if (libslAssembly == null) throw new Exception("Assembly load exception"); + openmvAssembly = Assembly.Load("OpenMetaverse"); + if (openmvAssembly == null) throw new Exception("Assembly load exception"); // build the table of /command delegates InitializeCommandDelegates(); @@ -306,7 +306,7 @@ public class Analyst : ProxyPlugin } name = lineName; - packetClass = libslAssembly.GetType("libsecondlife.Packets." + name + "Packet"); + packetClass = openmvAssembly.GetType("OpenMetaverse.Packets." + name + "Packet"); if (packetClass == null) throw new Exception("Couldn't get class " + name + "Packet"); ConstructorInfo ctr = packetClass.GetConstructor(new Type[] { }); if (ctr == null) throw new Exception("Couldn't get suitable constructor for " + name + "Packet"); @@ -457,7 +457,7 @@ public class Analyst : ProxyPlugin // MagicCast: given a packet/block/field name and a string, convert the string to a value of the appropriate type private object MagicCast(string name, string block, string field, string value) { - Type packetClass = libslAssembly.GetType("libsecondlife.Packets." + name + "Packet"); + Type packetClass = openmvAssembly.GetType("OpenMetaverse.Packets." + name + "Packet"); if (packetClass == null) throw new Exception("Couldn't get class " + name + "Packet"); FieldInfo blockField = packetClass.GetField(block); diff --git a/SLProxy/ChatConsole.cs b/SLProxy/ChatConsole.cs index b2b9b1d1..c3a6b04a 100644 --- a/SLProxy/ChatConsole.cs +++ b/SLProxy/ChatConsole.cs @@ -1,6 +1,6 @@ /* * ChatConsole.cs: sample SLProxy appliation that writes chat to the console. - * Typing on the console will send chat to Second Life. + * Typing on the console will send chat to the grid. * * Copyright (c) 2006 Austin Jennings * Modified by Andrew Ortman ("qode") on Decemeber 21, 2006 to work with the new pregen proxy. @@ -11,7 +11,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,8 +29,8 @@ */ using SLProxy; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using Nwc.XmlRpc; using System; diff --git a/SLProxy/ChatConsole.csproj b/SLProxy/ChatConsole.csproj index 4c2316e7..a42b771e 100644 --- a/SLProxy/ChatConsole.csproj +++ b/SLProxy/ChatConsole.csproj @@ -96,9 +96,9 @@ System.XML - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse SLProxy diff --git a/SLProxy/SLProxy.cs b/SLProxy/SLProxy.cs index 60c86ed8..22b9140e 100644 --- a/SLProxy/SLProxy.cs +++ b/SLProxy/SLProxy.cs @@ -1,5 +1,5 @@ /* - * SLProxy.cs: implementation of Second Life proxy library + * SLProxy.cs: implementation of OpenMetaverse proxy library * * Copyright (c) 2006 Austin Jennings * Pregen modifications made by Andrew Ortman on Dec 10, 2006 -> Dec 20, 2006 @@ -12,7 +12,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -44,12 +44,12 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Xml; -using libsecondlife; -using libsecondlife.Capabilities; -using libsecondlife.StructuredData; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Capabilities; +using OpenMetaverse.StructuredData; +using OpenMetaverse.Packets; -// SLProxy: proxy library for Second Life +// SLProxy: OpenMetaverse proxy library namespace SLProxy { // ProxyConfig: configuration for proxy objects @@ -65,7 +65,7 @@ namespace SLProxy public IPAddress clientFacingAddress = IPAddress.Loopback; // remoteFacingAddress: address from which to communicate with the server public IPAddress remoteFacingAddress = IPAddress.Any; - // remoteLoginUri: URI for Second Life's login server + // remoteLoginUri: URI for the login server public Uri remoteLoginUri = new Uri("https://login.agni.lindenlab.com/cgi-bin/login.cgi"); // verbose: whether or not to print informative messages public bool verbose = true; @@ -167,7 +167,7 @@ namespace SLProxy } } - // Proxy: Second Life proxy server + // Proxy: OpenMetaverse proxy server // A Proxy instance is only prepared to deal with one client at a time. public class Proxy { @@ -1554,7 +1554,7 @@ namespace SLProxy // interpret the packet according to the SL protocol int end = length - 1; - Packet packet = libsecondlife.Packets.Packet.BuildPacket(receiveBuffer, ref end, zeroBuffer); + Packet packet = OpenMetaverse.Packets.Packet.BuildPacket(receiveBuffer, ref end, zeroBuffer); #if DEBUG_SEQUENCE Console.WriteLine("-> " + packet.Type + " #" + packet.Header.Sequence); diff --git a/SLProxy/SLProxy.csproj b/SLProxy/SLProxy.csproj index 01d8ed1c..5245988f 100644 --- a/SLProxy/SLProxy.csproj +++ b/SLProxy/SLProxy.csproj @@ -125,9 +125,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse diff --git a/SLProxy/SLProxyLoader.cs b/SLProxy/SLProxyLoader.cs index c057e273..9d144483 100644 --- a/SLProxy/SLProxyLoader.cs +++ b/SLProxy/SLProxyLoader.cs @@ -1,7 +1,7 @@ using SLProxy; -using libsecondlife; +using OpenMetaverse; using Nwc.XmlRpc; -using libsecondlife.Packets; +using OpenMetaverse.Packets; using System.Reflection; using System; diff --git a/SecondGlance/SecondGlance.csproj b/SecondGlance/SecondGlance.csproj index 2e63e380..d3008c4c 100644 --- a/SecondGlance/SecondGlance.csproj +++ b/SecondGlance/SecondGlance.csproj @@ -78,9 +78,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse {E4115DC9-FC88-47D6-B3B6-2400AD19B80D} diff --git a/SecondGlance/frmSecondGlance.cs b/SecondGlance/frmSecondGlance.cs index cad80e24..cfc336e5 100644 --- a/SecondGlance/frmSecondGlance.cs +++ b/SecondGlance/frmSecondGlance.cs @@ -1,6 +1,6 @@ /* * - * Copyright (c) 2007 John Hurliman + * Copyright (c) 2007 openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -8,7 +8,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -32,8 +32,8 @@ using System.Data; using System.Drawing; using System.Net; using System.Windows.Forms; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using SLProxy; namespace SecondGlance diff --git a/VoiceTest/VoiceTest.cs b/VoiceTest/VoiceTest.cs index f53cc453..84a50293 100644 --- a/VoiceTest/VoiceTest.cs +++ b/VoiceTest/VoiceTest.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2007, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,8 +27,8 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Utilities; +using OpenMetaverse; +using OpenMetaverse.Utilities; namespace VoiceTest { @@ -70,7 +70,7 @@ namespace VoiceTest string password = args[2]; - SecondLife client = new SecondLife(); + GridClient client = new GridClient(); client.Settings.MULTIPLE_SIMS = false; Settings.LOG_LEVEL = Helpers.LogLevel.None; client.Settings.LOG_RESENDS = false; @@ -108,11 +108,10 @@ namespace VoiceTest Console.WriteLine(); - // Login to SL - Console.WriteLine("Logging in to Second Life as " + firstName + " " + lastName + "..."); + // Login + Console.WriteLine("Logging into the grid as " + firstName + " " + lastName + "..."); LoginParams loginParams = - client.Network.DefaultLoginParams(firstName, lastName, password, "Voice Test", - "Metaverse Industries LLC "); + client.Network.DefaultLoginParams(firstName, lastName, password, "Voice Test", "1.0.0"); loginParams.URI = loginURI; if (!client.Network.Login(loginParams)) throw new VoiceException("Login to SL failed: " + client.Network.LoginMessage); diff --git a/VoiceTest/VoiceTest.csproj b/VoiceTest/VoiceTest.csproj index 2631a8d3..01cb3b1d 100644 --- a/VoiceTest/VoiceTest.csproj +++ b/VoiceTest/VoiceTest.csproj @@ -47,13 +47,13 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse - + {CE5E06C2-2428-416B-ADC1-F1FE16A0FB27} - libsecondlife.Utilities + OpenMetaverse.Utilities diff --git a/importprimscript/importprimscript.cs b/importprimscript/importprimscript.cs index bdb2d392..a1ab50f5 100644 --- a/importprimscript/importprimscript.cs +++ b/importprimscript/importprimscript.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Threading; using System.IO; using System.Drawing; -using libsecondlife; -using libsecondlife.Capabilities; -using libsecondlife.Imaging; +using OpenMetaverse; +using OpenMetaverse.Capabilities; +using OpenMetaverse.Imaging; namespace importprimscript { @@ -22,7 +22,7 @@ namespace importprimscript class importprimscript { - static SecondLife Client = new SecondLife(); + static GridClient Client = new GridClient(); static Sculpt CurrentSculpt = null; static AutoResetEvent RezzedEvent = new AutoResetEvent(false); static LLVector3 RootPosition = LLVector3.Zero; diff --git a/importprimscript/importprimscript.csproj b/importprimscript/importprimscript.csproj index d0935d91..0f4a16aa 100644 --- a/importprimscript/importprimscript.csproj +++ b/importprimscript/importprimscript.csproj @@ -48,9 +48,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse diff --git a/libsecondlife/AgentManager.cs b/libsecondlife/AgentManager.cs index 68061049..b65374bb 100644 --- a/libsecondlife/AgentManager.cs +++ b/libsecondlife/AgentManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -30,11 +30,11 @@ using System.Collections.Generic; using System.Threading; using System.Text; using System.Reflection; -using libsecondlife.StructuredData; -using libsecondlife.Capabilities; -using libsecondlife.Packets; +using OpenMetaverse.StructuredData; +using OpenMetaverse.Capabilities; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { #region Enums @@ -554,7 +554,6 @@ namespace libsecondlife /// /// Manager class for our own avatar /// - /// This class is instantianted automatically by the SecondLife class. public partial class AgentManager { #region Enums @@ -925,8 +924,8 @@ namespace libsecondlife public event AvatarSitResponseCallback OnAvatarSitResponse; #endregion - /// Reference to the SecondLife client object - public readonly SecondLife Client; + /// Reference to the GridClient object + public readonly GridClient Client; /// Used for movement and camera tracking public readonly AgentMovement Movement; /// Currently playing animations for the agent. Can be used to @@ -941,26 +940,26 @@ namespace libsecondlife #region Properties - /// Your (client) avatars + /// Your (client) avatars /// "client", "agent", and "avatar" all represent the same thing public LLUUID AgentID { get { return id; } } - /// Temporary assigned to this session, used for + /// Temporary assigned to this session, used for /// verifying our identity in packets public LLUUID SessionID { get { return sessionID; } } - /// Shared secret that is never sent over the wire + /// Shared secret that is never sent over the wire public LLUUID SecureSessionID { get { return secureSessionID; } } /// Your (client) avatar ID, local to the current region/sim public uint LocalID { get { return localID; } } /// Where the avatar started at login. Can be "last", "home" - /// or a login + /// or a login public string StartLocation { get { return startLocation; } } /// The access level of this agent, usually M or PG public string AgentAccess { get { return agentAccess; } } /// public LLVector4 CollisionPlane { get { return collisionPlane; } } - /// An representing the velocity of our agent + /// An representing the velocity of our agent public LLVector3 Velocity { get { return velocity; } } - /// An representing the acceleration of our agent + /// An representing the acceleration of our agent public LLVector3 Acceleration { get { return acceleration; } } /// public LLVector3 AngularVelocity { get { return angularVelocity; } } @@ -992,7 +991,7 @@ namespace libsecondlife /// Gets the local ID of the prim the agent is sitting on, /// zero if the avatar is not currently sitting public uint SittingOn { get { return sittingOn; } } - /// Gets the of the agents active group. + /// Gets the of the agents active group. public LLUUID ActiveGroup { get { return activeGroup; } } /// Current status message for teleporting public string TeleportMessage { get { return teleportMessage; } } @@ -1028,7 +1027,7 @@ namespace libsecondlife } } /// - /// A representing the agents current rotation + /// A representing the agents current rotation /// public LLQuaternion SimRotation { @@ -1111,8 +1110,8 @@ namespace libsecondlife /// /// Constructor, setup callbacks for packets related to our avatar /// - /// A reference to the Class - public AgentManager(SecondLife client) + /// A reference to the Class + public AgentManager(GridClient client) { Client = client; Movement = new AgentMovement(Client); @@ -1315,7 +1314,7 @@ namespace libsecondlife /// /// Send an Instant Message to a group /// - /// of the group to send message to + /// of the group to send message to /// Text Message being sent. public void InstantMessageGroup(LLUUID groupUUID, string message) { @@ -1326,7 +1325,7 @@ namespace libsecondlife /// Send an Instant Message to a group /// /// The name this IM will show up as being from - /// of the group to send message to + /// of the group to send message to /// Text message being sent /// This does not appear to function with groups the agent is not in public void InstantMessageGroup(string fromName, LLUUID groupUUID, string message) @@ -1361,7 +1360,7 @@ namespace libsecondlife /// /// Send a request to join a group chat session /// - /// of Group to leave + /// of Group to leave public void RequestJoinGroupChat(LLUUID groupUUID) { ImprovedInstantMessagePacket im = new ImprovedInstantMessagePacket(); @@ -1385,7 +1384,7 @@ namespace libsecondlife /// Request self terminates group chat. This will stop Group IM's from showing up /// until session is rejoined or expires. /// - /// of Group to leave + /// of Group to leave public void RequestLeaveGroupChat(LLUUID groupUUID) { ImprovedInstantMessagePacket im = new ImprovedInstantMessagePacket(); @@ -1475,9 +1474,9 @@ namespace libsecondlife /// /// Key of the source agent /// Key of the target object - /// A representing the beams offset from the source + /// A representing the beams offset from the source /// A which sets the avatars lookat animation - /// of the Effect + /// of the Effect public void LookAtEffect(LLUUID sourceAvatar, LLUUID targetObject, LLVector3d globalOffset, LookAtType type, LLUUID effectID) { @@ -1540,12 +1539,12 @@ namespace libsecondlife /// /// Create a particle beam between an avatar and an primitive /// - /// of sources avatar - /// of the target - /// global offset - /// Color values of beam + /// of sources avatar + /// of the target + /// global offset + /// Color values of beam /// a float representing the duration the beam will last - /// of the Effect + /// of the Effect public void BeamEffect(LLUUID sourceAvatar, LLUUID targetObject, LLVector3d globalOffset, LLColor color, float duration, LLUUID effectID) { @@ -1765,7 +1764,7 @@ namespace libsecondlife /// Grabs an object /// /// an unsigned integer of the objects ID within the simulator - /// + /// public void Grab(uint objectLocalID) { ObjectGrabPacket grab = new ObjectGrabPacket(); @@ -1797,7 +1796,7 @@ namespace libsecondlife /// Releases a grabbed object /// /// an unsigned integer of the objects ID within the simulator - /// + /// public void DeGrab(uint objectLocalID) { ObjectDeGrabPacket degrab = new ObjectDeGrabPacket(); @@ -1811,7 +1810,7 @@ namespace libsecondlife /// Touches an object /// /// an unsigned integer of the objects ID within the simulator - /// + /// public void Touch(uint objectLocalID) { Client.Self.Grab(objectLocalID); @@ -1860,7 +1859,7 @@ namespace libsecondlife /// /// Give L$ to an object /// - /// object to give money to + /// object to give money to /// amount of L$ to give /// name of object public void GiveObjectMoney(LLUUID target, int amount, string objectName) @@ -1871,7 +1870,7 @@ namespace libsecondlife /// /// Give L$ to a group /// - /// group to give money to + /// group to give money to /// amount of L$ to give public void GiveGroupMoney(LLUUID target, int amount) { @@ -1881,7 +1880,7 @@ namespace libsecondlife /// /// Give L$ to a group /// - /// group to give money to + /// group to give money to /// amount of L$ to give /// description of transaction public void GiveGroupMoney(LLUUID target, int amount, string description) @@ -1941,7 +1940,7 @@ namespace libsecondlife /// /// Send an AgentAnimation packet that toggles a single animation on /// - /// The of the animation to start playing + /// The of the animation to start playing /// Whether to ensure delivery of this packet or not public void AnimationStart(LLUUID animation, bool reliable) { @@ -1954,7 +1953,7 @@ namespace libsecondlife /// /// Send an AgentAnimation packet that toggles a single animation off /// - /// The of a + /// The of a /// currently playing animation to stop playing /// Whether to ensure delivery of this packet or not public void AnimationStop(LLUUID animation, bool reliable) @@ -1968,7 +1967,7 @@ namespace libsecondlife /// /// Send an AgentAnimation packet that will toggle animations on or off /// - /// A list of animation s, and whether to + /// A list of animation s, and whether to /// turn that animation on or off /// Whether to ensure delivery of this packet or not public void Animate(Dictionary animations, bool reliable) @@ -2009,7 +2008,7 @@ namespace libsecondlife /// /// Teleport agent to a landmark /// - /// of the landmark to teleport agent to + /// of the landmark to teleport agent to /// true on success, false on failure public bool Teleport(LLUUID landmark) { @@ -2089,7 +2088,7 @@ namespace libsecondlife /// Teleport agent to another region /// /// handle of region to teleport agent to - /// position in destination sim to teleport to + /// position in destination sim to teleport to /// true on success, false on failure /// This call is blocking public bool Teleport(ulong regionHandle, LLVector3 position) @@ -2101,8 +2100,8 @@ namespace libsecondlife /// Teleport agent to another region /// /// handle of region to teleport agent to - /// position in destination sim to teleport to - /// direction in destination sim agent will look at + /// position in destination sim to teleport to + /// direction in destination sim agent will look at /// true on success, false on failure /// This call is blocking public bool Teleport(ulong regionHandle, LLVector3 position, LLVector3 lookAt) @@ -2129,7 +2128,7 @@ namespace libsecondlife /// Request teleport to a another simulator /// /// handle of region to teleport agent to - /// position in destination sim to teleport to + /// position in destination sim to teleport to public void RequestTeleport(ulong regionHandle, LLVector3 position) { RequestTeleport(regionHandle, position, new LLVector3(0.0f, 1.0f, 0.0f)); @@ -2139,8 +2138,8 @@ namespace libsecondlife /// Request teleport to a another simulator /// /// handle of region to teleport agent to - /// position in destination sim to teleport to - /// direction in destination sim agent will look at + /// position in destination sim to teleport to + /// direction in destination sim agent will look at public void RequestTeleport(ulong regionHandle, LLVector3 position, LLVector3 lookAt) { if (Client.Network.CurrentSim != null && @@ -2169,7 +2168,7 @@ namespace libsecondlife /// /// Teleport agent to a landmark /// - /// of the landmark to teleport agent to + /// of the landmark to teleport agent to public void RequestTeleport(LLUUID landmark) { TeleportLandmarkRequestPacket p = new TeleportLandmarkRequestPacket(); @@ -2183,7 +2182,7 @@ namespace libsecondlife /// /// Send a teleport lure to another avatar with default "Join me in ..." invitation message /// - /// target avatars to lure + /// target avatars to lure public void SendTeleportLure(LLUUID targetID) { SendTeleportLure(targetID, "Join me in " + Client.Network.CurrentSim.Name + "!"); @@ -2192,7 +2191,7 @@ namespace libsecondlife /// /// Send a teleport lure to another avatar with custom invitation message /// - /// target avatars to lure + /// target avatars to lure /// custom message to send with invitation public void SendTeleportLure(LLUUID targetID, string message) { @@ -2210,7 +2209,7 @@ namespace libsecondlife /// Respond to a teleport lure by either accepting it and initiating /// the teleport, or denying it /// - /// of the avatar sending the lure + /// of the avatar sending the lure /// true to accept the lure, false to decline it public void TeleportLureRespond(LLUUID requesterID, bool accept) { @@ -2238,7 +2237,7 @@ namespace libsecondlife /// /// Update agent profile /// - /// struct containing updated + /// struct containing updated /// profile information public void UpdateProfile(Avatar.AvatarProperties profile) { @@ -2259,7 +2258,7 @@ namespace libsecondlife /// /// Update agents profile interests /// - /// selection of interests from struct + /// selection of interests from struct public void UpdateInterests(Avatar.Interests interests) { AvatarInterestsUpdatePacket aiup = new AvatarInterestsUpdatePacket(); @@ -2309,7 +2308,7 @@ namespace libsecondlife /// /// Sets home location to agents current position /// - /// will fire an AlertMessage () with + /// will fire an AlertMessage () with /// success or failure message public void SetHome() { @@ -2329,7 +2328,7 @@ namespace libsecondlife /// Move an agent in to a simulator. This packet is the last packet /// needed to complete the transition in to a new simulator /// - /// Object + /// Object public void CompleteAgentMovement(Simulator simulator) { CompleteAgentMovementPacket move = new CompleteAgentMovementPacket(); @@ -2344,10 +2343,10 @@ namespace libsecondlife /// /// Reply to script permissions request /// - /// Object - /// of the itemID requesting permissions - /// of the taskID requesting permissions - /// list of permissions to allow + /// Object + /// of the itemID requesting permissions + /// of the taskID requesting permissions + /// list of permissions to allow public void ScriptQuestionReply(Simulator simulator, LLUUID itemID, LLUUID taskID, ScriptPermission permissions) { ScriptAnswerYesPacket yes = new ScriptAnswerYesPacket(); @@ -2878,7 +2877,7 @@ namespace libsecondlife { // Null out the cached fullName since it can change after logging // in again (with a different account name or different login - // server but using the same SecondLife object + // server but using the same GridClient object fullName = null; } diff --git a/libsecondlife/AgentManagerCamera.cs b/libsecondlife/AgentManagerCamera.cs index 406972a9..46a6e82f 100644 --- a/libsecondlife/AgentManagerCamera.cs +++ b/libsecondlife/AgentManagerCamera.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,7 +26,7 @@ using System; -namespace libsecondlife +namespace OpenMetaverse { public partial class AgentManager { diff --git a/libsecondlife/AgentManagerMovement.cs b/libsecondlife/AgentManagerMovement.cs index 2ce40cc7..9f0fdbee 100644 --- a/libsecondlife/AgentManagerMovement.cs +++ b/libsecondlife/AgentManagerMovement.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,10 +26,10 @@ using System; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { public partial class AgentManager { @@ -455,7 +455,7 @@ namespace libsecondlife #endregion Change tracking private bool alwaysRun; - private SecondLife Client; + private GridClient Client; private uint agentControls; private int duplicateCount; private AgentState lastState; @@ -465,7 +465,7 @@ namespace libsecondlife private bool autoResetControls = true; /// Default constructor - public AgentMovement(SecondLife client) + public AgentMovement(GridClient client) { Client = client; Camera = new AgentCamera(); diff --git a/libsecondlife/AgentThrottle.cs b/libsecondlife/AgentThrottle.cs index 033fec49..79d990d7 100644 --- a/libsecondlife/AgentThrottle.cs +++ b/libsecondlife/AgentThrottle.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -25,13 +25,13 @@ */ using System; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// Throttles the network traffic for various different traffic types. - /// Access this class through SecondLife.Throttle + /// Access this class through GridClient.Throttle /// public class AgentThrottle { @@ -120,7 +120,7 @@ namespace libsecondlife get { return Resend + Land + Wind + Cloud + Task + Texture + Asset; } set { - // These sane initial values were pulled from the Second Life client + // Sane initial values Resend = (value * 0.1f); Land = (float)(value * 0.52f / 3f); Wind = (float)(value * 0.05f); @@ -131,7 +131,7 @@ namespace libsecondlife } } - private SecondLife Client; + private GridClient Client; private float resend; private float land; private float wind; @@ -143,7 +143,7 @@ namespace libsecondlife /// /// Default constructor, uses a default high total of 1500 KBps (1536000) /// - public AgentThrottle(SecondLife client) + public AgentThrottle(GridClient client) { Client = client; Total = 1536000.0f; @@ -157,8 +157,8 @@ namespace libsecondlife /// packet /// Offset position to start reading at in the /// throttle data - /// This is generally not needed in libsecondlife clients as - /// the server will never send a throttle packet to the client + /// This is generally not needed in clients as the server will + /// never send a throttle packet to the client public AgentThrottle(byte[] data, int pos) { int i; diff --git a/libsecondlife/Animations.cs b/libsecondlife/Animations.cs index bfffa884..53f0e3b2 100644 --- a/libsecondlife/Animations.cs +++ b/libsecondlife/Animations.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,7 +26,7 @@ using System; -namespace libsecondlife +namespace OpenMetaverse { /// /// Static pre-defined animations available to all agents diff --git a/libsecondlife/AppearanceManager.cs b/libsecondlife/AppearanceManager.cs index 0b1fcc1b..63d3ff06 100644 --- a/libsecondlife/AppearanceManager.cs +++ b/libsecondlife/AppearanceManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,11 +29,11 @@ using System.Text; using System.Collections.Generic; using System.Threading; using System.IO; -using libsecondlife; -using libsecondlife.Packets; -using libsecondlife.Imaging; +using OpenMetaverse; +using OpenMetaverse.Packets; +using OpenMetaverse.Imaging; -namespace libsecondlife +namespace OpenMetaverse { public class InvalidOutfitException : Exception { @@ -139,7 +139,7 @@ namespace libsecondlife public static readonly LLUUID DEFAULT_AVATAR_TEXTURE = new LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); - private SecondLife Client; + private GridClient Client; private AssetManager Assets; /// @@ -185,9 +185,9 @@ namespace libsecondlife /// /// Default constructor /// - /// This agents Object + /// This agents Object /// Reference to an AssetManager object - public AppearanceManager(SecondLife client, AssetManager assets) + public AppearanceManager(GridClient client, AssetManager assets) { Client = client; Assets = assets; @@ -228,8 +228,8 @@ namespace libsecondlife /// /// Returns the assetID for a given WearableType /// - /// the of the asset - /// The of the WearableType + /// the of the asset + /// The of the WearableType public LLUUID GetWearableAsset(WearableType type) { WearableData wearable; @@ -526,8 +526,8 @@ namespace libsecondlife /// /// Attach an item to an avatar at a specific attach point /// - /// A to attach - /// the on the avatar + /// A to attach + /// the on the avatar /// to attach the item to public void Attach(InventoryItem item, AttachmentPoint attachPoint) { @@ -538,13 +538,13 @@ namespace libsecondlife /// /// Attach an item to an avatar specifying attachment details /// - /// The of the item to attach - /// The attachments owner + /// The of the item to attach + /// The attachments owner /// The name of the attachment /// The description of the attahment - /// The to apply when attached - /// The of the attachment - /// the on the avatar + /// The to apply when attached + /// The of the attachment + /// the on the avatar /// to attach the item to public void Attach(LLUUID itemID, LLUUID ownerID, string name, string description, Permissions perms, uint itemFlags, AttachmentPoint attachPoint) @@ -571,16 +571,16 @@ namespace libsecondlife } /// - /// Detach an item from avatar using an object + /// Detach an item from avatar using an object /// - /// An object + /// An object public void Detach(InventoryItem item) { Detach(item.UUID); } /// - /// Detach an Item from avatar by items + /// Detach an Item from avatar by items /// /// The items ID to detach public void Detach(LLUUID itemID) @@ -917,7 +917,7 @@ namespace libsecondlife } // FIXME: Our hackish algorithm is making squished avatars. See - // http://www.libsecondlife.org/wiki/Agent_Size for discussion of the correct algorithm + // http://www.OpenMetaverse.org/wiki/Agent_Size for discussion of the correct algorithm //float height = Helpers.ByteToFloat(set.VisualParam[33].ParamValue, VisualParams.Params[33].MinValue, // VisualParams.Params[33].MaxValue); diff --git a/libsecondlife/AssemblyInfo.cs b/libsecondlife/AssemblyInfo.cs index 01e254a7..e4744248 100644 --- a/libsecondlife/AssemblyInfo.cs +++ b/libsecondlife/AssemblyInfo.cs @@ -5,12 +5,12 @@ using System.Runtime.CompilerServices; // 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("libopenmv")] -[assembly: AssemblyDescription("Open metaverse networking layer")] +[assembly: AssemblyTitle("OpenMetaverse")] +[assembly: AssemblyDescription("OpenMetaverse library")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("libopenmv")] -[assembly: AssemblyProduct("libopenmv")] -[assembly: AssemblyCopyright("Copyright © libopenmv 2006-2008")] +[assembly: AssemblyCompany("openmetaverse.org")] +[assembly: AssemblyProduct("OpenMetaverse")] +[assembly: AssemblyCopyright("Copyright © openmetaverse.org 2006-2008")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/libsecondlife/AssetManager.cs b/libsecondlife/AssetManager.cs index b5dcd10d..a015a000 100644 --- a/libsecondlife/AssetManager.cs +++ b/libsecondlife/AssetManager.cs @@ -1,16 +1,42 @@ +/* + * Copyright (c) 2007-2008, openmetaverse.org + * All rights reserved. + * + * - Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * - Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * - Neither the name of the openmetaverse.org nor the names + * of its contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + using System; using System.Collections.Generic; using System.Threading; using System.IO; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { #region Enums /// - /// The different types of assets in Second Life + /// The different types of grid assets /// public enum AssetType : sbyte { @@ -308,7 +334,7 @@ namespace libsecondlife /// Texture download cache public TextureCache Cache; - private SecondLife Client; + private GridClient Client; private Dictionary Transfers = new Dictionary(); private AssetUpload PendingUpload; private object PendingUploadLock = new object(); @@ -318,8 +344,8 @@ namespace libsecondlife /// /// Default constructor /// - /// A reference to the SecondLife client object - public AssetManager(SecondLife client) + /// A reference to the GridClient object + public AssetManager(GridClient client) { Client = client; Cache = new TextureCache(client); @@ -1370,7 +1396,7 @@ namespace libsecondlife /// public class TextureCache { - private SecondLife Client; + private GridClient Client; private Thread cleanerThread; private System.Timers.Timer cleanerTimer; private double pruneInterval = 1000 * 60 * 5; @@ -1407,8 +1433,8 @@ namespace libsecondlife /// /// Default constructor /// - /// A reference to the SecondLife client object - public TextureCache(SecondLife client) + /// A reference to the GridClient object + public TextureCache(GridClient client) { Client = client; cleanerTimer = new System.Timers.Timer(pruneInterval); diff --git a/libsecondlife/AssetTypes.cs b/libsecondlife/AssetTypes.cs index d6cf28ed..d05aa6c8 100644 --- a/libsecondlife/AssetTypes.cs +++ b/libsecondlife/AssetTypes.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,9 +27,9 @@ using System; using System.Text; using System.Collections.Generic; -using libsecondlife.Imaging; +using OpenMetaverse.Imaging; -namespace libsecondlife +namespace OpenMetaverse { /// /// diff --git a/libsecondlife/Avatar.cs b/libsecondlife/Avatar.cs index b8e55ef1..47557763 100644 --- a/libsecondlife/Avatar.cs +++ b/libsecondlife/Avatar.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2007, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,12 +28,12 @@ using System; using System.Net; using System.Collections.Generic; using System.Threading; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// - /// Represents an avatar in Second Life (other than your own) + /// Represents an avatar (other than your own) /// public class Avatar : LLObject { diff --git a/libsecondlife/AvatarManager.cs b/libsecondlife/AvatarManager.cs index 1108153a..1175399a 100644 --- a/libsecondlife/AvatarManager.cs +++ b/libsecondlife/AvatarManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,9 +28,9 @@ using System; using System.Text; using System.Collections.Generic; using System.Threading; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { #region Structs @@ -186,13 +186,13 @@ namespace libsecondlife /// public event PickInfoCallback OnPickInfo; - private SecondLife Client; + private GridClient Client; /// /// Represents other avatars /// /// - public AvatarManager(SecondLife client) + public AvatarManager(GridClient client) { Client = client; diff --git a/libsecondlife/BitPack.cs b/libsecondlife/BitPack.cs index 0a3168b1..818a9137 100644 --- a/libsecondlife/BitPack.cs +++ b/libsecondlife/BitPack.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,7 +26,7 @@ using System; -namespace libsecondlife +namespace OpenMetaverse { /// /// Wrapper around a byte array that allows bit to be packed and unpacked diff --git a/libsecondlife/BlockingQueue.cs b/libsecondlife/BlockingQueue.cs index 218e140e..53c2c786 100644 --- a/libsecondlife/BlockingQueue.cs +++ b/libsecondlife/BlockingQueue.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,7 +26,7 @@ using System; using System.Threading; -using libsecondlife; +using OpenMetaverse; namespace System.Collections { diff --git a/libsecondlife/Capabilities/CapsBase.cs b/libsecondlife/Capabilities/CapsBase.cs index 0938c271..0c7db40f 100644 --- a/libsecondlife/Capabilities/CapsBase.cs +++ b/libsecondlife/Capabilities/CapsBase.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,7 +29,7 @@ using System.Net; using System.IO; using System.Threading; -namespace libsecondlife.Capabilities +namespace OpenMetaverse.Capabilities { public class CapsBase { diff --git a/libsecondlife/Capabilities/CapsClient.cs b/libsecondlife/Capabilities/CapsClient.cs index 26c0cc06..de8e5cd9 100644 --- a/libsecondlife/Capabilities/CapsClient.cs +++ b/libsecondlife/Capabilities/CapsClient.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,9 +26,9 @@ using System; using System.Net; -using libsecondlife.StructuredData; +using OpenMetaverse.StructuredData; -namespace libsecondlife.Capabilities +namespace OpenMetaverse.Capabilities { public class CapsClient { diff --git a/libsecondlife/Capabilities/CapsListener.cs b/libsecondlife/Capabilities/CapsListener.cs index 33b824bf..8bc0199f 100644 --- a/libsecondlife/Capabilities/CapsListener.cs +++ b/libsecondlife/Capabilities/CapsListener.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,7 +29,7 @@ using System.Net; #if !PocketPC -namespace libsecondlife.Capabilities +namespace OpenMetaverse.Capabilities { public class CapsListener { diff --git a/libsecondlife/Capabilities/EventQueueClient.cs b/libsecondlife/Capabilities/EventQueueClient.cs index 9a01d4fe..36f39ea6 100644 --- a/libsecondlife/Capabilities/EventQueueClient.cs +++ b/libsecondlife/Capabilities/EventQueueClient.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,9 +27,9 @@ using System; using System.Net; using System.Threading; -using libsecondlife.StructuredData; +using OpenMetaverse.StructuredData; -namespace libsecondlife.Capabilities +namespace OpenMetaverse.Capabilities { public class EventQueueClient { diff --git a/libsecondlife/Capabilities/EventQueueListener.cs b/libsecondlife/Capabilities/EventQueueListener.cs index 87e21920..ce1c0e6d 100644 --- a/libsecondlife/Capabilities/EventQueueListener.cs +++ b/libsecondlife/Capabilities/EventQueueListener.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,7 +29,7 @@ using System.Net; #if !PocketPC -namespace libsecondlife.Capabilities +namespace OpenMetaverse.Capabilities { public class EventQueueListener { diff --git a/libsecondlife/Caps.cs b/libsecondlife/Caps.cs index 85bc0a10..654cca3f 100644 --- a/libsecondlife/Caps.cs +++ b/libsecondlife/Caps.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,14 +28,14 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading; -using libsecondlife.StructuredData; -using libsecondlife.Capabilities; +using OpenMetaverse.StructuredData; +using OpenMetaverse.Capabilities; -namespace libsecondlife +namespace OpenMetaverse { /// - /// Capabilities is the name of the bi-directional HTTP REST protocol that - /// Second Life uses to communicate transactions such as teleporting or + /// Capabilities is the name of the bi-directional HTTP REST protocol + /// used to communicate non real-time transactions such as teleporting or /// group messaging /// public class Caps diff --git a/libsecondlife/CapsToPacket.cs b/libsecondlife/CapsToPacket.cs index c1b0a233..6d496d03 100644 --- a/libsecondlife/CapsToPacket.cs +++ b/libsecondlife/CapsToPacket.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,9 +28,9 @@ using System; using System.Collections; using System.Collections.Generic; using System.Reflection; -using libsecondlife.StructuredData; +using OpenMetaverse.StructuredData; -namespace libsecondlife.Packets +namespace OpenMetaverse.Packets { public abstract partial class Packet { @@ -111,7 +111,7 @@ namespace libsecondlife.Packets Assembly assembly = Assembly.GetExecutingAssembly(); // Check if we have a subclass of packet with the same name as this event - Type type = assembly.GetType("libsecondlife.Packets." + capsEventName + "Packet", false); + Type type = assembly.GetType("OpenMetaverse.Packets." + capsEventName + "Packet", false); if (type == null) return null; diff --git a/libsecondlife/CoordinateFrame.cs b/libsecondlife/CoordinateFrame.cs index 34a24334..a5bdc9a1 100644 --- a/libsecondlife/CoordinateFrame.cs +++ b/libsecondlife/CoordinateFrame.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,7 +26,7 @@ using System; -namespace libsecondlife +namespace OpenMetaverse { public class CoordinateFrame { @@ -45,7 +45,7 @@ namespace libsecondlife origin = value; } } - /// X axis of this coordinate frame, or Forward/At in Second Life terms + /// X axis of this coordinate frame, or Forward/At in grid terms public LLVector3 XAxis { get { return xAxis; } @@ -56,7 +56,7 @@ namespace libsecondlife xAxis = value; } } - /// Y axis of this coordinate frame, or Left in Second Life terms + /// Y axis of this coordinate frame, or Left in grid terms public LLVector3 YAxis { get { return yAxis; } @@ -67,7 +67,7 @@ namespace libsecondlife yAxis = value; } } - /// Z axis of this coordinate frame, or Up in Second Life terms + /// Z axis of this coordinate frame, or Up in grid terms public LLVector3 ZAxis { get { return zAxis; } diff --git a/libsecondlife/DirectoryManager.cs b/libsecondlife/DirectoryManager.cs index 292830fa..772cae80 100644 --- a/libsecondlife/DirectoryManager.cs +++ b/libsecondlife/DirectoryManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,14 +27,13 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// Access to the Linden dataserver which allows searching for land, events, people, etc /// - /// This class is automatically instantiated by the SecondLife class public class DirectoryManager { /// @@ -161,7 +160,7 @@ namespace libsecondlife } /// - /// A classified ad in Second Life + /// A classified ad on the grid /// public struct Classified { @@ -211,7 +210,7 @@ namespace libsecondlife public string FirstName; /// Agents last name public string LastName; - /// Agents + /// Agents public LLUUID AgentID; } /// @@ -345,10 +344,10 @@ namespace libsecondlife // Event Details public event EventInfoCallback OnEventInfo; - private SecondLife Client; + private GridClient Client; - public DirectoryManager(SecondLife client) + public DirectoryManager(GridClient client) { Client = client; diff --git a/libsecondlife/EstateTools.cs b/libsecondlife/EstateTools.cs index f9ac09e8..d3a92126 100644 --- a/libsecondlife/EstateTools.cs +++ b/libsecondlife/EstateTools.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2007, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -24,17 +24,17 @@ * POSSIBILITY OF SUCH DAMAGE. */ using System; -using libsecondlife.Packets; +using OpenMetaverse.Packets; using System.Collections.Generic; -namespace libsecondlife +namespace OpenMetaverse { /// /// Estate level administration and utilities /// public class EstateTools { - private SecondLife Client; + private GridClient Client; public GroundTextureSettings GroundTextures; /// @@ -102,7 +102,7 @@ namespace libsecondlife /// Constructor for EstateTools class /// /// - public EstateTools(SecondLife client) + public EstateTools(GridClient client) { Client = client; Client.Network.RegisterCallback(PacketType.LandStatReply, new NetworkManager.PacketCallback(LandStatReplyHandler)); diff --git a/libsecondlife/EventDictionary.cs b/libsecondlife/EventDictionary.cs index 3f7f2b4f..0288003f 100644 --- a/libsecondlife/EventDictionary.cs +++ b/libsecondlife/EventDictionary.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,9 +28,9 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// Registers, unregisters, and fires events generated by incoming packets @@ -51,8 +51,8 @@ namespace libsecondlife public Packet Packet; } - /// Reference to the SecondLife client - public SecondLife Client; + /// Reference to the GridClient object + public GridClient Client; private Dictionary _EventTable = new Dictionary(); @@ -62,7 +62,7 @@ namespace libsecondlife /// Default constructor /// /// - public PacketEventDictionary(SecondLife client) + public PacketEventDictionary(GridClient client) { Client = client; _ThreadPoolCallback = new WaitCallback(ThreadPoolDelegate); @@ -194,8 +194,8 @@ namespace libsecondlife public Simulator Simulator; } - /// Reference to the SecondLife client - public SecondLife Client; + /// Reference to the GridClient object + public GridClient Client; private Dictionary _EventTable = new Dictionary(); @@ -204,8 +204,8 @@ namespace libsecondlife /// /// Default constructor /// - /// Reference to the SecondLife client - public CapsEventDictionary(SecondLife client) + /// Reference to the GridClient object + public CapsEventDictionary(GridClient client) { Client = client; _ThreadPoolCallback = new WaitCallback(ThreadPoolDelegate); diff --git a/libsecondlife/FriendsManager.cs b/libsecondlife/FriendsManager.cs index a84a13f9..dc30df95 100644 --- a/libsecondlife/FriendsManager.cs +++ b/libsecondlife/FriendsManager.cs @@ -1,12 +1,12 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// @@ -49,8 +49,8 @@ namespace libsecondlife /// /// This class holds information about an avatar in the friends list. There are two ways /// to interface to this class. The first is through the set of boolean properties. This is the typical - /// way clients of this class will use it. The second interface is through two bitmap properties. While - /// the bitmap interface is public, it is intended for use the libsecondlife framework. + /// way clients of this class will use it. The second interface is through two bitflag properties, + /// TheirFriendsRights and MyFriendsRights /// public class FriendInfo { @@ -64,24 +64,7 @@ namespace libsecondlife private bool m_canSeeThemOnMap; private bool m_canModifyTheirObjects; - /// - /// Used by the libsecondlife framework when building the initial list of friends - /// at login time. This constructor should not be called by consummer of this class. - /// - /// System ID of the avatar being prepesented - /// Rights the friend has to see you online and to modify your objects - /// Rights you have to see your friend online and to modify their objects - public FriendInfo(LLUUID id, FriendRights theirRights, FriendRights myRights) - { - m_id = id; - m_canSeeMeOnline = (theirRights & FriendRights.CanSeeOnline) != 0; - m_canSeeMeOnMap = (theirRights & FriendRights.CanSeeOnMap) != 0; - m_canModifyMyObjects = (theirRights & FriendRights.CanModifyObjects) != 0; - - m_canSeeThemOnline = (myRights & FriendRights.CanSeeOnline) != 0; - m_canSeeThemOnMap = (myRights & FriendRights.CanSeeOnMap) != 0; - m_canModifyTheirObjects = (myRights & FriendRights.CanModifyObjects) != 0; - } + #region Properties /// /// System ID of the avatar @@ -210,6 +193,26 @@ namespace libsecondlife } } + #endregion Properties + + /// + /// Used internally when building the initial list of friends at login time + /// + /// System ID of the avatar being prepesented + /// Rights the friend has to see you online and to modify your objects + /// Rights you have to see your friend online and to modify their objects + internal FriendInfo(LLUUID id, FriendRights theirRights, FriendRights myRights) + { + m_id = id; + m_canSeeMeOnline = (theirRights & FriendRights.CanSeeOnline) != 0; + m_canSeeMeOnMap = (theirRights & FriendRights.CanSeeOnMap) != 0; + m_canModifyMyObjects = (theirRights & FriendRights.CanModifyObjects) != 0; + + m_canSeeThemOnline = (myRights & FriendRights.CanSeeOnline) != 0; + m_canSeeThemOnMap = (myRights & FriendRights.CanSeeOnMap) != 0; + m_canModifyTheirObjects = (myRights & FriendRights.CanModifyObjects) != 0; + } + /// /// FriendInfo represented as a string /// @@ -291,7 +294,7 @@ namespace libsecondlife #endregion Events - private SecondLife Client; + private GridClient Client; /// /// A dictionary of key/value pairs containing known friends of this avatar. /// @@ -310,10 +313,10 @@ namespace libsecondlife public InternalDictionary FriendRequests = new InternalDictionary(); /// - /// This constructor is intened to only be used by the libsecondlife framework + /// Internal constructor /// - /// A reference to the SecondLife Object - public FriendsManager(SecondLife client) + /// A reference to the GridClient Object + internal FriendsManager(GridClient client) { Client = client; diff --git a/libsecondlife/SecondLife.cs b/libsecondlife/GridClient.cs similarity index 93% rename from libsecondlife/SecondLife.cs rename to libsecondlife/GridClient.cs index 791d07e1..81a4c4e3 100644 --- a/libsecondlife/SecondLife.cs +++ b/libsecondlife/GridClient.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,14 +26,14 @@ using System; -namespace libsecondlife +namespace OpenMetaverse { /// - /// Main class to expose Second Life functionality to clients. All of the + /// Main class to expose grid functionality to clients. All of the /// classes needed for sending and receiving data are accessible through /// this class. /// - public class SecondLife + public class GridClient { /// Networking subsystem public NetworkManager Network; @@ -74,7 +74,7 @@ namespace libsecondlife /// /// Default constructor /// - public SecondLife() + public GridClient() { // These are order-dependant Network = new NetworkManager(this); diff --git a/libsecondlife/GridManager.cs b/libsecondlife/GridManager.cs index 8cc1d7c1..56da8979 100644 --- a/libsecondlife/GridManager.cs +++ b/libsecondlife/GridManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2007, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,11 +29,11 @@ using System.Text; using System.Collections; using System.Collections.Generic; using System.Threading; -using libsecondlife.StructuredData; -using libsecondlife.Capabilities; -using libsecondlife.Packets; +using OpenMetaverse.StructuredData; +using OpenMetaverse.Capabilities; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// @@ -222,7 +222,7 @@ namespace libsecondlife /// A dictionary of all the regions, indexed by region handle internal Dictionary RegionsByHandle = new Dictionary(); - private SecondLife Client; + private GridClient Client; private float sunPhase; private LLVector3 sunDirection; private LLVector3 sunAngVelocity; @@ -230,8 +230,8 @@ namespace libsecondlife /// /// Constructor /// - /// Instance of type SecondLife to associate with this GridManager instance - public GridManager(SecondLife client) + /// Instance of GridClient object to associate with this GridManager instance + public GridManager(GridClient client) { Client = client; diff --git a/libsecondlife/GroupManager.cs b/libsecondlife/GroupManager.cs index 4a998322..761875c0 100644 --- a/libsecondlife/GroupManager.cs +++ b/libsecondlife/GroupManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { #region Structs @@ -88,7 +88,7 @@ namespace libsecondlife } /// - /// Represents a group in Second Life + /// Represents a group on the grid /// public struct Group { @@ -565,7 +565,7 @@ namespace libsecondlife #endregion Events - private SecondLife Client; + private GridClient Client; /// A list of all the lists of group members, indexed by the request ID private Dictionary> GroupMembersCaches; /// A list of all the lists of group roles, indexed by the request ID @@ -578,7 +578,7 @@ namespace libsecondlife /// /// /// - public GroupManager(SecondLife client) + public GroupManager(GridClient client) { Client = client; @@ -880,7 +880,7 @@ namespace libsecondlife /// Group struct containing the new group info public void RequestCreateGroup(Group group) { - libsecondlife.Packets.CreateGroupRequestPacket cgrp = new CreateGroupRequestPacket(); + OpenMetaverse.Packets.CreateGroupRequestPacket cgrp = new CreateGroupRequestPacket(); //Fill in agent data cgrp.AgentData = new CreateGroupRequestPacket.AgentDataBlock(); cgrp.AgentData.AgentID = Client.Self.AgentID; @@ -904,7 +904,7 @@ namespace libsecondlife /// Group struct to update. public void UpdateGroup(LLUUID id, Group group) { - libsecondlife.Packets.UpdateGroupInfoPacket cgrp = new UpdateGroupInfoPacket(); + OpenMetaverse.Packets.UpdateGroupInfoPacket cgrp = new UpdateGroupInfoPacket(); //Fill in agent data cgrp.AgentData = new UpdateGroupInfoPacket.AgentDataBlock(); cgrp.AgentData.AgentID = Client.Self.AgentID; @@ -928,7 +928,7 @@ namespace libsecondlife /// Avatar's key to eject public void EjectUser(LLUUID group, LLUUID member) { - libsecondlife.Packets.EjectGroupMemberRequestPacket eject = new EjectGroupMemberRequestPacket(); + OpenMetaverse.Packets.EjectGroupMemberRequestPacket eject = new EjectGroupMemberRequestPacket(); eject.AgentData = new EjectGroupMemberRequestPacket.AgentDataBlock(); eject.AgentData.AgentID = Client.Self.AgentID; eject.AgentData.SessionID = Client.Self.SessionID; @@ -948,7 +948,7 @@ namespace libsecondlife /// Role to update public void UpdateRole(LLUUID group, GroupRole role) { - libsecondlife.Packets.GroupRoleUpdatePacket gru = new GroupRoleUpdatePacket(); + OpenMetaverse.Packets.GroupRoleUpdatePacket gru = new GroupRoleUpdatePacket(); gru.AgentData.AgentID = Client.Self.AgentID; gru.AgentData.SessionID = Client.Self.SessionID; gru.AgentData.GroupID = group; @@ -966,7 +966,7 @@ namespace libsecondlife /// Role to create public void CreateRole(LLUUID group, GroupRole role) { - libsecondlife.Packets.GroupRoleUpdatePacket gru = new GroupRoleUpdatePacket(); + OpenMetaverse.Packets.GroupRoleUpdatePacket gru = new GroupRoleUpdatePacket(); gru.AgentData.AgentID = Client.Self.AgentID; gru.AgentData.SessionID = Client.Self.SessionID; gru.AgentData.GroupID = group; @@ -985,7 +985,7 @@ namespace libsecondlife /// Avatar's Key to remove public void RemoveFromRole(LLUUID group, LLUUID role, LLUUID member) { - libsecondlife.Packets.GroupRoleChangesPacket grc = new GroupRoleChangesPacket(); + OpenMetaverse.Packets.GroupRoleChangesPacket grc = new GroupRoleChangesPacket(); grc.AgentData.AgentID = Client.Self.AgentID; grc.AgentData.SessionID = Client.Self.SessionID; grc.AgentData.GroupID = group; @@ -1005,7 +1005,7 @@ namespace libsecondlife /// Avatar's ID to assign to role public void AddToRole(LLUUID group, LLUUID role, LLUUID member) { - libsecondlife.Packets.GroupRoleChangesPacket grc = new GroupRoleChangesPacket(); + OpenMetaverse.Packets.GroupRoleChangesPacket grc = new GroupRoleChangesPacket(); grc.AgentData.AgentID = Client.Self.AgentID; grc.AgentData.SessionID = Client.Self.SessionID; grc.AgentData.GroupID = group; diff --git a/libsecondlife/Helpers.cs b/libsecondlife/Helpers.cs index 59d66f63..bd71d3c3 100644 --- a/libsecondlife/Helpers.cs +++ b/libsecondlife/Helpers.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,9 +27,9 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// Static helper functions and global variables @@ -80,7 +80,7 @@ namespace libsecondlife public static DateTime Epoch = new DateTime(1970, 1, 1); /// - /// Passed to SecondLife.Log() to identify the severity of a log entry + /// Passed to Logger.Log() to identify the severity of a log entry /// public enum LogLevel { @@ -90,12 +90,12 @@ namespace libsecondlife /// debugging a problem Info, /// A non-critical error occurred. A warning will not - /// prevent the rest of libsecondlife from operating as usual, + /// prevent the rest of the library from operating as usual, /// although it may be indicative of an underlying issue Warning, /// A critical error has occurred. Generally this will /// be followed by the network layer shutting down, although the - /// stability of libsecondlife after an error is uncertain + /// stability of the library after an error is uncertain Error, /// Used for internal testing, this logging level can /// generate very noisy (long and/or repetitive) messages. Don't @@ -110,7 +110,7 @@ namespace libsecondlife new System.Security.Cryptography.MD5CryptoServiceProvider(); /// Provide a single instance of the CultureInfo class to - /// help parsing in situations where Second Life assumes an en-us + /// help parsing in situations where the grid assumes an en-us /// culture public static readonly System.Globalization.CultureInfo EnUsCulture = new System.Globalization.CultureInfo("en-us"); @@ -1095,7 +1095,7 @@ namespace libsecondlife try { System.Reflection.Assembly a = System.Reflection.Assembly.GetExecutingAssembly(); - System.IO.Stream s = a.GetManifestResourceStream("libsecondlife.Resources." + resourceName); + System.IO.Stream s = a.GetManifestResourceStream("OpenMetaverse.Resources." + resourceName); if (s != null) return s; } catch (Exception) @@ -1155,7 +1155,7 @@ namespace libsecondlife /// An object that can be serialized with LLSD public static StructuredData.LLSD PrimListToLLSD(List prims) { - StructuredData.LLSDMap map = new libsecondlife.StructuredData.LLSDMap(prims.Count); + StructuredData.LLSDMap map = new OpenMetaverse.StructuredData.LLSDMap(prims.Count); for (int i = 0; i < prims.Count; i++) map.Add(prims[i].LocalID.ToString(), prims[i].ToLLSD()); diff --git a/libsecondlife/Imaging/BakeLayer.cs b/libsecondlife/Imaging/BakeLayer.cs index 3acafa92..c6c2cacf 100644 --- a/libsecondlife/Imaging/BakeLayer.cs +++ b/libsecondlife/Imaging/BakeLayer.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -31,7 +31,7 @@ using System.Reflection; using System.Drawing; using System.Drawing.Imaging; -namespace libsecondlife.Imaging +namespace OpenMetaverse.Imaging { /// /// A set of textures that are layered on texture of each other and "baked" @@ -47,8 +47,8 @@ namespace libsecondlife.Imaging public int BakeHeight { get { return _bakeHeight; } } public AppearanceManager.BakeType BakeType { get { return _bakeType; } } - /// Reference to the SecondLife client - protected SecondLife _client; + /// Reference to the GridClient object + protected GridClient _client; /// Finald baked texture protected AssetTexture _bakedTexture; /// Appearance parameters the drive the baking process @@ -67,13 +67,13 @@ namespace libsecondlife.Imaging /// /// Default constructor /// - /// Reference to the SecondLife client + /// Reference to the GridClient object /// /// Total number of layers this layer set is /// composed of /// Appearance parameters the drive the /// baking process - public Baker(SecondLife client, AppearanceManager.BakeType bakeType, int textureCount, Dictionary paramValues) + public Baker(GridClient client, AppearanceManager.BakeType bakeType, int textureCount, Dictionary paramValues) { _client = client; _bakeType = bakeType; diff --git a/libsecondlife/Imaging/ManagedImage.cs b/libsecondlife/Imaging/ManagedImage.cs index 88d2df9a..b2bce019 100644 --- a/libsecondlife/Imaging/ManagedImage.cs +++ b/libsecondlife/Imaging/ManagedImage.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,7 +26,7 @@ using System; -namespace libsecondlife.Imaging +namespace OpenMetaverse.Imaging { public class ManagedImage { diff --git a/libsecondlife/Imaging/OpenJPEG.cs b/libsecondlife/Imaging/OpenJPEG.cs index 7b150b98..e6fc1492 100644 --- a/libsecondlife/Imaging/OpenJPEG.cs +++ b/libsecondlife/Imaging/OpenJPEG.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -30,7 +30,7 @@ using System.Drawing; using System.Drawing.Imaging; using System.Runtime.InteropServices; -namespace libsecondlife.Imaging +namespace OpenMetaverse.Imaging { #if !NO_UNSAFE /// diff --git a/libsecondlife/Imaging/TGALoader.cs b/libsecondlife/Imaging/TGALoader.cs index c103607f..29f1d322 100644 --- a/libsecondlife/Imaging/TGALoader.cs +++ b/libsecondlife/Imaging/TGALoader.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,7 +26,7 @@ using System; -namespace libsecondlife.Imaging +namespace OpenMetaverse.Imaging { #if !NO_UNSAFE diff --git a/libsecondlife/InternalDictionary.cs b/libsecondlife/InternalDictionary.cs index 5ddf6238..cc54b2f8 100644 --- a/libsecondlife/InternalDictionary.cs +++ b/libsecondlife/InternalDictionary.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -namespace libsecondlife +namespace OpenMetaverse { /// /// The InternalDictionary class is used through the library for storing key/value pairs. @@ -89,7 +89,7 @@ namespace libsecondlife } /// - /// Initializes a new instance of the Class + /// Initializes a new instance of the Class /// with the specified key/value, With its initial capacity specified. /// /// Initial size of dictionary @@ -106,7 +106,7 @@ namespace libsecondlife } /// - /// Try to get entry from with specified key + /// Try to get entry from with specified key /// /// Key to use for lookup /// Value returned @@ -181,7 +181,7 @@ namespace libsecondlife return found; } - /// Perform an on each entry in an + /// Perform an on each entry in an /// to perform /// /// @@ -208,7 +208,7 @@ namespace libsecondlife } } - /// Perform an on each key of an + /// Perform an on each key of an /// to perform public void ForEach(Action action) { diff --git a/libsecondlife/Inventory.cs b/libsecondlife/Inventory.cs index b89c4e15..3350de45 100644 --- a/libsecondlife/Inventory.cs +++ b/libsecondlife/Inventory.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -namespace libsecondlife +namespace OpenMetaverse { /// /// Exception class to identify inventory exceptions @@ -143,14 +143,14 @@ namespace libsecondlife private LLUUID _Owner; - private SecondLife Client; + private GridClient Client; private InventoryManager Manager; private Dictionary Items = new Dictionary(); - public Inventory(SecondLife client, InventoryManager manager) + public Inventory(GridClient client, InventoryManager manager) : this(client, manager, client.Self.AgentID) { } - public Inventory(SecondLife client, InventoryManager manager, LLUUID owner) + public Inventory(GridClient client, InventoryManager manager, LLUUID owner) { Client = client; Manager = manager; diff --git a/libsecondlife/InventoryManager.cs b/libsecondlife/InventoryManager.cs index 94453a5c..f551a9d9 100644 --- a/libsecondlife/InventoryManager.cs +++ b/libsecondlife/InventoryManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,11 +29,11 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using System.Threading; using System.Text; -using libsecondlife.Capabilities; -using libsecondlife.StructuredData; -using libsecondlife.Packets; +using OpenMetaverse.Capabilities; +using OpenMetaverse.StructuredData; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { #region Enums /// @@ -139,19 +139,19 @@ namespace libsecondlife /// public abstract class InventoryBase { - /// of item/folder + /// of item/folder public readonly LLUUID UUID; - /// of parent folder + /// of parent folder public LLUUID ParentUUID; /// Name of item/folder public string Name; - /// Item/Folder Owners + /// Item/Folder Owners public LLUUID OwnerID; /// /// Constructor, takes an itemID as a parameter /// - /// The of the item + /// The of the item public InventoryBase(LLUUID itemID) { if (itemID == LLUUID.Zero) @@ -170,7 +170,7 @@ namespace libsecondlife } /// - /// Determine whether the specified object is equal to the current object + /// Determine whether the specified object is equal to the current object /// /// InventoryBase object to compare against /// true if objects are the same @@ -181,7 +181,7 @@ namespace libsecondlife } /// - /// Determine whether the specified object is equal to the current object + /// Determine whether the specified object is equal to the current object /// /// InventoryBase object to compare against /// true if objects are the same @@ -199,27 +199,27 @@ namespace libsecondlife /// public class InventoryItem : InventoryBase { - /// The of this item + /// The of this item public LLUUID AssetUUID; - /// The combined of this item + /// The combined of this item public Permissions Permissions; - /// The type of item from + /// The type of item from public AssetType AssetType; - /// The type of item from the enum + /// The type of item from the enum public InventoryType InventoryType; - /// The of the creator of this item + /// The of the creator of this item public LLUUID CreatorID; /// A Description of this item public string Description; - /// The s this item is set to or owned by + /// The s this item is set to or owned by public LLUUID GroupID; /// If true, item is owned by a group public bool GroupOwned; /// The price this item can be purchased for public int SalePrice; - /// The type of sale from the enum + /// The type of sale from the enum public SaleType SaleType; - /// Combined flags from + /// Combined flags from public uint Flags; /// Time and date this inventory item was created, stored as /// UTC (Coordinated Universal Time) @@ -228,15 +228,15 @@ namespace libsecondlife /// /// Construct a new InventoryItem object /// - /// The of the item + /// The of the item public InventoryItem(LLUUID itemID) : base(itemID) { } /// /// Construct a new InventoryItem object of a specific Type /// - /// The type of item from - /// of the item + /// The type of item from + /// of the item public InventoryItem(InventoryType type, LLUUID itemID) : base(itemID) { InventoryType = type; } /// @@ -264,9 +264,9 @@ namespace libsecondlife } /// - /// Determine whether the specified object is equal to the current object + /// Determine whether the specified object is equal to the current object /// - /// The object to compare against + /// The object to compare against /// true if objects are the same public override bool Equals(InventoryBase o) { @@ -275,9 +275,9 @@ namespace libsecondlife } /// - /// Determine whether the specified object is equal to the current object + /// Determine whether the specified object is equal to the current object /// - /// The object to compare against + /// The object to compare against /// true if objects are the same public bool Equals(InventoryItem o) { @@ -305,8 +305,8 @@ namespace libsecondlife /// /// Construct an InventoryTexture object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryTexture(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Texture; @@ -321,8 +321,8 @@ namespace libsecondlife /// /// Construct an InventorySound object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventorySound(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Sound; @@ -337,8 +337,8 @@ namespace libsecondlife /// /// Construct an InventoryCallingCard object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryCallingCard(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.CallingCard; @@ -353,8 +353,8 @@ namespace libsecondlife /// /// Construct an InventoryLandmark object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryLandmark(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Landmark; @@ -378,8 +378,8 @@ namespace libsecondlife /// /// Construct an InventoryObject object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryObject(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Object; @@ -406,8 +406,8 @@ namespace libsecondlife /// /// Construct an InventoryNotecard object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryNotecard(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Notecard; @@ -423,8 +423,8 @@ namespace libsecondlife /// /// Construct an InventoryCategory object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryCategory(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Category; @@ -439,8 +439,8 @@ namespace libsecondlife /// /// Construct an InventoryLSL object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryLSL(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.LSL; @@ -455,8 +455,8 @@ namespace libsecondlife /// /// Construct an InventorySnapshot object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventorySnapshot(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Snapshot; @@ -471,8 +471,8 @@ namespace libsecondlife /// /// Construct an InventoryAttachment object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryAttachment(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Attachment; @@ -496,12 +496,12 @@ namespace libsecondlife /// /// Construct an InventoryWearable object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryWearable(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Wearable; } /// - /// The , Skin, Shape, Skirt, Etc + /// The , Skin, Shape, Skirt, Etc /// public WearableType WearableType { @@ -518,8 +518,8 @@ namespace libsecondlife /// /// Construct an InventoryAnimation object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryAnimation(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Animation; @@ -534,8 +534,8 @@ namespace libsecondlife /// /// Construct an InventoryGesture object /// - /// A which becomes the - /// objects AssetUUID + /// A which becomes the + /// objects AssetUUID public InventoryGesture(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Gesture; @@ -543,12 +543,12 @@ namespace libsecondlife } /// - /// A folder contains s and has certain attributes specific + /// A folder contains s and has certain attributes specific /// to itself /// public class InventoryFolder : InventoryBase { - /// The Preferred for a folder. + /// The Preferred for a folder. public AssetType PreferredType; /// The Version of this folder public int Version; @@ -763,7 +763,7 @@ namespace libsecondlife #endregion Events - private SecondLife _Client; + private GridClient _Client; private Inventory _Store; private Random _RandNumbers = new Random(); private object _CallbacksLock = new object(); @@ -875,8 +875,8 @@ namespace libsecondlife /// /// Default constructor /// - /// Reference to the SecondLife client - public InventoryManager(SecondLife client) + /// Reference to the GridClient object + public InventoryManager(GridClient client) { _Client = client; @@ -905,7 +905,7 @@ namespace libsecondlife /// Fetch an inventory item from the dataserver /// /// The items - /// The item Owners + /// The item Owners /// a integer representing the number of milliseconds to wait for results /// An object on success, or null if no item was found /// Items will also be sent to the event @@ -936,8 +936,8 @@ namespace libsecondlife /// /// Request A single inventory item /// - /// The items - /// The item Owners + /// The items + /// The item Owners /// public void RequestFetchInventory(LLUUID itemID, LLUUID ownerID) { diff --git a/libsecondlife/InventoryNode.cs b/libsecondlife/InventoryNode.cs index f49f334a..3eff410f 100644 --- a/libsecondlife/InventoryNode.cs +++ b/libsecondlife/InventoryNode.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife +namespace OpenMetaverse { public class InventoryNode { diff --git a/libsecondlife/InventoryNodeDictionary.cs b/libsecondlife/InventoryNodeDictionary.cs index 5988bcd9..002fee6b 100644 --- a/libsecondlife/InventoryNodeDictionary.cs +++ b/libsecondlife/InventoryNodeDictionary.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife +namespace OpenMetaverse { public class InventoryNodeDictionary { diff --git a/libsecondlife/LLObject.cs b/libsecondlife/LLObject.cs index 7559d7a6..b5431fe0 100644 --- a/libsecondlife/LLObject.cs +++ b/libsecondlife/LLObject.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// Base class for primitives and avatars @@ -425,7 +425,7 @@ namespace libsecondlife /// public string Description; - //public bool IsOwnedBy(SecondLife client) + //public bool IsOwnedBy(GridClient client) //{ // if (GroupID != LLUUID.Zero) // { diff --git a/libsecondlife/LLSD/BinaryLLSD.cs b/libsecondlife/LLSD/BinaryLLSD.cs index 89d03e69..8964aa50 100644 --- a/libsecondlife/LLSD/BinaryLLSD.cs +++ b/libsecondlife/LLSD/BinaryLLSD.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -39,10 +39,10 @@ using System; using System.IO; using System.Collections; - using System.Collections.Generic; - using System.Text; +using System.Collections.Generic; +using System.Text; - namespace libsecondlife.StructuredData + namespace OpenMetaverse.StructuredData { /// /// diff --git a/libsecondlife/LLSD/LLSD.cs b/libsecondlife/LLSD/LLSD.cs index b0ac924c..b7fc671f 100644 --- a/libsecondlife/LLSD/LLSD.cs +++ b/libsecondlife/LLSD/LLSD.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,7 +29,7 @@ using System.Collections; using System.Collections.Generic; using System.Text; -namespace libsecondlife.StructuredData +namespace OpenMetaverse.StructuredData { /// /// diff --git a/libsecondlife/LLSD/NotationLLSD.cs b/libsecondlife/LLSD/NotationLLSD.cs index b84e8175..167cfe9b 100644 --- a/libsecondlife/LLSD/NotationLLSD.cs +++ b/libsecondlife/LLSD/NotationLLSD.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,7 +29,7 @@ using System.Collections.Generic; using System.Text; using System.IO; -namespace libsecondlife.StructuredData +namespace OpenMetaverse.StructuredData { /// /// diff --git a/libsecondlife/LLSD/XmlLLSD.cs b/libsecondlife/LLSD/XmlLLSD.cs index d2871b6e..44bde92c 100644 --- a/libsecondlife/LLSD/XmlLLSD.cs +++ b/libsecondlife/LLSD/XmlLLSD.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -31,7 +31,7 @@ using System.Xml; using System.Xml.Schema; using System.Text; -namespace libsecondlife.StructuredData +namespace OpenMetaverse.StructuredData { /// /// diff --git a/libsecondlife/Logger.cs b/libsecondlife/Logger.cs index ff0f3dd0..ec808d4f 100644 --- a/libsecondlife/Logger.cs +++ b/libsecondlife/Logger.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -30,16 +30,16 @@ using log4net.Config; [assembly: log4net.Config.XmlConfigurator(Watch = true)] -namespace libsecondlife +namespace OpenMetaverse { /// - /// Singleton logging class for libsecondlife + /// Singleton logging class for the entire library /// public static class Logger { /// /// Callback used for client apps to receive log messages from - /// libsecondlife + /// the library /// /// Data being logged /// The severity of the log entry from @@ -57,7 +57,7 @@ namespace libsecondlife /// static Logger() { - LogInstance = LogManager.GetLogger("libsecondlife"); + LogInstance = LogManager.GetLogger("OpenMetaverse"); // If error level reporting isn't enabled we assume no logger is configured and initialize a default // ConsoleAppender @@ -88,7 +88,7 @@ namespace libsecondlife /// The log message /// The severity of the log entry /// Instance of the client - public static void Log(object message, Helpers.LogLevel level, SecondLife client) + public static void Log(object message, Helpers.LogLevel level, GridClient client) { Log(message, level, client, null); } @@ -111,7 +111,7 @@ namespace libsecondlife /// The severity of the log entry /// Instance of the client /// Exception that was raised - public static void Log(object message, Helpers.LogLevel level, SecondLife client, Exception exception) + public static void Log(object message, Helpers.LogLevel level, GridClient client, Exception exception) { if (client != null && client.Settings.LOG_NAMES) message = String.Format("<{0}>: {1}", client.Self.Name, message); @@ -162,7 +162,7 @@ namespace libsecondlife /// /// If the library is compiled with DEBUG defined and - /// SecondLife.Settings.DEBUG is true, an event will be + /// GridClient.Settings.DEBUG is true, an event will be /// fired if an OnLogMessage handler is registered and the /// message will be sent to the logging engine /// @@ -170,7 +170,7 @@ namespace libsecondlife /// current logging engine /// Instance of the client [System.Diagnostics.Conditional("DEBUG")] - public static void DebugLog(object message, SecondLife client) + public static void DebugLog(object message, GridClient client) { if (Settings.LOG_LEVEL == Helpers.LogLevel.Debug) { diff --git a/libsecondlife/Login.cs b/libsecondlife/Login.cs index 7e2001a3..2243158f 100644 --- a/libsecondlife/Login.cs +++ b/libsecondlife/Login.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -30,11 +30,11 @@ using System.Threading; using System.IO; using System.Net; using System.Security.Cryptography.X509Certificates; -using libsecondlife.StructuredData; -using libsecondlife.Capabilities; -using libsecondlife.Packets; +using OpenMetaverse.StructuredData; +using OpenMetaverse.Capabilities; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { #region Enums @@ -418,7 +418,7 @@ namespace libsecondlife loginParams.LastName = lastName; loginParams.Password = password; loginParams.Start = "last"; - loginParams.Channel = userAgent + " (libsecondlife)"; + loginParams.Channel = userAgent + " (OpenMetaverse)"; loginParams.Version = userVersion; loginParams.Platform = GetPlatform(); loginParams.MAC = GetMAC(); diff --git a/libsecondlife/NameValue.cs b/libsecondlife/NameValue.cs index 747fdb28..b81622ae 100644 --- a/libsecondlife/NameValue.cs +++ b/libsecondlife/NameValue.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,7 +27,7 @@ using System; using System.Collections.Generic; -namespace libsecondlife +namespace OpenMetaverse { /// /// A Name Value pair with additional settings, used in the protocol diff --git a/libsecondlife/NetworkManager.cs b/libsecondlife/NetworkManager.cs index 8859c37b..6028af8a 100644 --- a/libsecondlife/NetworkManager.cs +++ b/libsecondlife/NetworkManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -32,9 +32,9 @@ using System.Net; using System.Net.Sockets; using System.Globalization; using System.IO; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// This exception is thrown whenever a network operation is attempted @@ -44,7 +44,7 @@ namespace libsecondlife /// /// NetworkManager is responsible for managing the network layer of - /// libsecondlife. It tracks all the server connections, serializes + /// OpenMetaverse. It tracks all the server connections, serializes /// outgoing traffic and deserializes incoming traffic, and provides /// instances of delegates for network-related events. /// @@ -87,7 +87,7 @@ namespace libsecondlife /// /// Assigned by the OnConnected event. Raised when login was a success /// - /// Reference to the SecondLife class that called the event + /// Reference to the GridClient object that called the event public delegate void ConnectedCallback(object sender); /// /// Assigned by the OnLogoutReply callback. Raised upone receipt of a LogoutReply packet during logout process. @@ -197,15 +197,15 @@ namespace libsecondlife /// Incoming packets that are awaiting handling internal BlockingQueue PacketInbox = new BlockingQueue(Settings.PACKET_INBOX_SIZE); - private SecondLife Client; + private GridClient Client; private Timer DisconnectTimer; private bool connected = false; /// /// Default constructor /// - /// Reference to the SecondLife client - public NetworkManager(SecondLife client) + /// Reference to the GridClient object + public NetworkManager(GridClient client) { Client = client; @@ -230,7 +230,7 @@ namespace libsecondlife /// /// Register an event handler for a packet. This is a low level event /// interface and should only be used if you are doing something not - /// supported in libsecondlife + /// supported in the library /// /// Packet type to trigger events for /// Callback to fire when a packet of this type @@ -243,7 +243,7 @@ namespace libsecondlife /// /// Unregister an event handler for a packet. This is a low level event /// interface and should only be used if you are doing something not - /// supported in libsecondlife + /// supported in the library /// /// Packet type this callback is registered with /// Callback to stop firing events for @@ -255,7 +255,7 @@ namespace libsecondlife /// /// Register a CAPS event handler. This is a low level event interface /// and should only be used if you are doing something not supported in - /// libsecondlife + /// the library /// /// Name of the CAPS event to register a handler for /// Callback to fire when a CAPS event is received @@ -267,7 +267,7 @@ namespace libsecondlife /// /// Unregister a CAPS event handler. This is a low level event interface /// and should only be used if you are doing something not supported in - /// libsecondlife + /// the library /// /// Name of the CAPS event this callback is /// registered with diff --git a/libsecondlife/ObjectManager.cs b/libsecondlife/ObjectManager.cs index 5cee185a..cc592bfa 100644 --- a/libsecondlife/ObjectManager.cs +++ b/libsecondlife/ObjectManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,9 +27,9 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { #region Enums @@ -471,33 +471,30 @@ namespace libsecondlife #endregion - /// Reference to the SecondLife client - protected SecondLife Client; + /// Reference to the GridClient object + protected GridClient Client; /// Does periodic dead reckoning calculation to convert /// velocity and acceleration to new positions for objects private Timer InterpolationTimer; /// - /// Instantiates a new ObjectManager class. This class should only be accessed - /// through SecondLife.Objects, client applications should never create their own + /// Instantiates a new ObjectManager class /// /// A reference to the client - public ObjectManager(SecondLife client) + internal ObjectManager(GridClient client) { Client = client; RegisterCallbacks(); } /// - /// Instantiates a new ObjectManager class. This class should only be - /// accessed through SecondLife.Objects, client applications should - /// never create their own + /// Instantiates a new ObjectManager class /// /// A reference to the client /// If false, the ObjectManager won't /// register any packet callbacks and won't decode incoming object /// packets - protected ObjectManager(SecondLife client, bool registerCallbacks) + protected ObjectManager(GridClient client, bool registerCallbacks) { Client = client; @@ -549,7 +546,7 @@ namespace libsecondlife /// Request object information for multiple objects all contained in /// the same sim, primarily used for stale or missing cache entries /// - /// A reference to the object where the objects reside + /// A reference to the object where the objects reside /// An array which contains the IDs of the objects to request public void RequestObjects(Simulator simulator, List localIDs) { @@ -576,7 +573,7 @@ namespace libsecondlife /// Attempt to purchase an original object, a copy, or the contents of /// an object /// - /// A reference to the object where the objects reside + /// A reference to the object where the objects reside /// The objects ID which is local to the simulator the object is in /// Whether the original, a copy, or the object /// contents are on sale. This is used for verification, if the this @@ -618,7 +615,7 @@ namespace libsecondlife /// an ObjectProperties packet so we can get the full information for /// this object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in public void SelectObject(Simulator simulator, uint localID) { @@ -638,7 +635,7 @@ namespace libsecondlife /// Select multiple objects. This will trigger the simulator to send us /// back ObjectProperties for each object /// - /// A reference to the object where the objects reside + /// A reference to the object where the objects reside /// An array which contains the IDs of the objects to select public void SelectObjects(Simulator simulator, uint[] localIDs) { @@ -661,7 +658,7 @@ namespace libsecondlife /// /// Deselect an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in public void DeselectObject(Simulator simulator, uint localID) { @@ -680,7 +677,7 @@ namespace libsecondlife /// /// Perform a click action on an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in public void ClickObject(Simulator simulator, uint localID) { @@ -706,7 +703,7 @@ namespace libsecondlife /// /// Create, or "rez" a new prim object in a simulator /// - /// A reference to the object to place the object in + /// A reference to the object to place the object in /// Data describing the prim object to rez /// Group ID that this prim will be set to, or LLUUID.Zero if you /// do not want the object to be associated with a specific group @@ -768,7 +765,7 @@ namespace libsecondlife /// /// Rez a Linden tree /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The size of the tree /// The rotation of the tree /// The position of the tree @@ -801,7 +798,7 @@ namespace libsecondlife /// /// Rez grass and ground cover /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The size of the grass /// The rotation of the grass /// The position of the grass @@ -833,7 +830,7 @@ namespace libsecondlife /// /// Set the textures to apply to the faces of an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The texture data to apply public void SetTextures(Simulator simulator, uint localID, LLObject.TextureEntry textures) @@ -844,7 +841,7 @@ namespace libsecondlife /// /// Set the textures to apply to the faces of an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The texture data to apply /// A media URL (not used) @@ -866,7 +863,7 @@ namespace libsecondlife /// /// Set the Light data on an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// A object containing the data to set public void SetLight(Simulator simulator, uint localID, Primitive.LightData light) @@ -897,7 +894,7 @@ namespace libsecondlife /// /// Set the flexible data on an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// A object containing the data to set public void SetFlexible(Simulator simulator, uint localID, Primitive.FlexibleData flexible) @@ -920,7 +917,7 @@ namespace libsecondlife /// /// Set the sculptie texture and data on an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// A object containing the data to set public void SetSculpt(Simulator simulator, uint localID, Primitive.SculptData sculpt) @@ -946,8 +943,8 @@ namespace libsecondlife shape.AgentData.AgentID = Client.Self.AgentID; shape.AgentData.SessionID = Client.Self.SessionID; - shape.ObjectData = new libsecondlife.Packets.ObjectShapePacket.ObjectDataBlock[1]; - shape.ObjectData[0] = new libsecondlife.Packets.ObjectShapePacket.ObjectDataBlock(); + shape.ObjectData = new OpenMetaverse.Packets.ObjectShapePacket.ObjectDataBlock[1]; + shape.ObjectData[0] = new OpenMetaverse.Packets.ObjectShapePacket.ObjectDataBlock(); shape.ObjectData[0].ObjectLocalID = localID; shape.ObjectData[0].PathScaleX = 100; shape.ObjectData[0].PathScaleY = 150; @@ -959,7 +956,7 @@ namespace libsecondlife /// /// Set additional primitive parameters on an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The extra parameters to set public void SetExtraParamOff(Simulator simulator, uint localID, Primitive.ExtraParamType type) @@ -982,7 +979,7 @@ namespace libsecondlife /// /// Link multiple prims into a linkset /// - /// A reference to the object where the objects reside + /// A reference to the object where the objects reside /// An array which contains the IDs of the objects to link /// The last object in the array will be the root object of the linkset TODO: Is this true? public void LinkPrims(Simulator simulator, List localIDs) @@ -1009,7 +1006,7 @@ namespace libsecondlife /// /// Change the rotation of an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The new rotation of the object public void SetRotation(Simulator simulator, uint localID, LLQuaternion rotation) @@ -1029,7 +1026,7 @@ namespace libsecondlife /// /// Set the name of an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// A string containing the new name of the object public void SetName(Simulator simulator, uint localID, string name) @@ -1040,7 +1037,7 @@ namespace libsecondlife /// /// Set the name of multiple objects /// - /// A reference to the object where the objects reside + /// A reference to the object where the objects reside /// An array which contains the IDs of the objects to change the name of /// An array which contains the new names of the objects public void SetNames(Simulator simulator, uint[] localIDs, string[] names) @@ -1064,7 +1061,7 @@ namespace libsecondlife /// /// Set the description of an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// A string containing the new description of the object public void SetDescription(Simulator simulator, uint localID, string description) @@ -1075,7 +1072,7 @@ namespace libsecondlife /// /// Set the descriptions of multiple objects /// - /// A reference to the object where the objects reside + /// A reference to the object where the objects reside /// An array which contains the IDs of the objects to change the description of /// An array which contains the new descriptions of the objects public void SetDescriptions(Simulator simulator, uint[] localIDs, string[] descriptions) @@ -1099,7 +1096,7 @@ namespace libsecondlife /// /// Attach an object to this avatar /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The point on the avatar the object will be attached /// The rotation of the attached object @@ -1121,7 +1118,7 @@ namespace libsecondlife /// /// Detach an object from yourself /// - /// A reference to the + /// A reference to the /// object where the objects reside /// /// This will always be the simulator the avatar is currently in @@ -1148,7 +1145,7 @@ namespace libsecondlife /// /// Change the position of an object, Will change position of entire linkset /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The new position of the object public void SetPosition(Simulator simulator, uint localID, LLVector3 position) @@ -1159,7 +1156,7 @@ namespace libsecondlife /// /// Change the position of an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The new position of the object /// if true, will change position of (this) child prim only, not entire linkset @@ -1176,7 +1173,7 @@ namespace libsecondlife /// /// Change the Scale (size) of an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The new scale of the object /// If true, will change scale of this prim only, not entire linkset @@ -1197,7 +1194,7 @@ namespace libsecondlife /// /// Change the Rotation of an object that is either a child or a whole linkset /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The new scale of the object /// If true, will change rotation of this prim only, not entire linkset @@ -1225,7 +1222,7 @@ namespace libsecondlife /// /// Send a Multiple Object Update packet to change the size, scale or rotation of a primitive /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The new rotation, size, or position of the target object /// The flags from the Enum @@ -1249,7 +1246,7 @@ namespace libsecondlife /// Deed an object (prim) to a group, Object must be shared with group which /// can be accomplished with SetPermissions() /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The of the group to deed the object to public void DeedObject(Simulator simulator, uint localID, LLUUID groupOwner) @@ -1275,7 +1272,7 @@ namespace libsecondlife /// Deed multiple objects (prims) to a group, Objects must be shared with group which /// can be accomplished with SetPermissions() /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// An array which contains the IDs of the objects to deed /// The of the group to deed the object to public void DeedObjects(Simulator simulator, List localIDs, LLUUID groupOwner) @@ -1302,7 +1299,7 @@ namespace libsecondlife /// /// Set the permissions on multiple objects /// - /// A reference to the object where the objects reside + /// A reference to the object where the objects reside /// An array which contains the IDs of the objects to set the permissions on /// The new Who mask to set /// The new Permissions mark to set @@ -1336,7 +1333,7 @@ namespace libsecondlife /// /// Request additional properties for an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// public void RequestObjectPropertiesFamily(Simulator simulator, LLUUID objectID) { @@ -1346,7 +1343,7 @@ namespace libsecondlife /// /// Request additional properties for an object /// - /// A reference to the object where the object resides + /// A reference to the object where the object resides /// Absolute UUID of the object /// Whether to require server acknowledgement of this request public void RequestObjectPropertiesFamily(Simulator simulator, LLUUID objectID, bool reliable) diff --git a/libsecondlife/ObjectPoolBase.cs b/libsecondlife/ObjectPoolBase.cs index 1609f9e1..3a7399e0 100644 --- a/libsecondlife/ObjectPoolBase.cs +++ b/libsecondlife/ObjectPoolBase.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,7 +29,7 @@ using System.Collections; using System.Collections.Generic; using System.Threading; -namespace libsecondlife +namespace OpenMetaverse { public sealed class WrappedObject : IDisposable where T : class { diff --git a/libsecondlife/libsecondlife.csproj b/libsecondlife/OpenMetaverse.csproj similarity index 95% rename from libsecondlife/libsecondlife.csproj rename to libsecondlife/OpenMetaverse.csproj index 56e3df75..854fe6b4 100644 --- a/libsecondlife/libsecondlife.csproj +++ b/libsecondlife/OpenMetaverse.csproj @@ -1,210 +1,207 @@ - - - Local - 8.0.50727 - 2.0 - {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - Debug - AnyCPU - - - - - libsecondlife - - - JScript - Grid - IE50 - false - Library - libsecondlife - OnBuildSuccess - - - - - - - ..\bin\ - true - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - - - ..\bin\ - true - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - - - ..\bin\ - TRACE - 285212672 - true - true - - - AnyCPU - C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules - true - GlobalSuppressions.cs - prompt - ..\bin\libsecondlife.XML - 1591 - - - - - System - - - System.Data - - - - System.XML - - - - - - - - - - - Code - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - Code - - - - - - Code - - - Code - - - - - Code - - - - Code - - - Code - - - - - Code - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - xcopy "$(ProjectDir)Resources\*.*" "$(OutDir)libsl_data" /i /d /y - - + + + Local + 8.0.50727 + 2.0 + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} + Debug + AnyCPU + + + + + OpenMetaverse + + + JScript + Grid + IE50 + false + Library + OpenMetaverse + OnBuildSuccess + + + + + + + ..\bin\ + true + 285212672 + false + + + DEBUG;TRACE + + + true + 4096 + false + + + false + false + false + false + 4 + full + prompt + + + ..\bin\ + true + 285212672 + false + + + TRACE + + + false + 4096 + false + + + true + false + false + false + 4 + none + prompt + + + ..\bin\ + TRACE + 285212672 + true + true + + + AnyCPU + C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules + true + GlobalSuppressions.cs + prompt + ..\bin\OpenMetaverse.xml + 1591 + + + + + System + + + System.Data + + + + System.XML + + + + + + + + + + + Code + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + Code + + + + + + Code + + + Code + + + + + Code + + + + Code + + + Code + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + xcopy "$(ProjectDir)Resources\*.*" "$(OutDir)libsl_data" /i /d /y + + \ No newline at end of file diff --git a/libsecondlife/ParcelManager.cs b/libsecondlife/ParcelManager.cs index 6e959c3a..d7708e6e 100644 --- a/libsecondlife/ParcelManager.cs +++ b/libsecondlife/ParcelManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,10 +28,10 @@ using System; using System.Collections.Generic; using System.Threading; using System.Reflection; -using libsecondlife.Packets; -using libsecondlife.StructuredData; +using OpenMetaverse.Packets; +using OpenMetaverse.StructuredData; -namespace libsecondlife +namespace OpenMetaverse { #region Structs @@ -42,7 +42,7 @@ namespace libsecondlife { /// Global Key of record public LLUUID ID; - /// Parcel Owners + /// Parcel Owners public LLUUID OwnerID; /// Name field of parcel, limited to 128 characters public string Name; @@ -62,7 +62,7 @@ namespace libsecondlife public float GlobalZ; /// Name of simulator parcel is located in public string SimName; - /// Texture of parcels display picture + /// Texture of parcels display picture public LLUUID SnapshotID; /// Float representing calculated traffic based on time spent on parcel by avatars public float Dwell; @@ -608,7 +608,7 @@ namespace libsecondlife /// public struct ParcelAccessEntry { - /// Agents + /// Agents public LLUUID AgentID; /// public DateTime Time; @@ -621,7 +621,7 @@ namespace libsecondlife /// public struct ParcelPrimOwners { - /// Prim Owners + /// Prim Owners public LLUUID OwnerID; /// True of owner is group public bool IsGroupOwned; @@ -707,15 +707,15 @@ namespace libsecondlife public event ForceSelectObjects OnParcelSelectedObjects; #endregion Events - private SecondLife Client; + private GridClient Client; #region Public Methods /// /// Default constructor /// - /// A reference to the SecondLife client - public ParcelManager(SecondLife client) + /// A reference to the GridClient object + public ParcelManager(GridClient client) { Client = client; // Setup the callbacks @@ -888,7 +888,7 @@ namespace libsecondlife /// The Simulator the parcel is located in /// The parcels region specific local ID /// true if this parcel is being purchased by a group - /// The groups + /// The groups /// true to remove tier contribution if purchase is successful /// The parcels size /// The purchase price of the parcel @@ -934,7 +934,7 @@ namespace libsecondlife /// /// The simulator the parcel is in /// The parcels region specific local ID - /// The groups + /// The groups public void DeedToGroup(Simulator simulator, int localID, LLUUID groupID) { ParcelDeedToGroupPacket request = new ParcelDeedToGroupPacket(); @@ -968,8 +968,8 @@ namespace libsecondlife /// /// Simulator parcel is in /// The parcels region specific local ID - /// the type of objects to return, - /// A list containing object owners s to return + /// the type of objects to return, + /// A list containing object owners s to return public void ReturnObjects(Simulator simulator, int localID, ObjectReturnType type, List ownerIDs) { ParcelReturnObjectsPacket request = new ParcelReturnObjectsPacket(); diff --git a/libsecondlife/ParticleSystem.cs b/libsecondlife/ParticleSystem.cs index 4af86226..7c198052 100644 --- a/libsecondlife/ParticleSystem.cs +++ b/libsecondlife/ParticleSystem.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; -namespace libsecondlife +namespace OpenMetaverse { /// /// Particle system specific enumerators, flags and methods. diff --git a/libsecondlife/Permissions.cs b/libsecondlife/Permissions.cs index 5785fce1..dd031b55 100644 --- a/libsecondlife/Permissions.cs +++ b/libsecondlife/Permissions.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,7 +26,7 @@ using System; -namespace libsecondlife +namespace OpenMetaverse { /// /// diff --git a/libsecondlife/Prims.cs b/libsecondlife/Prims.cs index 20dddf3a..5826104c 100644 --- a/libsecondlife/Prims.cs +++ b/libsecondlife/Prims.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; -using libsecondlife.StructuredData; +using OpenMetaverse.StructuredData; -namespace libsecondlife +namespace OpenMetaverse { public partial class Primitive : LLObject { diff --git a/libsecondlife/ProtocolManager.cs b/libsecondlife/ProtocolManager.cs index 8dd59fcd..577d5806 100644 --- a/libsecondlife/ProtocolManager.cs +++ b/libsecondlife/ProtocolManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace libsecondlife +namespace OpenMetaverse { /// /// @@ -209,14 +209,14 @@ namespace libsecondlife /// public MapPacket[] HighMaps; - private SecondLife Client; + private GridClient Client; /// /// /// /// /// - public ProtocolManager(string mapFile, SecondLife client) + public ProtocolManager(string mapFile, GridClient client) { Client = client; diff --git a/libsecondlife/ReaderWriterLock.cs b/libsecondlife/ReaderWriterLock.cs deleted file mode 100644 index a56f65df..00000000 --- a/libsecondlife/ReaderWriterLock.cs +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Copyright (c) 2007-2008, the libsecondlife development team - * All rights reserved. - * - * - Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * - Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names - * of its contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Threading; - -#if PocketPC - -// FIXME: This class was very likely broken when converting things to Auto/Manual ResetEvents - -namespace libsecondlife -{ - /// - /// A reader-writer lock implementation that is intended to be simple, yet very - /// efficient. In particular only 1 interlocked operation is taken for any lock - /// operation (we use spin locks to achieve this). The spin lock is never held - /// for more than a few instructions (in particular, we never call event APIs - /// or in fact any non-trivial API while holding the spin lock). - /// - /// Currently this ReaderWriterLock does not support recurision, however it is - /// not hard to add - /// - public class ReaderWriterLock - { - // Lock specifiation for myLock: This lock protects exactly the local fields associted - // instance of MyReaderWriterLock. It does NOT protect the memory associted with the - // the events that hang off this lock (eg writeEvent, readEvent upgradeEvent). - int myLock; - - // Who owns the lock owners > 0 => readers - // owners = -1 means there is one writer. Owners must be >= -1. - int owners; - - // These variables allow use to avoid Setting events (which is expensive) if we don't have to. - uint numWriteWaiters; // maximum number of threads that can be doing a WaitOne on the writeEvent - uint numReadWaiters; // maximum number of threads that can be doing a WaitOne on the readEvent - uint numUpgradeWaiters; // maximum number of threads that can be doing a WaitOne on the upgradeEvent (at most 1). - - // conditions we wait on. - WaitHandle writeEvent; // threads waiting to aquire a write lock go here. - WaitHandle readEvent; // threads waiting to aquire a read lock go here (will be released in bulk) - WaitHandle upgradeEvent; // thread waiting to upgrade a read lock to a write lock go here (at most one) - - public ReaderWriterLock() - { - // All state can start out zeroed. - } - - public void AcquireReaderLock(int millisecondsTimeout) - { - EnterMyLock(); - for (; ; ) - { - // We can enter a read lock if there are only read-locks have been given out - // and a writer is not trying to get in. - if (owners >= 0 && numWriteWaiters == 0) - { - // Good case, there is no contention, we are basically done - owners++; // Indicate we have another reader - break; - } - - // Drat, we need to wait. Mark that we have waiters and wait. - if (readEvent == null) // Create the needed event - { - LazyCreateEvent(ref readEvent, false); - continue; // since we left the lock, start over. - } - - WaitOnEvent(readEvent, ref numReadWaiters, millisecondsTimeout); - } - ExitMyLock(); - } - - public void AcquireWriterLock(int millisecondsTimeout) - { - EnterMyLock(); - for (; ; ) - { - if (owners == 0) - { - // Good case, there is no contention, we are basically done - owners = -1; // indicate we have a writer. - break; - } - - // Drat, we need to wait. Mark that we have waiters and wait. - if (writeEvent == null) // create the needed event. - { - LazyCreateEvent(ref writeEvent, true); - continue; // since we left the lock, start over. - } - - WaitOnEvent(writeEvent, ref numWriteWaiters, millisecondsTimeout); - } - ExitMyLock(); - } - - public void UpgradeToWriterLock(int millisecondsTimeout) - { - EnterMyLock(); - for (; ; ) - { - Debug.Assert(owners > 0, "Upgrading when no reader lock held"); - if (owners == 1) - { - // Good case, there is no contention, we are basically done - owners = -1; // inidicate we have a writer. - break; - } - - // Drat, we need to wait. Mark that we have waiters and wait. - if (upgradeEvent == null) // Create the needed event - { - LazyCreateEvent(ref upgradeEvent, false); - continue; // since we left the lock, start over. - } - - if (numUpgradeWaiters > 0) - { - ExitMyLock(); - throw new ApplicationException("UpgradeToWriterLock already in process. Deadlock!"); - } - - WaitOnEvent(upgradeEvent, ref numUpgradeWaiters, millisecondsTimeout); - } - ExitMyLock(); - } - - public void ReleaseReaderLock() - { - EnterMyLock(); - Debug.Assert(owners > 0, "ReleasingReaderLock: releasing lock and no read lock taken"); - --owners; - ExitAndWakeUpAppropriateWaiters(); - } - - public void ReleaseWriterLock() - { - EnterMyLock(); - Debug.Assert(owners == -1, "Calling ReleaseWriterLock when no write lock is held"); - Debug.Assert(numUpgradeWaiters > 0); - owners++; - ExitAndWakeUpAppropriateWaiters(); - } - - public void DowngradeToReaderLock() - { - EnterMyLock(); - Debug.Assert(owners == -1, "Downgrading when no writer lock held"); - owners = 1; - ExitAndWakeUpAppropriateWaiters(); - } - - /// - /// A routine for lazily creating a event outside the lock (so if errors - /// happen they are outside the lock and that we don't do much work - /// while holding a spin lock). If all goes well, reenter the lock and - /// set 'waitEvent' - /// - private void LazyCreateEvent(ref WaitHandle waitEvent, bool makeAutoResetEvent) - { - Debug.Assert(MyLockHeld); - Debug.Assert(waitEvent == null); - - ExitMyLock(); - WaitHandle newEvent; - if (makeAutoResetEvent) - newEvent = new AutoResetEvent(false); - else - newEvent = new ManualResetEvent(false); - EnterMyLock(); - if (waitEvent == null) // maybe someone snuck in. - waitEvent = newEvent; - } - - /// - /// Waits on 'waitEvent' with a timeout of 'millisceondsTimeout. - /// Before the wait 'numWaiters' is incremented and is restored before leaving this routine. - /// - private void WaitOnEvent(WaitHandle waitEvent, ref uint numWaiters, int millisecondsTimeout) - { - Debug.Assert(MyLockHeld); - - if (waitEvent is AutoResetEvent) - ((AutoResetEvent)waitEvent).Reset(); - else - ((ManualResetEvent)waitEvent).Reset(); - - numWaiters++; - - bool waitSuccessful = false; - ExitMyLock(); // Do the wait outside of any lock - try - { - if (!waitEvent.WaitOne(millisecondsTimeout, false)) - throw new ApplicationException("ReaderWriterLock timeout expired"); - waitSuccessful = true; - } - finally - { - EnterMyLock(); - --numWaiters; - if (!waitSuccessful) // We are going to throw for some reason. Exit myLock. - ExitMyLock(); - } - } - - /// - /// Determines the appropriate events to set, leaves the locks, and sets the events. - /// - private void ExitAndWakeUpAppropriateWaiters() - { - Debug.Assert(MyLockHeld); - - if (owners == 0 && numWriteWaiters > 0) - { - ExitMyLock(); // Exit before signaling to improve efficiency (wakee will need the lock) - - // release one writer - if (writeEvent is AutoResetEvent) - ((AutoResetEvent)writeEvent).Set(); - else - ((ManualResetEvent)writeEvent).Set(); - } - else if (owners == 1 && numUpgradeWaiters != 0) - { - ExitMyLock(); // Exit before signaling to improve efficiency (wakee will need the lock) - - // release all upgraders (however there can be at most one). - // two threads upgrading is a guarenteed deadlock, so we throw in that case - if (upgradeEvent is AutoResetEvent) - ((AutoResetEvent)upgradeEvent).Set(); - else - ((ManualResetEvent)upgradeEvent).Set(); - } - else if (owners >= 0 && numReadWaiters != 0) - { - ExitMyLock(); // Exit before signaling to improve efficiency (wakee will need the lock) - // release all readers - if (readEvent is AutoResetEvent) - ((AutoResetEvent)readEvent).Set(); - else - ((ManualResetEvent)readEvent).Set(); - } - else - ExitMyLock(); - } - - private void EnterMyLock() - { - if (Interlocked.CompareExchange(ref myLock, 1, 0) != 0) - EnterMyLockSpin(); - } - - private void EnterMyLockSpin() - { - for (int i = 0; ; i++) - { - Thread.Sleep(0); // Give up my quantum. - - if (Interlocked.CompareExchange(ref myLock, 1, 0) == 0) - return; - } - } - private void ExitMyLock() - { - Debug.Assert(myLock != 0, "Exiting spin lock that is not held"); - myLock = 0; - } - - private bool MyLockHeld { get { return myLock != 0; } } - - }; -} - -#endif diff --git a/libsecondlife/Settings.cs b/libsecondlife/Settings.cs index 61ca0402..17c2cf1f 100644 --- a/libsecondlife/Settings.cs +++ b/libsecondlife/Settings.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,15 +26,15 @@ using System; using System.Collections.Generic; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// Class for controlling various system settings. /// /// Some values are readonly because they affect things that - /// happen when the SecondLife object is initialized, so changing them at + /// happen when the GridClient object is initialized, so changing them at /// runtime won't do any good. Non-readonly values may affect things that /// happen at login or dynamically public class Settings @@ -162,12 +162,12 @@ namespace libsecondlife /// Enable/disable sending periodic camera updates public bool SEND_AGENT_UPDATES = true; - /// Enable/disable libsecondlife automatically setting the - /// bandwidth throttle after connecting to each simulator - /// The default libsecondlife throttle uses the equivalent of - /// the maximum bandwidth setting in the official client. If you do not - /// set a throttle your connection will by default be throttled well - /// below the minimum values and you may experience connection problems + /// Enable/disable automatically setting the bandwidth throttle + /// after connecting to each simulator + /// The default throttle uses the equivalent of the maximum + /// bandwidth setting in the official client. If you do not set a + /// throttle your connection will by default be throttled well below + /// the minimum values and you may experience connection problems public bool SEND_AGENT_THROTTLE = true; /// Enable/disable the sending of pings to monitor lag and @@ -203,7 +203,7 @@ namespace libsecondlife public bool LOG_ALL_CAPS_ERRORS = false; /// If true, any reference received for a folder or item - /// libsecondlife is not aware of will automatically be fetched + /// the library is not aware of will automatically be fetched public bool FETCH_MISSING_INVENTORY = true; /// If true, and SEND_AGENT_UPDATES is true, @@ -290,12 +290,12 @@ namespace libsecondlife #endregion #region Private Fields - private SecondLife Client; + private GridClient Client; private int priceUpload = 0; /// Constructor - /// Reference to a SecondLife client object - public Settings(SecondLife client) + /// Reference to a GridClient object + public Settings(GridClient client) { Client = client; Client.Network.RegisterCallback(Packets.PacketType.EconomyData, new NetworkManager.PacketCallback(EconomyDataHandler)); diff --git a/libsecondlife/Simulator.cs b/libsecondlife/Simulator.cs index 8e496e0d..fecab066 100644 --- a/libsecondlife/Simulator.cs +++ b/libsecondlife/Simulator.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, the libsecondlife development team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,9 +29,9 @@ using System.Collections.Generic; using System.Threading; using System.Net; using System.Net.Sockets; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { /// /// @@ -232,7 +232,7 @@ namespace libsecondlife /// A public reference to the client that this Simulator object /// is attached to - public SecondLife Client; + public GridClient Client; /// public LLUUID ID = LLUUID.Zero; /// The capabilities for this simulator @@ -295,7 +295,7 @@ namespace libsecondlife public float BillableFactor; /// Statistics information for this simulator and the /// connection to the simulator, calculated by the simulator itself - /// and libsecondlife + /// and the library public SimStats Stats; /// Provides access to two thread-safe dictionaries containing @@ -412,10 +412,10 @@ namespace libsecondlife /// /// /// - /// Reference to the SecondLife client + /// Reference to the GridClient object /// IPEndPoint of the simulator /// handle of the simulator - public Simulator(SecondLife client, IPEndPoint address, ulong handle) + public Simulator(GridClient client, IPEndPoint address, ulong handle) : base(address) { Client = client; diff --git a/libsecondlife/SoundManager.cs b/libsecondlife/SoundManager.cs index 291dc60e..ac83d64d 100644 --- a/libsecondlife/SoundManager.cs +++ b/libsecondlife/SoundManager.cs @@ -1,38 +1,38 @@ -/* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team - * All rights reserved. - * - * - Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * - Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names - * of its contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. +/* + * Copyright (c) 2006-2008, openmetaverse.org + * All rights reserved. + * + * - Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * - Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * - Neither the name of the openmetaverse.org nor the names + * of its contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ using System; using System.Collections.Generic; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { public class SoundManager { - public readonly SecondLife Client; + public readonly GridClient Client; public delegate void AttachSoundCallback(LLUUID soundID, LLUUID ownerID, LLUUID objectID, float gain, byte flags); public delegate void AttachedSoundGainChangeCallback(LLUUID objectID, float gain); @@ -44,7 +44,7 @@ namespace libsecondlife public event SoundTriggerCallback OnSoundTrigger; public event PreloadSoundCallback OnPreloadSound; - public SoundManager(SecondLife client) + public SoundManager(GridClient client) { Client = client; diff --git a/libsecondlife/TerrainManager.cs b/libsecondlife/TerrainManager.cs index d26c094c..471c240f 100644 --- a/libsecondlife/TerrainManager.cs +++ b/libsecondlife/TerrainManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; -using libsecondlife.Packets; +using OpenMetaverse.Packets; -namespace libsecondlife +namespace OpenMetaverse { public class TerrainManager { @@ -91,7 +91,7 @@ namespace libsecondlife private const int NEGATIVE_VALUE = 0x7; private const int END_OF_PATCHES = 97; - private SecondLife Client; + private GridClient Client; private float[] DequantizeTable16 = new float[16 * 16]; private float[] DequantizeTable32 = new float[32 * 32]; private float[] CosineTable16 = new float[16 * 16]; @@ -107,7 +107,7 @@ namespace libsecondlife /// /// /// - public TerrainManager(SecondLife client) + public TerrainManager(GridClient client) { Client = client; diff --git a/libsecondlife/TextureEntry.cs b/libsecondlife/TextureEntry.cs index f3318df9..79f187b0 100644 --- a/libsecondlife/TextureEntry.cs +++ b/libsecondlife/TextureEntry.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,9 +27,9 @@ using System; using System.Collections.Generic; using System.IO; -using libsecondlife.StructuredData; +using OpenMetaverse.StructuredData; -namespace libsecondlife +namespace OpenMetaverse { #region Enumerations @@ -497,7 +497,7 @@ namespace libsecondlife /// /// Represents all of the texturable faces for an object /// - /// Objects in Second Life have infinite faces, with each face + /// Grid objects have infinite faces, with each face /// using the properties of the default face unless set otherwise. So if /// you have a TextureEntry with a default texture uuid of X, and face 18 /// has a texture UUID of Y, every face would be textured with X except for diff --git a/libsecondlife/Types.cs b/libsecondlife/Types.cs index 9b444090..a58f5e0a 100644 --- a/libsecondlife/Types.cs +++ b/libsecondlife/Types.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; -using libsecondlife.StructuredData; +using OpenMetaverse.StructuredData; -namespace libsecondlife +namespace OpenMetaverse { /// /// A 128-bit Universally Unique Identifier, used throughout the Second @@ -463,8 +463,7 @@ namespace libsecondlife /// /// Get a formatted string representation of the vector /// - /// A string representation of the vector, similar to the LSL - /// vector to string conversion in Second Life + /// A string representation of the vector public override string ToString() { return String.Format(Helpers.EnUsCulture, "<{0}, {1}>", X, Y); @@ -869,8 +868,7 @@ namespace libsecondlife /// /// Get a formatted string representation of the vector /// - /// A string representation of the vector, similar to the LSL - /// vector to string conversion in Second Life + /// A string representation of the vector public override string ToString() { return String.Format(Helpers.EnUsCulture, "<{0}, {1}, {2}>", X, Y, Z); diff --git a/libsecondlife/UDPBase.cs b/libsecondlife/UDPBase.cs index ca7c3f05..bb23e1f3 100644 --- a/libsecondlife/UDPBase.cs +++ b/libsecondlife/UDPBase.cs @@ -8,7 +8,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -30,7 +30,7 @@ using System.Net; using System.Net.Sockets; using System.Threading; -namespace libsecondlife +namespace OpenMetaverse { // this class encapsulates a single packet that // is either sent or received by a UDP socket @@ -143,7 +143,7 @@ namespace libsecondlife // this avoids the problem of closing the socket with outstanding operations // and trying to catch the inevitable ObjectDisposedException. #if PocketPC - private libsecondlife.ReaderWriterLock rwLock = new libsecondlife.ReaderWriterLock(); + private OpenMetaverse.ReaderWriterLock rwLock = new OpenMetaverse.ReaderWriterLock(); #else private ReaderWriterLock rwLock = new ReaderWriterLock(); #endif diff --git a/libsecondlife/VisualParamGenerator/VisualParamGenerator.cs b/libsecondlife/VisualParamGenerator/VisualParamGenerator.cs index 9c4628f0..78d7a8a2 100644 --- a/libsecondlife/VisualParamGenerator/VisualParamGenerator.cs +++ b/libsecondlife/VisualParamGenerator/VisualParamGenerator.cs @@ -53,7 +53,7 @@ namespace VisualParamGenerator try { // Read in avatar_lad.xml - Stream stream = libsecondlife.Helpers.GetResourceStream("avatar_lad.xml"); + Stream stream = OpenMetaverse.Helpers.GetResourceStream("avatar_lad.xml"); StreamReader reader = new StreamReader(stream); if (stream != null) diff --git a/libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj b/libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj index bea83f7b..0e92bee8 100644 --- a/libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj +++ b/libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj @@ -46,9 +46,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse diff --git a/libsecondlife/Voice/TCPPipe.cs b/libsecondlife/Voice/TCPPipe.cs index 32aa716f..a526a711 100644 --- a/libsecondlife/Voice/TCPPipe.cs +++ b/libsecondlife/Voice/TCPPipe.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,7 +28,7 @@ using System; using System.Net; using System.Net.Sockets; -namespace libsecondlife.Voice +namespace OpenMetaverse.Voice { public class TCPPipe { diff --git a/libsecondlife/Voice/VoiceAccount.cs b/libsecondlife/Voice/VoiceAccount.cs index 30c8bb89..bb5b92c8 100644 --- a/libsecondlife/Voice/VoiceAccount.cs +++ b/libsecondlife/Voice/VoiceAccount.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife.Voice +namespace OpenMetaverse.Voice { public partial class VoiceGateway { diff --git a/libsecondlife/Voice/VoiceAux.cs b/libsecondlife/Voice/VoiceAux.cs index 9501a553..b4ee7d94 100644 --- a/libsecondlife/Voice/VoiceAux.cs +++ b/libsecondlife/Voice/VoiceAux.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife.Voice +namespace OpenMetaverse.Voice { public partial class VoiceGateway { diff --git a/libsecondlife/Voice/VoiceConnector.cs b/libsecondlife/Voice/VoiceConnector.cs index 975e8cfb..e735e3ea 100644 --- a/libsecondlife/Voice/VoiceConnector.cs +++ b/libsecondlife/Voice/VoiceConnector.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife.Voice +namespace OpenMetaverse.Voice { public partial class VoiceGateway { diff --git a/libsecondlife/Voice/VoiceDefinitions.cs b/libsecondlife/Voice/VoiceDefinitions.cs index f78a2f66..91baa5de 100644 --- a/libsecondlife/Voice/VoiceDefinitions.cs +++ b/libsecondlife/Voice/VoiceDefinitions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Xml; using System.Xml.Serialization; -namespace libsecondlife.Voice +namespace OpenMetaverse.Voice { public partial class VoiceGateway { diff --git a/libsecondlife/Voice/VoiceGateway.cs b/libsecondlife/Voice/VoiceGateway.cs index dc960a3f..6770b525 100644 --- a/libsecondlife/Voice/VoiceGateway.cs +++ b/libsecondlife/Voice/VoiceGateway.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using System.Threading; using System.Text; -namespace libsecondlife.Voice +namespace OpenMetaverse.Voice { public partial class VoiceGateway { diff --git a/libsecondlife/Voice/VoiceSession.cs b/libsecondlife/Voice/VoiceSession.cs index 9a0916c5..a8988bd9 100644 --- a/libsecondlife/Voice/VoiceSession.cs +++ b/libsecondlife/Voice/VoiceSession.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife.Voice +namespace OpenMetaverse.Voice { public partial class VoiceGateway { diff --git a/libsecondlife/_Packets_.cs b/libsecondlife/_Packets_.cs index ddacd8d5..ea48999d 100644 --- a/libsecondlife/_Packets_.cs +++ b/libsecondlife/_Packets_.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,9 +26,9 @@ using System; using System.Text; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.Packets +namespace OpenMetaverse.Packets { /// /// Thrown when a packet could not be successfully deserialized @@ -52,8 +52,8 @@ namespace libsecondlife.Packets } /// - /// The Second Life header of a message template packet. Either 5, 6, or 8 - /// bytes in length at the beginning of the packet, and encapsulates any + /// The header of a message template packet. Either 5, 6, or 8 bytes in + /// length at the beginning of the packet, and encapsulates any /// appended ACKs at the end of the packet as well /// public abstract class Header diff --git a/libsecondlife/_VisualParam_.cs b/libsecondlife/_VisualParam_.cs index f0ca5f42..d9b4398b 100644 --- a/libsecondlife/_VisualParam_.cs +++ b/libsecondlife/_VisualParam_.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace libsecondlife +namespace OpenMetaverse { /// /// A single visual characteristic of an avatar mesh, such as eyebrow height diff --git a/libsecondlife/examples/Baker/Baker.csproj b/libsecondlife/examples/Baker/Baker.csproj index 6e70f17c..074e7b8a 100644 --- a/libsecondlife/examples/Baker/Baker.csproj +++ b/libsecondlife/examples/Baker/Baker.csproj @@ -70,9 +70,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse \ No newline at end of file diff --git a/libsecondlife/examples/Baker/frmBaker.cs b/libsecondlife/examples/Baker/frmBaker.cs index 7e70b307..421a5e25 100644 --- a/libsecondlife/examples/Baker/frmBaker.cs +++ b/libsecondlife/examples/Baker/frmBaker.cs @@ -7,7 +7,7 @@ using System.Drawing.Imaging; using System.Text; using System.Windows.Forms; using System.IO; -using libsecondlife.Imaging; +using OpenMetaverse.Imaging; namespace Baker { @@ -28,7 +28,7 @@ namespace Baker private void DisplayResource(string resource) { - Stream stream = libsecondlife.Helpers.GetResourceStream(resource + ".tga"); + Stream stream = OpenMetaverse.Helpers.GetResourceStream(resource + ".tga"); if (stream != null) { diff --git a/libsecondlife/examples/GUITestClient/GUITestClient.cs b/libsecondlife/examples/GUITestClient/GUITestClient.cs index d3d9b2b1..45e13af6 100644 --- a/libsecondlife/examples/GUITestClient/GUITestClient.cs +++ b/libsecondlife/examples/GUITestClient/GUITestClient.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; -namespace libsecondlife.GUITestClient +namespace OpenMetaverse.GUITestClient { static class Program { diff --git a/libsecondlife/examples/GUITestClient/GUITestClient.csproj b/libsecondlife/examples/GUITestClient/GUITestClient.csproj index fe5472d3..e0fd7378 100644 --- a/libsecondlife/examples/GUITestClient/GUITestClient.csproj +++ b/libsecondlife/examples/GUITestClient/GUITestClient.csproj @@ -84,9 +84,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse diff --git a/libsecondlife/examples/GUITestClient/Interface.cs b/libsecondlife/examples/GUITestClient/Interface.cs index c935dd0f..ddb6d5b2 100644 --- a/libsecondlife/examples/GUITestClient/Interface.cs +++ b/libsecondlife/examples/GUITestClient/Interface.cs @@ -2,13 +2,13 @@ using System; using System.Windows.Forms; using System.Collections.Generic; -namespace libsecondlife.GUITestClient +namespace OpenMetaverse.GUITestClient { public abstract class Interface { public string Name; public string Description; - public SecondLife Client; + public GridClient Client; public TabPage TabPage; public abstract void Initialize(); diff --git a/libsecondlife/examples/GUITestClient/Interfaces/HeightmapInterface.cs b/libsecondlife/examples/GUITestClient/Interfaces/HeightmapInterface.cs index 424ff7b4..adf8c5cf 100644 --- a/libsecondlife/examples/GUITestClient/Interfaces/HeightmapInterface.cs +++ b/libsecondlife/examples/GUITestClient/Interfaces/HeightmapInterface.cs @@ -2,9 +2,9 @@ using System; using System.Drawing; using System.Drawing.Imaging; using System.Windows.Forms; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.GUITestClient +namespace OpenMetaverse.GUITestClient { public class HeightmapInterface : Interface { diff --git a/libsecondlife/examples/GUITestClient/Interfaces/MinimapInterface.cs b/libsecondlife/examples/GUITestClient/Interfaces/MinimapInterface.cs index 3ca2dea2..2cb98e94 100644 --- a/libsecondlife/examples/GUITestClient/Interfaces/MinimapInterface.cs +++ b/libsecondlife/examples/GUITestClient/Interfaces/MinimapInterface.cs @@ -5,11 +5,11 @@ using System.Drawing.Imaging; using System.Drawing; using System.Text; using System.Windows.Forms; -using libsecondlife; +using OpenMetaverse; using System.Net; using System.Diagnostics; -namespace libsecondlife.GUITestClient +namespace OpenMetaverse.GUITestClient { public class MinimapInterface : Interface { @@ -107,7 +107,7 @@ namespace libsecondlife.GUITestClient TabPage.Controls.Add(cmdRefresh); } - // Ripped from "Terrain Scultor" by Cadroe with minors changes + // 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() { diff --git a/libsecondlife/examples/GUITestClient/Interfaces/TeleportInterface.cs b/libsecondlife/examples/GUITestClient/Interfaces/TeleportInterface.cs index 672d511d..68ca6919 100644 --- a/libsecondlife/examples/GUITestClient/Interfaces/TeleportInterface.cs +++ b/libsecondlife/examples/GUITestClient/Interfaces/TeleportInterface.cs @@ -4,9 +4,9 @@ using System.Drawing.Imaging; using System.Drawing; using System.Text; using System.Windows.Forms; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.GUITestClient +namespace OpenMetaverse.GUITestClient { class TeleportInterface : Interface { diff --git a/libsecondlife/examples/GUITestClient/frmTestClient.Designer.cs b/libsecondlife/examples/GUITestClient/frmTestClient.Designer.cs index 15db6661..f2e8feee 100644 --- a/libsecondlife/examples/GUITestClient/frmTestClient.Designer.cs +++ b/libsecondlife/examples/GUITestClient/frmTestClient.Designer.cs @@ -1,4 +1,4 @@ -namespace libsecondlife.GUITestClient +namespace OpenMetaverse.GUITestClient { partial class frmTestClient { diff --git a/libsecondlife/examples/GUITestClient/frmTestClient.cs b/libsecondlife/examples/GUITestClient/frmTestClient.cs index f1c1df40..16d60379 100644 --- a/libsecondlife/examples/GUITestClient/frmTestClient.cs +++ b/libsecondlife/examples/GUITestClient/frmTestClient.cs @@ -6,13 +6,13 @@ using System.Drawing; using System.Text; using System.Windows.Forms; using System.Reflection; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.GUITestClient +namespace OpenMetaverse.GUITestClient { public partial class frmTestClient : Form { - private SecondLife Client = new SecondLife(); + private GridClient Client = new GridClient(); private Dictionary Interfaces = new Dictionary(); public frmTestClient() diff --git a/libsecondlife/examples/Heightmap/Heightmap.csproj b/libsecondlife/examples/Heightmap/Heightmap.csproj index 2a8952c4..078493fe 100644 --- a/libsecondlife/examples/Heightmap/Heightmap.csproj +++ b/libsecondlife/examples/Heightmap/Heightmap.csproj @@ -62,9 +62,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse diff --git a/libsecondlife/examples/Heightmap/frmHeightmap.cs b/libsecondlife/examples/Heightmap/frmHeightmap.cs index 0c1f78dc..5875c547 100644 --- a/libsecondlife/examples/Heightmap/frmHeightmap.cs +++ b/libsecondlife/examples/Heightmap/frmHeightmap.cs @@ -6,14 +6,14 @@ using System.Drawing; using System.Drawing.Imaging; using System.Text; using System.Windows.Forms; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; namespace Heightmap { public partial class frmHeightmap : Form { - private SecondLife Client = new SecondLife(); + private GridClient Client = new GridClient(); private PictureBox[,] Boxes = new PictureBox[16, 16]; private System.Timers.Timer UpdateTimer = new System.Timers.Timer(1000); private string FirstName, LastName, Password; diff --git a/libsecondlife/examples/Key2Name/key2name.cs b/libsecondlife/examples/Key2Name/key2name.cs index 42a64fae..f7b9df19 100644 --- a/libsecondlife/examples/Key2Name/key2name.cs +++ b/libsecondlife/examples/Key2Name/key2name.cs @@ -1,5 +1,5 @@ using System; -using libsecondlife; +using OpenMetaverse; namespace Key2Name { @@ -15,13 +15,13 @@ namespace Key2Name return; } - SecondLife client = new SecondLife(); + GridClient client = new GridClient(); client.Avatars.OnAvatarNames += new AvatarManager.AvatarNamesCallback(Avatars_OnAvatarNames); - Console.WriteLine("Attempting to connect and login to Second Life."); + Console.WriteLine("Attempting to connect and login to the grid."); - // Login to Second Life - if (!client.Network.Login(args[0], args[1], args[2], "key2name", "jessemalthus@gmail.com")) + // Login to the grid + if (!client.Network.Login(args[0], args[1], args[2], "key2name", "1.0.0")) { // Login failed Console.WriteLine("Error logging in: " + client.Network.LoginMessage); diff --git a/libsecondlife/examples/Key2Name/key2name.csproj b/libsecondlife/examples/Key2Name/key2name.csproj index 35e111ef..229eda3c 100644 --- a/libsecondlife/examples/Key2Name/key2name.csproj +++ b/libsecondlife/examples/Key2Name/key2name.csproj @@ -98,13 +98,13 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse - + {CE5E06C2-2428-416B-ADC1-F1FE16A0FB27} - libsecondlife.Utilities + OpenMetaverse.Utilities diff --git a/libsecondlife/examples/TestClient/ClientManager.cs b/libsecondlife/examples/TestClient/ClientManager.cs index 26a9cb78..8c34446d 100644 --- a/libsecondlife/examples/TestClient/ClientManager.cs +++ b/libsecondlife/examples/TestClient/ClientManager.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Reflection; using System.Xml; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class LoginDetails { @@ -38,7 +38,7 @@ namespace libsecondlife.TestClient public class ClientManager { - public Dictionary Clients = new Dictionary(); + public Dictionary Clients = new Dictionary(); public Dictionary> SimPrims = new Dictionary>(); public bool Running = true; @@ -241,7 +241,7 @@ namespace libsecondlife.TestClient DoCommandAll(input, LLUUID.Zero); } - foreach (SecondLife client in Clients.Values) + foreach (GridClient client in Clients.Values) { if (client.Network.Connected) client.Network.Logout(); @@ -252,7 +252,7 @@ namespace libsecondlife.TestClient { int online = 0; - foreach (SecondLife client in Clients.Values) + foreach (GridClient client in Clients.Values) { if (client.Network.Connected) online++; } @@ -290,7 +290,7 @@ namespace libsecondlife.TestClient else { // make a copy of the clients list so that it can be iterated without fear of being changed during iteration - Dictionary clientsCopy = new Dictionary(Clients); + Dictionary clientsCopy = new Dictionary(Clients); foreach (TestClient client in clientsCopy.Values) client.DoCommand(cmd, fromAgentID); @@ -313,7 +313,7 @@ namespace libsecondlife.TestClient public void LogoutAll() { // make a copy of the clients list so that it can be iterated without fear of being changed during iteration - Dictionary clientsCopy = new Dictionary(Clients); + Dictionary clientsCopy = new Dictionary(Clients); foreach (TestClient client in clientsCopy.Values) Logout(client); diff --git a/libsecondlife/examples/TestClient/Command.cs b/libsecondlife/examples/TestClient/Command.cs index 5f92f328..3d10c175 100644 --- a/libsecondlife/examples/TestClient/Command.cs +++ b/libsecondlife/examples/TestClient/Command.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public abstract class Command { diff --git a/libsecondlife/examples/TestClient/Commands/Appearance/AppearanceCommand.cs b/libsecondlife/examples/TestClient/Commands/Appearance/AppearanceCommand.cs index 2d312719..e45cd178 100644 --- a/libsecondlife/examples/TestClient/Commands/Appearance/AppearanceCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Appearance/AppearanceCommand.cs @@ -1,8 +1,8 @@ using System; using System.Threading; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { /// /// Set avatars current appearance to appearance last stored on simulator diff --git a/libsecondlife/examples/TestClient/Commands/Appearance/AttachmentsCommand.cs b/libsecondlife/examples/TestClient/Commands/Appearance/AttachmentsCommand.cs index c1a9b77d..8e3d1b02 100644 --- a/libsecondlife/examples/TestClient/Commands/Appearance/AttachmentsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Appearance/AttachmentsCommand.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class AttachmentsCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Appearance/CloneCommand.cs b/libsecondlife/examples/TestClient/Commands/Appearance/CloneCommand.cs index b1eca757..bf304350 100644 --- a/libsecondlife/examples/TestClient/Commands/Appearance/CloneCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Appearance/CloneCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class CloneCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Appearance/WearCommand.cs b/libsecondlife/examples/TestClient/Commands/Appearance/WearCommand.cs index 0bb479d6..bf799f7f 100644 --- a/libsecondlife/examples/TestClient/Commands/Appearance/WearCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Appearance/WearCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class WearCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/CloneProfileCommand.cs b/libsecondlife/examples/TestClient/Commands/CloneProfileCommand.cs index 515180fa..534f6957 100644 --- a/libsecondlife/examples/TestClient/Commands/CloneProfileCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/CloneProfileCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class CloneProfileCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Communication/EchoMasterCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/EchoMasterCommand.cs index b997f549..ca4d4c83 100644 --- a/libsecondlife/examples/TestClient/Commands/Communication/EchoMasterCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Communication/EchoMasterCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class EchoMasterCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Communication/IMCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/IMCommand.cs index 515ea30d..19e1aedf 100644 --- a/libsecondlife/examples/TestClient/Commands/Communication/IMCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Communication/IMCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ImCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Communication/IMGroupCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/IMGroupCommand.cs index baf884d9..724dac0d 100644 --- a/libsecondlife/examples/TestClient/Commands/Communication/IMGroupCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Communication/IMGroupCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ImGroupCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Communication/SayCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/SayCommand.cs index 94e51454..037f877c 100644 --- a/libsecondlife/examples/TestClient/Commands/Communication/SayCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Communication/SayCommand.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class SayCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Communication/ShoutCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/ShoutCommand.cs index b6f31d93..5b2d97e7 100644 --- a/libsecondlife/examples/TestClient/Commands/Communication/ShoutCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Communication/ShoutCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ShoutCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Communication/WhisperCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/WhisperCommand.cs index c0455739..f043c056 100644 --- a/libsecondlife/examples/TestClient/Commands/Communication/WhisperCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Communication/WhisperCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class WhisperCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/DetectBotCommand.cs b/libsecondlife/examples/TestClient/Commands/DetectBotCommand.cs index 231c6041..427b9100 100644 --- a/libsecondlife/examples/TestClient/Commands/DetectBotCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/DetectBotCommand.cs @@ -1,8 +1,8 @@ using System; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class DetectBotCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Friends/FriendsCommand.cs b/libsecondlife/examples/TestClient/Commands/Friends/FriendsCommand.cs index 9b87707d..b66a0dfb 100644 --- a/libsecondlife/examples/TestClient/Commands/Friends/FriendsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Friends/FriendsCommand.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using System.Text; // the Namespace used for all TestClient commands -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { /// /// Shows a list of friends @@ -29,7 +29,7 @@ namespace libsecondlife.TestClient /// Get a list of current friends /// /// optional testClient command arguments - /// The + /// The /// of the agent making the request /// public override string Execute(string[] args, LLUUID fromAgentID) diff --git a/libsecondlife/examples/TestClient/Commands/Friends/MapFriendCommand.cs b/libsecondlife/examples/TestClient/Commands/Friends/MapFriendCommand.cs index 4553cf0e..dff8f554 100644 --- a/libsecondlife/examples/TestClient/Commands/Friends/MapFriendCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Friends/MapFriendCommand.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using System.Text; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class MapFriendCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/GoHome.cs b/libsecondlife/examples/TestClient/Commands/GoHome.cs index 0ac04f40..8ee8dba0 100644 --- a/libsecondlife/examples/TestClient/Commands/GoHome.cs +++ b/libsecondlife/examples/TestClient/Commands/GoHome.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class GoHomeCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/GotoLandmark.cs b/libsecondlife/examples/TestClient/Commands/GotoLandmark.cs index 121a46b8..e9c95bd3 100644 --- a/libsecondlife/examples/TestClient/Commands/GotoLandmark.cs +++ b/libsecondlife/examples/TestClient/Commands/GotoLandmark.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class GotoLandmarkCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Groups/ActivateGroupCommand.cs b/libsecondlife/examples/TestClient/Commands/Groups/ActivateGroupCommand.cs index 07dc32f0..1cf8a2ec 100644 --- a/libsecondlife/examples/TestClient/Commands/Groups/ActivateGroupCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Groups/ActivateGroupCommand.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using System.Text; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { /// /// Changes Avatars currently active group diff --git a/libsecondlife/examples/TestClient/Commands/Groups/GroupsCommand.cs b/libsecondlife/examples/TestClient/Commands/Groups/GroupsCommand.cs index d9d7e483..17ae3315 100644 --- a/libsecondlife/examples/TestClient/Commands/Groups/GroupsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Groups/GroupsCommand.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using System.Text; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class GroupsCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Groups/JoinGroupCommand.cs b/libsecondlife/examples/TestClient/Commands/Groups/JoinGroupCommand.cs index 093d1fe1..04cab746 100644 --- a/libsecondlife/examples/TestClient/Commands/Groups/JoinGroupCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Groups/JoinGroupCommand.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using System.Text; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class JoinGroupCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Groups/LeaveGroupCommand.cs b/libsecondlife/examples/TestClient/Commands/Groups/LeaveGroupCommand.cs index fca6e36e..68d7da5e 100644 --- a/libsecondlife/examples/TestClient/Commands/Groups/LeaveGroupCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Groups/LeaveGroupCommand.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using System.Text; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class LeaveGroupCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/BackupCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/BackupCommand.cs index 571b9297..ceb478d8 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/BackupCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/BackupCommand.cs @@ -6,11 +6,11 @@ using System.Threading; using System.ComponentModel; using System.Xml; using System.Xml.Serialization; -using libsecondlife; -using libsecondlife.Packets; -using libsecondlife.TestClient; +using OpenMetaverse; +using OpenMetaverse.Packets; +using OpenMetaverse.TestClient; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class QueuedDownloadInfo { @@ -261,7 +261,7 @@ namespace libsecondlife.TestClient { if (BackupWorker.CancellationPending) return; - if (iNode.Data is libsecondlife.InventoryItem) + if (iNode.Data is OpenMetaverse.InventoryItem) { InventoryItem ii = iNode.Data as InventoryItem; if (ii.AssetType == AssetType.LSLText || ii.AssetType == AssetType.Notecard) @@ -299,7 +299,7 @@ namespace libsecondlife.TestClient { if (BackupWorker.CancellationPending) return; - else if (i.Data is libsecondlife.InventoryFolder) + else if (i.Data is OpenMetaverse.InventoryFolder) BackupFolder(i, sPathSoFar + @"\" + MakeValid(i.Data.Name.Trim())); } } diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/BalanceCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/BalanceCommand.cs index 26123f4d..ce47701e 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/BalanceCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/BalanceCommand.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class BalanceCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs index c54f791c..a15c078a 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient.Commands.Inventory.Shell +namespace OpenMetaverse.TestClient.Commands.Inventory.Shell { public class ChangeDirectoryCommand : Command { private InventoryManager Manager; - private libsecondlife.Inventory Inventory; + private OpenMetaverse.Inventory Inventory; public ChangeDirectoryCommand(TestClient client) { diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs index 5593647f..c4e8a629 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.IO; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class CreateNotecardCommand : Command { @@ -39,7 +39,7 @@ namespace libsecondlife.TestClient // FIXME: Upload the notecard asset first. When that completes, call RequestCreateItem try { - string desc = String.Format("{0} created by libsecondlife TestClient {1}", file, DateTime.Now); + string desc = String.Format("{0} created by OpenMetaverse TestClient {1}", file, DateTime.Now); // create the asset Client.Inventory.RequestCreateItem(Client.Inventory.FindFolderForType(AssetType.Notecard), diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs index e3d2c959..aa50557b 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs @@ -5,9 +5,9 @@ using System.Text; using System.Threading; using System.Xml; using System.Xml.Serialization; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { /// /// Inventory Example, Moves a folder to the Trash folder diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs index 07fb52e8..e4cc38f8 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs @@ -2,10 +2,10 @@ using System; using System.Text; using System.IO; using System.Collections.Generic; -using libsecondlife; -using libsecondlife.Imaging; +using OpenMetaverse; +using OpenMetaverse.Imaging; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class DumpOutfitCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/ExportOutfitCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/ExportOutfitCommand.cs index 64e05f43..174fdde3 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/ExportOutfitCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/ExportOutfitCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.IO; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ExportOutfitCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/GiveAllCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/GiveAllCommand.cs index ae9d4d14..4aca90f9 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/GiveAllCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/GiveAllCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class GiveAllCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/GiveItemCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/GiveItemCommand.cs index 5c9533c2..7abe466b 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/GiveItemCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/GiveItemCommand.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Text; -namespace libsecondlife.TestClient.Commands.Inventory.Shell +namespace OpenMetaverse.TestClient.Commands.Inventory.Shell { class GiveItemCommand : Command { private InventoryManager Manager; - private libsecondlife.Inventory Inventory; + private OpenMetaverse.Inventory Inventory; public GiveItemCommand(TestClient client) { Name = "give"; diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/ImportOutfitCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/ImportOutfitCommand.cs index f36682d7..57bf923d 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/ImportOutfitCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/ImportOutfitCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.IO; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ImportOutfitCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/InventoryCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/InventoryCommand.cs index b0f020a0..e4d92f61 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/InventoryCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/InventoryCommand.cs @@ -5,10 +5,10 @@ using System.Text; using System.Threading; using System.Xml; using System.Xml.Serialization; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class InventoryCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/ListContentsCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/ListContentsCommand.cs index 55729a3a..130f9f9e 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/ListContentsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/ListContentsCommand.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient.Commands.Inventory.Shell +namespace OpenMetaverse.TestClient.Commands.Inventory.Shell { public class ListContentsCommand : Command { private InventoryManager Manager; - private libsecondlife.Inventory Inventory; + private OpenMetaverse.Inventory Inventory; public ListContentsCommand(TestClient client) { Name = "ls"; diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/ObjectInventoryCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/ObjectInventoryCommand.cs index bd4ec6c7..bae4c681 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/ObjectInventoryCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/ObjectInventoryCommand.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ObjectInventoryCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Inventory/UploadImageCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/UploadImageCommand.cs index 396c258e..d8e9d9fa 100644 --- a/libsecondlife/examples/TestClient/Commands/Inventory/UploadImageCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Inventory/UploadImageCommand.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.IO; using System.Threading; using System.Drawing; -using libsecondlife; -using libsecondlife.Capabilities; -using libsecondlife.Imaging; +using OpenMetaverse; +using OpenMetaverse.Capabilities; +using OpenMetaverse.Imaging; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class UploadImageCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Land/AgentLocationsCommand.cs b/libsecondlife/examples/TestClient/Commands/Land/AgentLocationsCommand.cs index 64acb754..ec30c566 100644 --- a/libsecondlife/examples/TestClient/Commands/Land/AgentLocationsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Land/AgentLocationsCommand.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { /// /// Display a list of all agent locations in a specified region diff --git a/libsecondlife/examples/TestClient/Commands/Land/FindSimCommand.cs b/libsecondlife/examples/TestClient/Commands/Land/FindSimCommand.cs index b75e20a9..a7833e3b 100644 --- a/libsecondlife/examples/TestClient/Commands/Land/FindSimCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Land/FindSimCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class FindSimCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Land/GridLayerCommand.cs b/libsecondlife/examples/TestClient/Commands/Land/GridLayerCommand.cs index 0138f3f9..11c48d8f 100644 --- a/libsecondlife/examples/TestClient/Commands/Land/GridLayerCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Land/GridLayerCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class GridLayerCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Land/GridMapCommand.cs b/libsecondlife/examples/TestClient/Commands/Land/GridMapCommand.cs index c38b1594..b9d5aa71 100644 --- a/libsecondlife/examples/TestClient/Commands/Land/GridMapCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Land/GridMapCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class GridMapCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Land/ParcelDetailsCommand.cs b/libsecondlife/examples/TestClient/Commands/Land/ParcelDetailsCommand.cs index e82d4aa2..fd8ab154 100644 --- a/libsecondlife/examples/TestClient/Commands/Land/ParcelDetailsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Land/ParcelDetailsCommand.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ParcelDetailsCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Land/ParcelInfoCommand.cs b/libsecondlife/examples/TestClient/Commands/Land/ParcelInfoCommand.cs index 21e4981f..5414c435 100644 --- a/libsecondlife/examples/TestClient/Commands/Land/ParcelInfoCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Land/ParcelInfoCommand.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading; -using libsecondlife; -using libsecondlife.Utilities; +using OpenMetaverse; +using OpenMetaverse.Utilities; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ParcelInfoCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/CrouchCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/CrouchCommand.cs index cafe8afa..2e85c0e3 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/CrouchCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/CrouchCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class CrouchCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/FlyCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/FlyCommand.cs index b5988e9d..5823748c 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/FlyCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/FlyCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class FlyCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/FollowCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/FollowCommand.cs index ec8170f2..cd4f997b 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/FollowCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/FollowCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class FollowCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/GotoCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/GotoCommand.cs index 6e4cac34..5e425b1d 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/GotoCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/GotoCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class GotoCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/JumpCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/JumpCommand.cs index a1bfd3e1..52c85e01 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/JumpCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/JumpCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class JumpCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/LocationCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/LocationCommand.cs index 3f6501b7..35eead83 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/LocationCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/LocationCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class LocationCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/MoveToCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/MoveToCommand.cs index 0ac949e3..160fab95 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/MoveToCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/MoveToCommand.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife.TestClient.Commands.Movement +namespace OpenMetaverse.TestClient.Commands.Movement { class MovetoCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/SetHome.cs b/libsecondlife/examples/TestClient/Commands/Movement/SetHome.cs index 5e14ca6d..1449b3ee 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/SetHome.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/SetHome.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class SetHomeCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/SitCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/SitCommand.cs index 8823fa84..f47a58bb 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/SitCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/SitCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class SitCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/SitOnCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/SitOnCommand.cs index ac1e4c74..68afe2de 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/SitOnCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/SitOnCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class SitOnCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Movement/StandCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/StandCommand.cs index e79bdfb7..bfee3667 100644 --- a/libsecondlife/examples/TestClient/Commands/Movement/StandCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Movement/StandCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class StandCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/ChangePermsCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/ChangePermsCommand.cs index 1799baaa..232d6b1e 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/ChangePermsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/ChangePermsCommand.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Threading; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ChangePermsCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/DownloadTextureCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/DownloadTextureCommand.cs index 5591f772..68e00924 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/DownloadTextureCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/DownloadTextureCommand.cs @@ -1,9 +1,9 @@ using System; using System.IO; using System.Threading; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class DownloadTextureCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/ExportCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/ExportCommand.cs index 74fa2686..f2c132a3 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/ExportCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/ExportCommand.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.IO; using System.Threading; -using libsecondlife; -using libsecondlife.StructuredData; +using OpenMetaverse; +using OpenMetaverse.StructuredData; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ExportCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/ExportParticlesCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/ExportParticlesCommand.cs index 3625e009..acf5f002 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/ExportParticlesCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/ExportParticlesCommand.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ExportParticlesCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/FindObjectsCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/FindObjectsCommand.cs index 2ee73da4..83eac3f8 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/FindObjectsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/FindObjectsCommand.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class FindObjectsCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/FindTextureCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/FindTextureCommand.cs index b827aaeb..eb8f3234 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/FindTextureCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/FindTextureCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class FindTextureCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/ImportCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/ImportCommand.cs index bae348fa..84e9dbef 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/ImportCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/ImportCommand.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Threading; using System.IO; -using libsecondlife; -using libsecondlife.StructuredData; +using OpenMetaverse; +using OpenMetaverse.StructuredData; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ImportCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/PrimCountCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/PrimCountCommand.cs index b4c4615b..3895d7b9 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/PrimCountCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/PrimCountCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class PrimCountCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/PrimInfoCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/PrimInfoCommand.cs index c88e4c49..b0b6356a 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/PrimInfoCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/PrimInfoCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class PrimInfoCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Prims/PrimRegexCommand.cs b/libsecondlife/examples/TestClient/Commands/Prims/PrimRegexCommand.cs index bfa3744b..9da04277 100644 --- a/libsecondlife/examples/TestClient/Commands/Prims/PrimRegexCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Prims/PrimRegexCommand.cs @@ -1,8 +1,8 @@ using System; using System.Text.RegularExpressions; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class PrimRegexCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/SearchEventsCommand.cs b/libsecondlife/examples/TestClient/Commands/SearchEventsCommand.cs index cd2ea933..2aa59aea 100644 --- a/libsecondlife/examples/TestClient/Commands/SearchEventsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/SearchEventsCommand.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife.TestClient.Commands +namespace OpenMetaverse.TestClient.Commands { class SearchEventsCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/ShowEventDetailsCommand.cs b/libsecondlife/examples/TestClient/Commands/ShowEventDetailsCommand.cs index 29457874..255fcfd9 100644 --- a/libsecondlife/examples/TestClient/Commands/ShowEventDetailsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/ShowEventDetailsCommand.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife.TestClient.Commands +namespace OpenMetaverse.TestClient.Commands { class ShowEventDetailsCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Stats/DilationCommand.cs b/libsecondlife/examples/TestClient/Commands/Stats/DilationCommand.cs index 979282c4..5dfcb3ba 100644 --- a/libsecondlife/examples/TestClient/Commands/Stats/DilationCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Stats/DilationCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class DilationCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Stats/RegionInfoCommand.cs b/libsecondlife/examples/TestClient/Commands/Stats/RegionInfoCommand.cs index c8b303f1..9b2871d0 100644 --- a/libsecondlife/examples/TestClient/Commands/Stats/RegionInfoCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Stats/RegionInfoCommand.cs @@ -1,8 +1,8 @@ using System; using System.Text; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class RegionInfoCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Stats/StatsCommand.cs b/libsecondlife/examples/TestClient/Commands/Stats/StatsCommand.cs index bbb67579..b974fc54 100644 --- a/libsecondlife/examples/TestClient/Commands/Stats/StatsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Stats/StatsCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class StatsCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Stats/UptimeCommand.cs b/libsecondlife/examples/TestClient/Commands/Stats/UptimeCommand.cs index 3edec73f..9345d95b 100644 --- a/libsecondlife/examples/TestClient/Commands/Stats/UptimeCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Stats/UptimeCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class UptimeCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/DebugCommand.cs b/libsecondlife/examples/TestClient/Commands/System/DebugCommand.cs index 507d45a8..db0ffe31 100644 --- a/libsecondlife/examples/TestClient/Commands/System/DebugCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/DebugCommand.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class DebugCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/HelpCommand.cs b/libsecondlife/examples/TestClient/Commands/System/HelpCommand.cs index 5cbdcb24..2fb4cec4 100644 --- a/libsecondlife/examples/TestClient/Commands/System/HelpCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/HelpCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class HelpCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/LoadCommand.cs b/libsecondlife/examples/TestClient/Commands/System/LoadCommand.cs index 70dada43..c043a5fc 100644 --- a/libsecondlife/examples/TestClient/Commands/System/LoadCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/LoadCommand.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Text; using System.Reflection; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class LoadCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/LoginCommand.cs b/libsecondlife/examples/TestClient/Commands/System/LoginCommand.cs index 737ad406..dd969e5b 100644 --- a/libsecondlife/examples/TestClient/Commands/System/LoginCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/LoginCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Reflection; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class LoginCommand : Command { @@ -19,7 +19,7 @@ namespace libsecondlife.TestClient if (args.Length != 3 && args.Length != 4) return "usage: login firstname lastname password [simname]"; - SecondLife newClient = Client.ClientManager.Login(args); + GridClient newClient = Client.ClientManager.Login(args); if (newClient.Network.Connected) { diff --git a/libsecondlife/examples/TestClient/Commands/System/LogoutCommand.cs b/libsecondlife/examples/TestClient/Commands/System/LogoutCommand.cs index cdb5bde0..05ef530e 100644 --- a/libsecondlife/examples/TestClient/Commands/System/LogoutCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/LogoutCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class LogoutCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/MD5Command.cs b/libsecondlife/examples/TestClient/Commands/System/MD5Command.cs index 0a2ee5d1..880cc14c 100644 --- a/libsecondlife/examples/TestClient/Commands/System/MD5Command.cs +++ b/libsecondlife/examples/TestClient/Commands/System/MD5Command.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class MD5Command : Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/PacketLogCommand.cs b/libsecondlife/examples/TestClient/Commands/System/PacketLogCommand.cs index 9c9bd2e0..47d84f0e 100644 --- a/libsecondlife/examples/TestClient/Commands/System/PacketLogCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/PacketLogCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class PacketLogCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/QuitCommand.cs b/libsecondlife/examples/TestClient/Commands/System/QuitCommand.cs index 4cd72094..e8381ce0 100644 --- a/libsecondlife/examples/TestClient/Commands/System/QuitCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/QuitCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class QuitCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/SetMasterCommand.cs b/libsecondlife/examples/TestClient/Commands/System/SetMasterCommand.cs index 268dfe01..0415ba2b 100644 --- a/libsecondlife/examples/TestClient/Commands/System/SetMasterCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/SetMasterCommand.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class SetMasterCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/SetMasterKeyCommand.cs b/libsecondlife/examples/TestClient/Commands/System/SetMasterKeyCommand.cs index f721d41a..639b2534 100644 --- a/libsecondlife/examples/TestClient/Commands/System/SetMasterKeyCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/SetMasterKeyCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class SetMasterKeyCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/System/ShowEffectsCommand.cs b/libsecondlife/examples/TestClient/Commands/System/ShowEffectsCommand.cs index 45de7581..2cceef9c 100644 --- a/libsecondlife/examples/TestClient/Commands/System/ShowEffectsCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/System/ShowEffectsCommand.cs @@ -1,7 +1,7 @@ using System; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ShowEffectsCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/TouchCommand.cs b/libsecondlife/examples/TestClient/Commands/TouchCommand.cs index 1c60e721..e617a834 100644 --- a/libsecondlife/examples/TestClient/Commands/TouchCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/TouchCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class TouchCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/TreeCommand.cs b/libsecondlife/examples/TestClient/Commands/TreeCommand.cs index 35e94754..10ce27c8 100644 --- a/libsecondlife/examples/TestClient/Commands/TreeCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/TreeCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class TreeCommand: Command { diff --git a/libsecondlife/examples/TestClient/Commands/Voice/ParcelVoiceInfo.cs b/libsecondlife/examples/TestClient/Commands/Voice/ParcelVoiceInfo.cs index 0e973bcf..901aacd4 100644 --- a/libsecondlife/examples/TestClient/Commands/Voice/ParcelVoiceInfo.cs +++ b/libsecondlife/examples/TestClient/Commands/Voice/ParcelVoiceInfo.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class ParcelVoiceInfoCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/Voice/VoiceAcountCommand.cs b/libsecondlife/examples/TestClient/Commands/Voice/VoiceAcountCommand.cs index f7b007aa..e78a8bf9 100644 --- a/libsecondlife/examples/TestClient/Commands/Voice/VoiceAcountCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/Voice/VoiceAcountCommand.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class VoiceAccountCommand : Command { diff --git a/libsecondlife/examples/TestClient/Commands/WhoCommand.cs b/libsecondlife/examples/TestClient/Commands/WhoCommand.cs index 8b08e4d0..0e3f6122 100644 --- a/libsecondlife/examples/TestClient/Commands/WhoCommand.cs +++ b/libsecondlife/examples/TestClient/Commands/WhoCommand.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class WhoCommand: Command { diff --git a/libsecondlife/examples/TestClient/Parsing.cs b/libsecondlife/examples/TestClient/Parsing.cs index d54d8190..b5b7f06b 100644 --- a/libsecondlife/examples/TestClient/Parsing.cs +++ b/libsecondlife/examples/TestClient/Parsing.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { class Parsing { diff --git a/libsecondlife/examples/TestClient/Program.cs b/libsecondlife/examples/TestClient/Program.cs index 3e2e15a5..69c31db5 100644 --- a/libsecondlife/examples/TestClient/Program.cs +++ b/libsecondlife/examples/TestClient/Program.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using CommandLine.Utility; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { public class CommandLineArgumentsException : Exception { diff --git a/libsecondlife/examples/TestClient/TestClient.cs b/libsecondlife/examples/TestClient/TestClient.cs index c0d23016..7bd75072 100644 --- a/libsecondlife/examples/TestClient/TestClient.cs +++ b/libsecondlife/examples/TestClient/TestClient.cs @@ -2,13 +2,13 @@ using System; using System.Collections.Generic; using System.Reflection; using System.Xml; -using libsecondlife; -using libsecondlife.Packets; -using libsecondlife.Utilities; +using OpenMetaverse; +using OpenMetaverse.Packets; +using OpenMetaverse.Utilities; -namespace libsecondlife.TestClient +namespace OpenMetaverse.TestClient { - public class TestClient : SecondLife + public class TestClient : GridClient { public LLUUID GroupID = LLUUID.Zero; public Dictionary GroupMembers; @@ -107,7 +107,7 @@ namespace libsecondlife.TestClient } //breaks up large responses to deal with the max IM size - private void SendResponseIM(SecondLife client, LLUUID fromAgentID, string data) + private void SendResponseIM(GridClient client, LLUUID fromAgentID, string data) { for ( int i = 0 ; i < data.Length ; i += 1024 ) { int y; diff --git a/libsecondlife/examples/TestClient/TestClient.csproj b/libsecondlife/examples/TestClient/TestClient.csproj index c027877c..8d8e26fa 100644 --- a/libsecondlife/examples/TestClient/TestClient.csproj +++ b/libsecondlife/examples/TestClient/TestClient.csproj @@ -7,7 +7,7 @@ {B87682F6-B2D7-4C4D-A529-400C24FD4880} Exe Properties - libsecondlife.TestClient + OpenMetaverse.TestClient TestClient @@ -138,13 +138,13 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse - + {CE5E06C2-2428-416B-ADC1-F1FE16A0FB27} - libsecondlife.Utilities + OpenMetaverse.Utilities diff --git a/libsecondlife/examples/groupmanager/frmGroupInfo.cs b/libsecondlife/examples/groupmanager/frmGroupInfo.cs index f13aed26..ca3dbf17 100644 --- a/libsecondlife/examples/groupmanager/frmGroupInfo.cs +++ b/libsecondlife/examples/groupmanager/frmGroupInfo.cs @@ -6,15 +6,15 @@ using System.Drawing; using System.Text; using System.Windows.Forms; using System.IO; -using libsecondlife; -using libsecondlife.Imaging; +using OpenMetaverse; +using OpenMetaverse.Imaging; namespace groupmanager { public partial class frmGroupInfo : Form { Group Group; - SecondLife Client; + GridClient Client; GroupProfile Profile = new GroupProfile(); Dictionary Members = new Dictionary(); Dictionary Titles = new Dictionary(); @@ -26,7 +26,7 @@ namespace groupmanager AvatarManager.AvatarNamesCallback AvatarNamesCallback; AssetManager.ImageReceivedCallback ImageReceivedCallback; - public frmGroupInfo(Group group, SecondLife client) + public frmGroupInfo(Group group, GridClient client) { InitializeComponent(); diff --git a/libsecondlife/examples/groupmanager/frmGroupManager.cs b/libsecondlife/examples/groupmanager/frmGroupManager.cs index 4dfb9405..428aa7d6 100644 --- a/libsecondlife/examples/groupmanager/frmGroupManager.cs +++ b/libsecondlife/examples/groupmanager/frmGroupManager.cs @@ -5,19 +5,19 @@ using System.Data; using System.Drawing; using System.Text; using System.Windows.Forms; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; namespace groupmanager { public partial class frmGroupManager : Form { - SecondLife Client; + GridClient Client; Dictionary Groups; public frmGroupManager() { - Client = new SecondLife(); + Client = new GridClient(); Client.Settings.MULTIPLE_SIMS = false; diff --git a/libsecondlife/examples/groupmanager/groupmanager.csproj b/libsecondlife/examples/groupmanager/groupmanager.csproj index 2d622d05..36535e17 100644 --- a/libsecondlife/examples/groupmanager/groupmanager.csproj +++ b/libsecondlife/examples/groupmanager/groupmanager.csproj @@ -101,15 +101,15 @@ System.XML - - libsecondlife + + OpenMetaverse {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False - + {CE5E06C2-2428-416B-ADC1-F1FE16A0FB27} - libsecondlife.Utilities + OpenMetaverse.Utilities diff --git a/libsecondlife/examples/name2key/name2key.cs b/libsecondlife/examples/name2key/name2key.cs index 1b8dc846..31e154ec 100644 --- a/libsecondlife/examples/name2key/name2key.cs +++ b/libsecondlife/examples/name2key/name2key.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,8 +27,8 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; namespace name2key { @@ -65,7 +65,7 @@ namespace name2key [STAThread] static void Main(string[] args) { - SecondLife client; + GridClient client; if (args.Length < 5) { @@ -73,7 +73,7 @@ namespace name2key return; } - client = new SecondLife(); + client = new GridClient(); // Setup the callback client.Directory.OnDirPeopleReply += new DirectoryManager.DirPeopleReplyCallback(DirQueryHandler); diff --git a/libsecondlife/examples/name2key/name2key.csproj b/libsecondlife/examples/name2key/name2key.csproj index cc243871..2ea6b301 100644 --- a/libsecondlife/examples/name2key/name2key.csproj +++ b/libsecondlife/examples/name2key/name2key.csproj @@ -103,9 +103,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse diff --git a/libsecondlife/examples/slaccountant/frmSLAccountant.cs b/libsecondlife/examples/slaccountant/frmSLAccountant.cs index 253122f4..67ba3f95 100644 --- a/libsecondlife/examples/slaccountant/frmSLAccountant.cs +++ b/libsecondlife/examples/slaccountant/frmSLAccountant.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -30,8 +30,8 @@ using System.Collections.Generic; using System.ComponentModel; using System.Windows.Forms; using System.Data; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; namespace SLAccountant { @@ -67,8 +67,7 @@ namespace SLAccountant private System.Windows.Forms.ColumnHeader colOnline; private System.Windows.Forms.ColumnHeader colUuid; - // libsecondlife instance - private SecondLife Client; + private GridClient Client; public frmSLAccountant() { @@ -392,7 +391,7 @@ namespace SLAccountant private void frmSLAccountant_Load(object sender, System.EventArgs e) { - Client = new SecondLife(); + Client = new GridClient(); Client.Settings.MULTIPLE_SIMS = false; diff --git a/libsecondlife/examples/slaccountant/slaccountant.csproj b/libsecondlife/examples/slaccountant/slaccountant.csproj index c3d5f412..9f482c41 100644 --- a/libsecondlife/examples/slaccountant/slaccountant.csproj +++ b/libsecondlife/examples/slaccountant/slaccountant.csproj @@ -101,8 +101,8 @@ System.XML - - libsecondlife + + OpenMetaverse {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/libsecondlife/examples/sldump/sldump.cs b/libsecondlife/examples/sldump/sldump.cs index 01f0282d..c3661ad0 100644 --- a/libsecondlife/examples/sldump/sldump.cs +++ b/libsecondlife/examples/sldump/sldump.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,8 +27,8 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; namespace sldump { @@ -61,7 +61,7 @@ namespace sldump [STAThread] static void Main(string[] args) { - SecondLife client; + GridClient client; if (args.Length == 0 || (args.Length < 4 && args[0] != "--printmap")) { @@ -84,7 +84,7 @@ namespace sldump return; } - client = new SecondLife(); + client = new GridClient(); // Turn off some unnecessary things Settings.LOG_LEVEL = Helpers.LogLevel.None; client.Settings.MULTIPLE_SIMS = false; @@ -118,7 +118,7 @@ namespace sldump client.Network.OnLogin += new NetworkManager.LoginCallback(Network_OnLogin); client.Network.BeginLogin(client.Network.DefaultLoginParams(args[0], args[1], args[2], "sldump", - "contact@libsecondlife.org")); + "contact@OpenMetaverse.org")); LoginEvent.WaitOne(); diff --git a/libsecondlife/examples/sldump/sldump.csproj b/libsecondlife/examples/sldump/sldump.csproj index a72fd51d..1f3e4233 100644 --- a/libsecondlife/examples/sldump/sldump.csproj +++ b/libsecondlife/examples/sldump/sldump.csproj @@ -96,8 +96,8 @@ System.XML - - libsecondlife + + OpenMetaverse {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/libsecondlife/libsecondlife.Tests/BinaryLLSDTests.cs b/libsecondlife/libsecondlife.Tests/BinaryLLSDTests.cs index fb6bf825..08126671 100644 --- a/libsecondlife/libsecondlife.Tests/BinaryLLSDTests.cs +++ b/libsecondlife/libsecondlife.Tests/BinaryLLSDTests.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -41,9 +41,9 @@ using System.IO; using System.Text; using System.Xml; using NUnit.Framework; -using libsecondlife.StructuredData; +using OpenMetaverse.StructuredData; -namespace libsecondlife.Tests +namespace OpenMetaverse.Tests { [TestFixture()] diff --git a/libsecondlife/libsecondlife.Tests/NetworkTests.cs b/libsecondlife/libsecondlife.Tests/NetworkTests.cs index 1cad1697..35d53898 100644 --- a/libsecondlife/libsecondlife.Tests/NetworkTests.cs +++ b/libsecondlife/libsecondlife.Tests/NetworkTests.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,17 +27,17 @@ using System; using System.Collections.Generic; using System.Net; -using libsecondlife; -using libsecondlife.Packets; -using libsecondlife.Utilities; +using OpenMetaverse; +using OpenMetaverse.Packets; +using OpenMetaverse.Utilities; using NUnit.Framework; -namespace libsecondlife.Tests +namespace OpenMetaverse.Tests { [TestFixture] public class NetworkTests : Assert { - SecondLife Client; + GridClient Client; ulong CurrentRegionHandle = 0; ulong AhernRegionHandle = 1096213093149184; @@ -51,7 +51,7 @@ namespace libsecondlife.Tests public NetworkTests() { - Client = new SecondLife(); + Client = new GridClient(); // Register callbacks Client.Network.RegisterCallback(PacketType.ObjectUpdate, new NetworkManager.PacketCallback(ObjectUpdateHandler)); @@ -60,7 +60,7 @@ namespace libsecondlife.Tests // Connect to the grid string startLoc = NetworkManager.StartLocation("Hooper", 179, 18, 32); Client.Network.Login("Testing", "Anvil", "testinganvil", "Unit Test Framework", startLoc, - "contact@libsecondlife.org"); + "contact@OpenMetaverse.org"); } ~NetworkTests() diff --git a/libsecondlife/libsecondlife.Tests/NotationLLSDTests.cs b/libsecondlife/libsecondlife.Tests/NotationLLSDTests.cs index 36149555..d7bf8d8c 100644 --- a/libsecondlife/libsecondlife.Tests/NotationLLSDTests.cs +++ b/libsecondlife/libsecondlife.Tests/NotationLLSDTests.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -41,9 +41,9 @@ using System.IO; using System.Text; using System.Xml; using NUnit.Framework; -using libsecondlife.StructuredData; +using OpenMetaverse.StructuredData; -namespace libsecondlife.Tests +namespace OpenMetaverse.Tests { [TestFixture()] @@ -433,7 +433,7 @@ namespace libsecondlife.Tests string sDateOne = "d\"2007-12-31T20:49:10Z\""; LLSD llsdOne = LLSDParser.DeserializeNotation(sDateOne); Assert.AreEqual(LLSDType.Date, llsdOne.Type); - DateTime dt = new DateTime(2007, 12, 31, 20, 49, 10, 0, DateTimeKind.Utc); + DateTime dt = new DateTime(2007-2008, 12, 31, 20, 49, 10, 0, DateTimeKind.Utc); DateTime dtDS = llsdOne.AsDate(); Assert.AreEqual(dt, dtDS.ToUniversalTime()); } diff --git a/libsecondlife/libsecondlife.Tests/libsecondlife.Tests.csproj b/libsecondlife/libsecondlife.Tests/OpenMetaverse.Tests.csproj similarity index 90% rename from libsecondlife/libsecondlife.Tests/libsecondlife.Tests.csproj rename to libsecondlife/libsecondlife.Tests/OpenMetaverse.Tests.csproj index a9e043b2..52c29ddb 100644 --- a/libsecondlife/libsecondlife.Tests/libsecondlife.Tests.csproj +++ b/libsecondlife/libsecondlife.Tests/OpenMetaverse.Tests.csproj @@ -1,90 +1,90 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {E0BCBBAE-A620-431A-9EB7-30173EAF195B} - Library - Properties - libsecondlife.Tests - libsecondlife.Tests - - - true - full - false - ..\..\bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - - - ..\..\bin\ - - - bin\Release-docs\ - TRACE - true - pdbonly - AnyCPU - C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules - true - GlobalSuppressions.cs - prompt - - - bin\.NET 1.1\Release-docs\ - AnyCPU - C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules - true - GlobalSuppressions.cs - - - - False - ..\..\..\..\..\Program Files\NUnit 2.4.7\bin\nunit.framework.dll - - - - - - - - - - - - - - - - - {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife - - - {CE5E06C2-2428-416B-ADC1-F1FE16A0FB27} - libsecondlife.Utilities - - - - - - - + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {E0BCBBAE-A620-431A-9EB7-30173EAF195B} + Library + Properties + OpenMetaverse.Tests + OpenMetaverse.Tests + + + true + full + false + ..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\bin\ + TRACE + prompt + 4 + + + ..\..\bin\ + + + bin\Release-docs\ + TRACE + true + pdbonly + AnyCPU + C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules + true + GlobalSuppressions.cs + prompt + + + bin\.NET 1.1\Release-docs\ + AnyCPU + C:\Program Files\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules + true + GlobalSuppressions.cs + + + + False + ..\..\..\..\..\Program Files\NUnit 2.4.7\bin\nunit.framework.dll + + + + + + + + + + + + + + + + + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} + OpenMetaverse + + + {CE5E06C2-2428-416B-ADC1-F1FE16A0FB27} + OpenMetaverse.Utilities + + + + + + + \ No newline at end of file diff --git a/libsecondlife/libsecondlife.Tests/PacketTests.cs b/libsecondlife/libsecondlife.Tests/PacketTests.cs index 0cfe3142..40aa1af4 100644 --- a/libsecondlife/libsecondlife.Tests/PacketTests.cs +++ b/libsecondlife/libsecondlife.Tests/PacketTests.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -26,11 +26,11 @@ using System; using System.Collections.Generic; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using NUnit.Framework; -namespace libsecondlife.Tests +namespace OpenMetaverse.Tests { [TestFixture] public class PacketTests : Assert diff --git a/libsecondlife/libsecondlife.Tests/PrimObjectTests.cs b/libsecondlife/libsecondlife.Tests/PrimObjectTests.cs index dd6f159d..fde5869f 100644 --- a/libsecondlife/libsecondlife.Tests/PrimObjectTests.cs +++ b/libsecondlife/libsecondlife.Tests/PrimObjectTests.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,11 +27,11 @@ using System; using System.Collections.Generic; using System.Net; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; using NUnit.Framework; -namespace libsecondlife.Tests +namespace OpenMetaverse.Tests { [TestFixture] public class PrimObjectTests : Assert diff --git a/libsecondlife/libsecondlife.Tests/TypeTests.cs b/libsecondlife/libsecondlife.Tests/TypeTests.cs index 28da2942..f43070e1 100644 --- a/libsecondlife/libsecondlife.Tests/TypeTests.cs +++ b/libsecondlife/libsecondlife.Tests/TypeTests.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,12 +27,12 @@ using System; using System.Collections; using System.Collections.Generic; -using libsecondlife; -using libsecondlife.Packets; -using libsecondlife.StructuredData; +using OpenMetaverse; +using OpenMetaverse.Packets; +using OpenMetaverse.StructuredData; using NUnit.Framework; -namespace libsecondlife.Tests +namespace OpenMetaverse.Tests { [TestFixture] public class TypeTests : Assert diff --git a/libsecondlife/libsecondlife.Tests/XmlLLSDTests.cs b/libsecondlife/libsecondlife.Tests/XmlLLSDTests.cs index bd4309d3..54f8313b 100644 --- a/libsecondlife/libsecondlife.Tests/XmlLLSDTests.cs +++ b/libsecondlife/libsecondlife.Tests/XmlLLSDTests.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -29,9 +29,9 @@ using System.Collections.Generic; using System.Text; using NUnit.Framework; using System.Collections; -using libsecondlife.StructuredData; +using OpenMetaverse.StructuredData; -namespace libsecondlife.Tests +namespace OpenMetaverse.Tests { /// /// XmlLLSDTests is a suite of tests for libsl implementation of the LLSD XML format. diff --git a/libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.csproj b/libsecondlife/libsecondlife.Utilities/OpenMetaverse.Utilities.csproj similarity index 91% rename from libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.csproj rename to libsecondlife/libsecondlife.Utilities/OpenMetaverse.Utilities.csproj index a7ab5ca9..2f376a59 100644 --- a/libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.csproj +++ b/libsecondlife/libsecondlife.Utilities/OpenMetaverse.Utilities.csproj @@ -7,8 +7,8 @@ {CE5E06C2-2428-416B-ADC1-F1FE16A0FB27} Library Properties - libsecondlife.Utilities - libsecondlife.Utilities + OpenMetaverse.Utilities + libopenmetaverse.Utilities true @@ -59,9 +59,9 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife + OpenMetaverse diff --git a/libsecondlife/libsecondlife.Utilities/Properties/AssemblyInfo.cs b/libsecondlife/libsecondlife.Utilities/Properties/AssemblyInfo.cs index 32c0a3e1..ed53187c 100644 --- a/libsecondlife/libsecondlife.Utilities/Properties/AssemblyInfo.cs +++ b/libsecondlife/libsecondlife.Utilities/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("libsecondlife.Utilities")] +[assembly: AssemblyTitle("OpenMetaverse.Utilities")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("libsecondlife.Utilities")] -[assembly: AssemblyCopyright("Copyright © 2006")] +[assembly: AssemblyProduct("OpenMetaverse.Utilities")] +[assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/libsecondlife/libsecondlife.Utilities/RegistrationApi.cs b/libsecondlife/libsecondlife.Utilities/RegistrationApi.cs index 8a5a8314..162a7e88 100644 --- a/libsecondlife/libsecondlife.Utilities/RegistrationApi.cs +++ b/libsecondlife/libsecondlife.Utilities/RegistrationApi.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,10 +28,10 @@ using System; using System.Collections.Generic; using System.Threading; using System.Text; -using libsecondlife.StructuredData; -using libsecondlife.Capabilities; +using OpenMetaverse.StructuredData; +using OpenMetaverse.Capabilities; -namespace libsecondlife +namespace OpenMetaverse { public class RegistrationApi { @@ -57,7 +57,7 @@ namespace libsecondlife } /// - /// see https://secure-web6.secondlife.com/developers/third_party_reg/#service_create_user or + /// See https://secure-web6.secondlife.com/developers/third_party_reg/#service_create_user or /// https://wiki.secondlife.com/wiki/RegAPIDoc for description /// public class CreateUserParam diff --git a/libsecondlife/libsecondlife.Utilities/Utilities.cs b/libsecondlife/libsecondlife.Utilities/Utilities.cs index cf2d85d2..cf7ea434 100644 --- a/libsecondlife/libsecondlife.Utilities/Utilities.cs +++ b/libsecondlife/libsecondlife.Utilities/Utilities.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -28,10 +28,10 @@ using System; using System.Collections; using System.Collections.Generic; using System.Threading; -using libsecondlife; -using libsecondlife.Packets; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace libsecondlife.Utilities +namespace OpenMetaverse.Utilities { /// /// @@ -56,7 +56,7 @@ namespace libsecondlife.Utilities /// /// Target to shoot at /// - public static bool Shoot(SecondLife client, LLVector3 target) + public static bool Shoot(GridClient client, LLVector3 target) { if (client.Self.Movement.TurnToward(target)) return Shoot(client); @@ -68,7 +68,7 @@ namespace libsecondlife.Utilities /// Enters mouselook, presses and releases the left mouse button, and leaves mouselook /// /// - public static bool Shoot(SecondLife client) + public static bool Shoot(GridClient client) { if (client.Settings.SEND_AGENT_UPDATES) { @@ -102,7 +102,7 @@ namespace libsecondlife.Utilities /// /// A reference to the client that will chat /// The chat message to send - public static void Chat(SecondLife client, string message) + public static void Chat(GridClient client, string message) { Chat(client, message, ChatType.Normal, 3); } @@ -116,7 +116,7 @@ namespace libsecondlife.Utilities /// The chat message to send /// The chat type (usually Normal, Whisper or Shout) /// Characters per second rate for chatting - public static void Chat(SecondLife client, string message, ChatType type, int cps) + public static void Chat(GridClient client, string message, ChatType type, int cps) { Random rand = new Random(); int characters = 0; @@ -162,12 +162,12 @@ namespace libsecondlife.Utilities public class ConnectionManager { - private SecondLife Client; + private GridClient Client; private ulong SimHandle; private LLVector3 Position = LLVector3.Zero; private System.Timers.Timer CheckTimer; - public ConnectionManager(SecondLife client, int timerFrequency) + public ConnectionManager(GridClient client, int timerFrequency) { Client = client; @@ -175,7 +175,7 @@ namespace libsecondlife.Utilities CheckTimer.Elapsed += new System.Timers.ElapsedEventHandler(CheckTimer_Elapsed); } - public static bool PersistentLogin(SecondLife client, string firstName, string lastName, string password, + public static bool PersistentLogin(GridClient client, string firstName, string lastName, string password, string userAgent, string start, string author) { int unknownLogins = 0; @@ -285,7 +285,7 @@ namespace libsecondlife.Utilities /// public event ParcelsDownloadedCallback OnParcelsDownloaded; - private SecondLife Client; + private GridClient Client; /// Dictionary of 64x64 arrays of parcels which have been successfully downloaded /// for each simulator (and their LocalID's, 0 = Null) private Dictionary ParcelMarked = new Dictionary(); @@ -295,8 +295,8 @@ namespace libsecondlife.Utilities /// /// Default constructor /// - /// A reference to the SecondLife client - public ParcelDownloader(SecondLife client) + /// A reference to the GridClient object + public ParcelDownloader(GridClient client) { Client = client; Client.Parcels.OnParcelProperties += new ParcelManager.ParcelPropertiesCallback(Parcels_OnParcelProperties); diff --git a/libsecondlife/libsecondlife.Utilities/VoiceManager.cs b/libsecondlife/libsecondlife.Utilities/VoiceManager.cs index f8b3cd94..0ec61b7e 100644 --- a/libsecondlife/libsecondlife.Utilities/VoiceManager.cs +++ b/libsecondlife/libsecondlife.Utilities/VoiceManager.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -31,11 +31,11 @@ using System.Text; using System.IO; using System.Xml; using System.Threading; -using libsecondlife; -using libsecondlife.StructuredData; -using libsecondlife.Capabilities; +using OpenMetaverse; +using OpenMetaverse.StructuredData; +using OpenMetaverse.Capabilities; -namespace libsecondlife.Utilities +namespace OpenMetaverse.Utilities { public enum VoiceStatus { @@ -106,7 +106,7 @@ namespace libsecondlife.Utilities public event ProvisionAccountCallback OnProvisionAccount; public event ParcelVoiceInfoCallback OnParcelVoiceInfo; - public SecondLife Client; + public GridClient Client; public string VoiceServer = VOICE_RELEASE_SERVER; public bool Enabled; @@ -147,7 +147,7 @@ namespace libsecondlife.Utilities #endregion Response Processing Variables - public VoiceManager(SecondLife client) + public VoiceManager(GridClient client) { Client = client; Client.Network.RegisterEventCallback("RequiredVoiceVersion", new Caps.EventQueueCallback(RequiredVoiceVersionEventHandler)); diff --git a/libsecondlife/libsecondlife.Utilities/VoiceManagerBlocking.cs b/libsecondlife/libsecondlife.Utilities/VoiceManagerBlocking.cs index e215fdf2..c85e3611 100644 --- a/libsecondlife/libsecondlife.Utilities/VoiceManagerBlocking.cs +++ b/libsecondlife/libsecondlife.Utilities/VoiceManagerBlocking.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2007, Second Life Reverse Engineering Team + * Copyright (c) 2007-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -7,7 +7,7 @@ * * - Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. - * - Neither the name of the Second Life Reverse Engineering Team nor the names + * - Neither the name of the openmetaverse.org nor the names * of its contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * @@ -27,9 +27,9 @@ using System; using System.Collections.Generic; using System.Threading; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.Utilities +namespace OpenMetaverse.Utilities { public partial class VoiceManager { diff --git a/libsecondlife/libsecondlife.sln b/libsecondlife/libsecondlife.sln index 7b16ab59..cd171489 100644 --- a/libsecondlife/libsecondlife.sln +++ b/libsecondlife/libsecondlife.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsecondlife", "libsecondlife.csproj", "{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMetaverse", "OpenMetaverse.csproj", "{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sldump", "examples\sldump\sldump.csproj", "{F6258A68-C624-46A0-BA73-B55D21BB0A3B}" EndProject @@ -14,9 +14,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "groupmanager", "examples\gr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "examples\TestClient\TestClient.csproj", "{B87682F6-B2D7-4C4D-A529-400C24FD4880}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsecondlife.Utilities", "libsecondlife.Utilities\libsecondlife.Utilities.csproj", "{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMetaverse.Utilities", "libsecondlife.Utilities\OpenMetaverse.Utilities.csproj", "{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsecondlife.Tests", "libsecondlife.Tests\libsecondlife.Tests.csproj", "{E0BCBBAE-A620-431A-9EB7-30173EAF195B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMetaverse.Tests", "libsecondlife.Tests\OpenMetaverse.Tests.csproj", "{E0BCBBAE-A620-431A-9EB7-30173EAF195B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualParamGenerator", "VisualParamGenerator\VisualParamGenerator.csproj", "{D2A514C5-5590-4789-9032-6E5B4C297B80}" EndProject diff --git a/libsecondlife/mapgenerator/Properties/AssemblyInfo.cs b/libsecondlife/mapgenerator/Properties/AssemblyInfo.cs index 08ce28d7..aa792c30 100644 --- a/libsecondlife/mapgenerator/Properties/AssemblyInfo.cs +++ b/libsecondlife/mapgenerator/Properties/AssemblyInfo.cs @@ -6,11 +6,11 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("mapgenerator")] -[assembly: AssemblyDescription("C# class generator from the Second Life message template")] +[assembly: AssemblyDescription("C# class generator from the message_template.msg format")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("libsecondlife")] +[assembly: AssemblyCompany("openmetaverse.org")] [assembly: AssemblyProduct("mapgenerator")] -[assembly: AssemblyCopyright("Copyright © libsecondlife 2006")] +[assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/libsecondlife/mapgenerator/ProtocolManager.cs b/libsecondlife/mapgenerator/ProtocolManager.cs index b3183256..fa7dae9a 100644 --- a/libsecondlife/mapgenerator/ProtocolManager.cs +++ b/libsecondlife/mapgenerator/ProtocolManager.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace libsecondlife +namespace OpenMetaverse { /// /// diff --git a/libsecondlife/mapgenerator/mapgenerator.cs b/libsecondlife/mapgenerator/mapgenerator.cs index 603bdd08..7844893c 100644 --- a/libsecondlife/mapgenerator/mapgenerator.cs +++ b/libsecondlife/mapgenerator/mapgenerator.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -using libsecondlife; +using OpenMetaverse; namespace mapgenerator { diff --git a/libsecondlife/mapgenerator/template.cs b/libsecondlife/mapgenerator/template.cs index 85335904..117c7e35 100644 --- a/libsecondlife/mapgenerator/template.cs +++ b/libsecondlife/mapgenerator/template.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2008, Second Life Reverse Engineering Team + * Copyright (c) 2006-2008, openmetaverse.org * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -26,9 +26,9 @@ using System; using System.Text; -using libsecondlife; +using OpenMetaverse; -namespace libsecondlife.Packets +namespace OpenMetaverse.Packets { /// /// Thrown when a packet could not be successfully deserialized @@ -52,8 +52,8 @@ namespace libsecondlife.Packets } /// - /// The Second Life header of a message template packet. Either 5, 6, or 8 - /// bytes in length at the beginning of the packet, and encapsulates any + /// The header of a message template packet. Either 5, 6, or 8 bytes in + /// length at the beginning of the packet, and encapsulates any /// appended ACKs at the end of the packet as well /// public abstract class Header