ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added IClientIM to IClientCore interfaces

Browse Source 
* 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.*
This commit is contained in:
Adam Frisby
2008-11-08 17:20:54 +00:00
parent 07cfa1e70b
commit cf0a14bec9
33 changed files with 111 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/AssetRequestToClient.cs
View File

@@ -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

4
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -28,13 +28,9 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.Serialization;
using System.Security.Permissions;
using log4net;
using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework;
namespace OpenSim.Framework
{

1
OpenSim/Framework/ChildAgentDataUpdate.cs
View File

@@ -26,7 +26,6 @@
*/
using System;
using OpenSim.Framework;
namespace OpenSim.Framework
{

45
OpenSim/Framework/Client/IClientIM.cs Normal file
View File

@@ -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;
}
}

2
OpenSim/Framework/ClientManager.cs
View File

@@ -28,9 +28,9 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using log4net;
using OpenMetaverse;
using OpenMetaverse.Packets;
using log4net;
namespace OpenSim.Framework
{

3
OpenSim/Framework/ColliderData.cs
View File

@@ -26,9 +26,8 @@
*/
using System;
using System.Collections;
using OpenMetaverse;
using System.Collections.Generic;
using OpenMetaverse;
namespace OpenSim.Framework
{

4
OpenSim/Framework/ConfigSettings.cs
View File

@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{
public class ConfigSettings

2
OpenSim/Framework/ConfigurationMember.cs
View File

@@ -31,8 +31,8 @@ using System.Globalization;
using System.Net;
using System.Reflection;
using System.Xml;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
using OpenSim.Framework.Console;
namespace OpenSim.Framework

3
OpenSim/Framework/EstateBan.cs
View File

@@ -26,9 +26,6 @@
*/
using OpenMetaverse;
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{

4
OpenSim/Framework/EstateSettings.cs
View File

@@ -26,11 +26,9 @@
*/
using System;
using System.IO;
using System.Reflection;
using System.Collections.Generic;
using System.IO;
using OpenMetaverse;
using log4net;
namespace OpenSim.Framework
{

1
OpenSim/Framework/EventData.cs
View File

@@ -25,7 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using OpenMetaverse;
namespace OpenSim.Framework

2
OpenSim/Framework/FriendRegionInfo.cs
View File

@@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
namespace OpenSim.Framework
{
public class FriendRegionInfo

4
OpenSim/Framework/GroupData.cs
View File

@@ -26,11 +26,7 @@
*/
using System;
using System.Collections;
using OpenMetaverse;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{

22
OpenSim/Framework/IClientAPI.cs
View File

@@ -638,7 +638,6 @@ namespace OpenSim.Framework
/// <summary>
/// Tell this client what items it should be wearing now
/// </summary>
/// <param name="wearables"></param>
void SendWearables(AvatarWearable[] wearables, int serial);
/// <summary>
@@ -660,15 +659,18 @@ namespace OpenSim.Framework
void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId);
void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
UUID imSessionID, string fromName, byte dialog, uint timeStamp);
void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
byte audible);
void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
UUID imSessionID, string fromName, byte dialog, uint timeStamp,
bool fromGroup, byte[] binaryBucket);
void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
byte audible);
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);
void SendGenericMessage(string method, List<string> message);
@@ -833,7 +835,6 @@ namespace OpenSim.Framework
/// <summary>
/// Tell the client that the requested texture cannot be found
/// </summary>
/// <param name="imageId"></param>
void SendImageNotFound(UUID imageid);
void SendShutdownConnectionNotice();
@@ -880,7 +881,6 @@ namespace OpenSim.Framework
/// <summary>
/// Set the debug level at which packet output should be printed to console.
/// </summary>
/// <param name="newDebugPacketLevel"></param>
void SetDebugPacketLevel(int newDebug);
void InPacket(object NewPack);
@@ -892,7 +892,7 @@ namespace OpenSim.Framework
event Action<IClientAPI> OnLogout;
event Action<IClientAPI> OnConnectionClosed;
void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message);
void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
void SendLogoutPacket();
ClientInfo GetClientInfo();

4
OpenSim/Framework/LandStatReportItem.cs
View File

@@ -26,12 +26,8 @@
*/
using System;
using System.Collections.Generic;
using System.Text;
using OpenMetaverse;
namespace OpenSim.Framework
{
public class LandStatReportItem

1
OpenSim/Framework/MapItemReplyStruct.cs
View File

@@ -25,7 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using OpenMetaverse;
namespace OpenSim.Framework

4
OpenSim/Framework/ParcelMediaCommandEnum.cs
View File

@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{
public enum ParcelMediaCommandEnum

4
OpenSim/Framework/PluginLoader.cs
View File

@@ -26,14 +26,12 @@
*/
using System;
using System.IO;
using System.Xml;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using log4net;
using Mono.Addins;
namespace OpenSim.Framework
{
/// <summary>

2
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@@ -28,8 +28,8 @@
using System;
using System.Reflection;
using System.Xml.Serialization;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
namespace OpenSim.Framework
{

3
OpenSim/Framework/ProxyCodec.cs
View File

@@ -26,10 +26,7 @@
*/
using System;
using System.Collections;
using System.Net;
using OpenMetaverse;
using OpenMetaverse.Packets;
namespace OpenSim.Framework
{

3
OpenSim/Framework/RegionInfo.cs
View File

@@ -26,12 +26,11 @@
*/
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Xml;
using OpenMetaverse;
using Nini.Config;
using OpenMetaverse;
namespace OpenSim.Framework
{

2
OpenSim/Framework/RegionSettings.cs
View File

@@ -27,9 +27,7 @@
using System;
using System.IO;
using System.Reflection;
using OpenMetaverse;
using log4net;
namespace OpenSim.Framework
{

3
OpenSim/Framework/SurfaceTouchEventArgs.cs
View File

@@ -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

2
OpenSim/Framework/TaskInventoryDictionary.cs
View File

@@ -27,12 +27,10 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Xml;
using System.Xml.Schema;
using System.Xml.Serialization;
using OpenMetaverse;
using log4net;
namespace OpenSim.Framework
{

6
OpenSim/Framework/TaskInventoryItem.cs
View File

@@ -26,13 +26,7 @@
*/
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Xml;
using System.Xml.Schema;
using System.Xml.Serialization;
using OpenMetaverse;
using log4net;
namespace OpenSim.Framework
{

2
OpenSim/Framework/Util.cs
View File

@@ -39,10 +39,10 @@ using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
using OpenMetaverse;
using log4net;
using Nini.Config;
using Nwc.XmlRpc;
using OpenMetaverse;
namespace OpenSim.Framework
{