From 6d5248441d914231af36e4a378a270513b54b1f0 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sat, 8 Nov 2008 16:09:15 +0000 Subject: * Implementing first of the 0.6 IClientAPI Changes * Introducing IClientCore - this will be the key replacement for IClientAPI in the long run, it has a very minimal set of methods designed to allow you to access specialist API's. * See https://lists.berlios.de/pipermail/opensim-dev/2008-September/003049.html for the early discussion on this. --- OpenSim/Framework/Client/IClientCore.cs | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 OpenSim/Framework/Client/IClientCore.cs (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientCore.cs b/OpenSim/Framework/Client/IClientCore.cs new file mode 100644 index 0000000..41f8f4b --- /dev/null +++ b/OpenSim/Framework/Client/IClientCore.cs @@ -0,0 +1,8 @@ +namespace OpenSim.Framework.Client +{ + public interface IClientCore + { + bool TryGet(out T iface); + T Get(); + } +} \ No newline at end of file -- cgit v1.1 From cf0a14bec94322656f57890d49fead85ed31730e Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sat, 8 Nov 2008 17:20:54 +0000 Subject: * Added IClientIM to IClientCore interfaces * Changed SendInstantMessage, dropped fromAgentSession and imSessionID as security precaution, see http://opensimulator.org/wiki/OpenSim_0.6_IClientAPI#Porting_Guide for details on porting. * Removed unused usings from Framework.* --- OpenSim/Framework/Client/IClientIM.cs | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 OpenSim/Framework/Client/IClientIM.cs (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs new file mode 100644 index 0000000..a3498c2 --- /dev/null +++ b/OpenSim/Framework/Client/IClientIM.cs @@ -0,0 +1,45 @@ +using System; +using OpenMetaverse; + +namespace OpenSim.Framework.Client +{ + public class ClientInstantMessageArgs : EventArgs + { + public IClientCore client; + public string message; + public DateTime time; + public ClientInstantMessageSender sender; + } + + public class ClientInstantMessageSender + { + public UUID ID; + public bool online; + public string name; + public Vector3 position; + public UUID regionID; + } + + public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e); + + public class ClientInstantMessageParms + { + public ClientInstantMessageSender senderInfo; + } + + // Porting Guide from old IM + // SendIM(...) + // Loses FromAgentSession - this should be added by implementers manually. + // + + public interface IClientIM + { + void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, + string fromName, byte dialog, uint timeStamp); + + void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, + string fromName, byte dialog, uint timeStamp, + bool fromGroup, byte[] binaryBucket); + event ImprovedInstantMessage OnInstantMessage; + } +} -- cgit v1.1 From f1aa849dff3f287686c635510d165941eda8039a Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sat, 8 Nov 2008 19:37:08 +0000 Subject: * Missed a file from previous checkin. --- OpenSim/Framework/Client/IClientChat.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 OpenSim/Framework/Client/IClientChat.cs (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs new file mode 100644 index 0000000..76084ee --- /dev/null +++ b/OpenSim/Framework/Client/IClientChat.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenMetaverse; + +namespace OpenSim.Framework.Client +{ + public interface IClientChat + { + event ChatMessage OnChatFromClient; + + void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, + byte audible); + } +} -- cgit v1.1 From bdf9add8d1191b08bdaa9706484ac5da1f91af52 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sun, 9 Nov 2008 01:16:42 +0000 Subject: Reintroduce transactionID to the parameter list for SendInstantMessage. It is required by group IM and also for a proper implementation of item give, group notice attachments and offline IM. --- OpenSim/Framework/Client/IClientIM.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs index a3498c2..1d55d10 100644 --- a/OpenSim/Framework/Client/IClientIM.cs +++ b/OpenSim/Framework/Client/IClientIM.cs @@ -39,7 +39,9 @@ namespace OpenSim.Framework.Client void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, - bool fromGroup, byte[] binaryBucket); + UUID transactionID, bool fromGroup, + byte[] binaryBucket); + event ImprovedInstantMessage OnInstantMessage; } } -- cgit v1.1 From 8da726c3a8a3ab983fc11ad890a0b91016c86a1f Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 9 Nov 2008 01:31:38 +0000 Subject: Update svn properties. Add copyright headers. Minor formatting cleanup. --- OpenSim/Framework/Client/IClientChat.cs | 57 +++++++++++---- OpenSim/Framework/Client/IClientCore.cs | 41 +++++++++-- OpenSim/Framework/Client/IClientIM.cs | 121 +++++++++++++++++++------------- 3 files changed, 150 insertions(+), 69 deletions(-) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs index 76084ee..c89bf53 100644 --- a/OpenSim/Framework/Client/IClientChat.cs +++ b/OpenSim/Framework/Client/IClientChat.cs @@ -1,15 +1,42 @@ -using System; -using System.Collections.Generic; -using System.Text; -using OpenMetaverse; - -namespace OpenSim.Framework.Client -{ - public interface IClientChat - { - event ChatMessage OnChatFromClient; - - void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, - byte audible); - } -} +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * 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. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project 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 DEVELOPERS ``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 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.Text; +using OpenMetaverse; + +namespace OpenSim.Framework.Client +{ + public interface IClientChat + { + event ChatMessage OnChatFromClient; + + void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, + byte audible); + } +} diff --git a/OpenSim/Framework/Client/IClientCore.cs b/OpenSim/Framework/Client/IClientCore.cs index 41f8f4b..78f0411 100644 --- a/OpenSim/Framework/Client/IClientCore.cs +++ b/OpenSim/Framework/Client/IClientCore.cs @@ -1,8 +1,35 @@ -namespace OpenSim.Framework.Client -{ - public interface IClientCore - { - bool TryGet(out T iface); - T Get(); - } +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * 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. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project 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 DEVELOPERS ``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 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. + */ + +namespace OpenSim.Framework.Client +{ + public interface IClientCore + { + bool TryGet(out T iface); + T Get(); + } } \ No newline at end of file diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs index 1d55d10..04c6d6c 100644 --- a/OpenSim/Framework/Client/IClientIM.cs +++ b/OpenSim/Framework/Client/IClientIM.cs @@ -1,47 +1,74 @@ -using System; -using OpenMetaverse; - -namespace OpenSim.Framework.Client -{ - public class ClientInstantMessageArgs : EventArgs - { - public IClientCore client; - public string message; - public DateTime time; - public ClientInstantMessageSender sender; - } - - public class ClientInstantMessageSender - { - public UUID ID; - public bool online; - public string name; - public Vector3 position; - public UUID regionID; - } - - public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e); - - public class ClientInstantMessageParms - { - public ClientInstantMessageSender senderInfo; - } - - // Porting Guide from old IM - // SendIM(...) - // Loses FromAgentSession - this should be added by implementers manually. - // - - public interface IClientIM - { - void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, - string fromName, byte dialog, uint timeStamp); - - void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, - string fromName, byte dialog, uint timeStamp, - UUID transactionID, bool fromGroup, - byte[] binaryBucket); - - event ImprovedInstantMessage OnInstantMessage; - } -} +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * 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. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project 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 DEVELOPERS ``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 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 OpenMetaverse; + +namespace OpenSim.Framework.Client +{ + public class ClientInstantMessageArgs : EventArgs + { + public IClientCore client; + public string message; + public DateTime time; + public ClientInstantMessageSender sender; + } + + public class ClientInstantMessageSender + { + public UUID ID; + public bool online; + public string name; + public Vector3 position; + public UUID regionID; + } + + public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e); + + public class ClientInstantMessageParms + { + public ClientInstantMessageSender senderInfo; + } + + // Porting Guide from old IM + // SendIM(...) + // Loses FromAgentSession - this should be added by implementers manually. + // + + public interface IClientIM + { + void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, + string fromName, byte dialog, uint timeStamp); + + void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, + string fromName, byte dialog, uint timeStamp, + UUID transactionID, bool fromGroup, + byte[] binaryBucket); + + event ImprovedInstantMessage OnInstantMessage; + } +} -- cgit v1.1 From 801da4346aeb3c08969c4845f5c595135a64470a Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 12 Feb 2009 09:53:12 +0000 Subject: * optimized usings. --- OpenSim/Framework/Client/IClientChat.cs | 3 --- 1 file changed, 3 deletions(-) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs index c89bf53..078ea9b 100644 --- a/OpenSim/Framework/Client/IClientChat.cs +++ b/OpenSim/Framework/Client/IClientChat.cs @@ -25,9 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections.Generic; -using System.Text; using OpenMetaverse; namespace OpenSim.Framework.Client -- cgit v1.1 From c483206fd7ecd67ac4fc8c4e4b71f65dfd3de6c4 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sun, 29 Mar 2009 05:42:27 +0000 Subject: Change the client API to use GridInstantMessage for the "last mile" of IM sending. With this change, all methods that handle IM now use GridInstantMessage rather than individual parameters. --- OpenSim/Framework/Client/IClientIM.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs index 04c6d6c..81b1d9e 100644 --- a/OpenSim/Framework/Client/IClientIM.cs +++ b/OpenSim/Framework/Client/IClientIM.cs @@ -61,13 +61,7 @@ namespace OpenSim.Framework.Client public interface IClientIM { - void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, - string fromName, byte dialog, uint timeStamp); - - void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, - string fromName, byte dialog, uint timeStamp, - UUID transactionID, bool fromGroup, - byte[] binaryBucket); + void SendInstantMessage(GridInstantMessage im); event ImprovedInstantMessage OnInstantMessage; } -- cgit v1.1 From 6dcafec22d560c50625c8a391701606a1a0bb363 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Mon, 11 May 2009 19:23:51 +0000 Subject: * Implements IP and DNS based ban facilities to OpenSim. * User interface is ... primitive at best right now. * Loads bans from bans.txt and region ban DB on startup, bans.txt is in the format of one per line. The following explains how they are read; DNS bans are in the form "somewhere.com" will block ANY matching domain (including "betasomewhere.com", "beta.somewhere.com", "somewhere.com.beta") - make sure to be reasonably specific in DNS bans. IP address bans match on first characters, so, "127.0.0.1" will ban only that address, "127.0.1" will ban "127.0.10.0" but "127.0.1." will ban only the "127.0.1.*" network --- OpenSim/Framework/Client/IClientCore.cs | 9 +++++++++ OpenSim/Framework/Client/IClientIPEndpoint.cs | 12 ++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 OpenSim/Framework/Client/IClientIPEndpoint.cs (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientCore.cs b/OpenSim/Framework/Client/IClientCore.cs index 78f0411..1d08fb9 100644 --- a/OpenSim/Framework/Client/IClientCore.cs +++ b/OpenSim/Framework/Client/IClientCore.cs @@ -25,11 +25,20 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using OpenMetaverse; + namespace OpenSim.Framework.Client { public interface IClientCore { bool TryGet(out T iface); T Get(); + + // Basic Interfaces + UUID AgentId { get; } + + void Disconnect(string reason); + void Disconnect(); + } } \ No newline at end of file diff --git a/OpenSim/Framework/Client/IClientIPEndpoint.cs b/OpenSim/Framework/Client/IClientIPEndpoint.cs new file mode 100644 index 0000000..b80dea5 --- /dev/null +++ b/OpenSim/Framework/Client/IClientIPEndpoint.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Net; +using System.Text; + +namespace OpenSim.Framework.Client +{ + public interface IClientIPEndpoint + { + IPAddress EndPoint { get; } + } +} -- cgit v1.1 From 5cfd84c92427658d88c4b36e1470744babd3d54d Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 17 May 2009 10:26:00 +0000 Subject: Update svn properties. --- OpenSim/Framework/Client/IClientIPEndpoint.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientIPEndpoint.cs b/OpenSim/Framework/Client/IClientIPEndpoint.cs index b80dea5..d59bd31 100644 --- a/OpenSim/Framework/Client/IClientIPEndpoint.cs +++ b/OpenSim/Framework/Client/IClientIPEndpoint.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Net; -using System.Text; - -namespace OpenSim.Framework.Client -{ - public interface IClientIPEndpoint - { - IPAddress EndPoint { get; } - } -} +using System; +using System.Collections.Generic; +using System.Net; +using System.Text; + +namespace OpenSim.Framework.Client +{ + public interface IClientIPEndpoint + { + IPAddress EndPoint { get; } + } +} -- cgit v1.1 From e0bc5c5db2b88691c04b06be2fa73a75746126cb Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 20 May 2009 01:32:06 +0000 Subject: Add copyright headers, formatting cleanup. --- OpenSim/Framework/Client/IClientIPEndpoint.cs | 29 ++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientIPEndpoint.cs b/OpenSim/Framework/Client/IClientIPEndpoint.cs index d59bd31..2b99bf0 100644 --- a/OpenSim/Framework/Client/IClientIPEndpoint.cs +++ b/OpenSim/Framework/Client/IClientIPEndpoint.cs @@ -1,4 +1,31 @@ -using System; +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * 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. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project 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 DEVELOPERS ``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 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.Net; using System.Text; -- cgit v1.1 From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- OpenSim/Framework/Client/IClientIM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs index 81b1d9e..3df86d0 100644 --- a/OpenSim/Framework/Client/IClientIM.cs +++ b/OpenSim/Framework/Client/IClientIM.cs @@ -57,7 +57,7 @@ namespace OpenSim.Framework.Client // Porting Guide from old IM // SendIM(...) // Loses FromAgentSession - this should be added by implementers manually. - // + // public interface IClientIM { -- cgit v1.1 From 710c14fb57ce2a8cd9a1d5c68ed7c3539a4148cc Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 28 Mar 2012 01:15:56 +0200 Subject: Add SendRemoveInventoryFolders which allows to remove one or more folders from the viewer's inventory view. For HG v2.0. More to come --- OpenSim/Framework/Client/IClientInventory.cs | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 OpenSim/Framework/Client/IClientInventory.cs (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientInventory.cs b/OpenSim/Framework/Client/IClientInventory.cs new file mode 100644 index 0000000..00651e0 --- /dev/null +++ b/OpenSim/Framework/Client/IClientInventory.cs @@ -0,0 +1,37 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * 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. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project 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 DEVELOPERS ``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 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 OpenMetaverse; + +namespace OpenSim.Framework.Client +{ + public interface IClientInventory + { + void SendRemoveInventoryFolders(UUID[] folders); + } +} -- cgit v1.1 From 8c0f1e905814e93003dd8d78ee54ae947cb3af17 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 28 Mar 2012 02:10:07 +0100 Subject: Add a corresponding method for items. HG v2 --- OpenSim/Framework/Client/IClientInventory.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientInventory.cs b/OpenSim/Framework/Client/IClientInventory.cs index 00651e0..d59f8b7 100644 --- a/OpenSim/Framework/Client/IClientInventory.cs +++ b/OpenSim/Framework/Client/IClientInventory.cs @@ -33,5 +33,6 @@ namespace OpenSim.Framework.Client public interface IClientInventory { void SendRemoveInventoryFolders(UUID[] folders); + void SendRemoveInventoryItems(UUID[] folders); } } -- cgit v1.1 From 0463a00d34af4752936817e826d735e3f36d33f1 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 28 Mar 2012 02:45:50 +0100 Subject: Start on Bulk inventory update via CAPS. Not functional yet. HG v2 --- OpenSim/Framework/Client/IClientInventory.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientInventory.cs b/OpenSim/Framework/Client/IClientInventory.cs index d59f8b7..a6e0510 100644 --- a/OpenSim/Framework/Client/IClientInventory.cs +++ b/OpenSim/Framework/Client/IClientInventory.cs @@ -27,6 +27,7 @@ using System; using OpenMetaverse; +using OpenSim.Framework; namespace OpenSim.Framework.Client { @@ -34,5 +35,6 @@ namespace OpenSim.Framework.Client { void SendRemoveInventoryFolders(UUID[] folders); void SendRemoveInventoryItems(UUID[] folders); + void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items); } } -- cgit v1.1 From c13a99dc5cc82efac5497dab27dcb6b0d9865cea Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 25 Oct 2012 03:26:12 +0100 Subject: Fix script error messages not showing up in viewer 3 and associated viewers. Viewer 3 will discard such a message if the chat message owner does not match the avatar. We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages. This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages. This does not affect viewer 1 and associated viewers which continue to process script errors as normal. --- OpenSim/Framework/Client/IClientChat.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'OpenSim/Framework/Client') diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs index 078ea9b..86b1faa 100644 --- a/OpenSim/Framework/Client/IClientChat.cs +++ b/OpenSim/Framework/Client/IClientChat.cs @@ -33,7 +33,8 @@ namespace OpenSim.Framework.Client { event ChatMessage OnChatFromClient; - void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, - byte audible); + void SendChatMessage( + string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, UUID ownerID, byte source, + byte audible); } -} +} \ No newline at end of file -- cgit v1.1