OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.*
0.6.1-post-fixes
Adam Frisby 2008-11-08 17:20:54 +00:00
parent 07cfa1e70b
commit cf0a14bec9
33 changed files with 111 additions and 116 deletions
Show Stats 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
{

31
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -52,7 +52,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Handles new client connections
/// Constructor takes a single Packet and authenticates everything
/// </summary>
public class LLClientView : IClientAPI, IClientCore
public class LLClientView : IClientAPI, IClientCore, IClientIM
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -394,6 +394,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP,
ClientStackUserSettings userSettings)
{
// Should be called first?
RegisterInterfaces();
m_GroupsModule = scene.RequestModuleInterface<IGroupsModule>();
m_moneyBalance = 1000;
@ -1076,19 +1079,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <summary>
/// Send an instant message to this client
/// </summary>
public void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
UUID imSessionID, string fromName, byte dialog, uint timeStamp)
public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp)
{
SendInstantMessage(
fromAgent, fromAgentSession, message, toAgent,
imSessionID, fromName, dialog, timeStamp, false, new byte[0]);
SendInstantMessage(fromAgent, message, toAgent, fromName, dialog, timeStamp, false, new byte[0]);
}
/// <summary>
/// Send an instant message to this client
/// </summary>
public void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
UUID imSessionID, string fromName, byte dialog, uint timeStamp,
public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
string fromName, byte dialog, uint timeStamp,
bool fromGroup, byte[] binaryBucket)
{
if (((Scene)(m_scene)).ExternalChecks.ExternalChecksCanInstantMessage(fromAgent, toAgent))
@ -1097,15 +1097,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
= (ImprovedInstantMessagePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedInstantMessage);
msg.AgentData.AgentID = fromAgent;
msg.AgentData.SessionID = fromAgentSession;
msg.AgentData.SessionID = UUID.Zero;
msg.MessageBlock.FromAgentName = Utils.StringToBytes(fromName);
msg.MessageBlock.Dialog = dialog;
msg.MessageBlock.FromGroup = fromGroup;
msg.MessageBlock.ID = imSessionID;
msg.MessageBlock.ID = fromAgent ^ toAgent;
msg.MessageBlock.Offline = 0;
msg.MessageBlock.ParentEstateID = 0;
msg.MessageBlock.Position = new Vector3();
msg.MessageBlock.RegionID = UUID.Random();
msg.MessageBlock.RegionID = UUID.Zero;
msg.MessageBlock.Timestamp = timeStamp;
msg.MessageBlock.ToAgentID = toAgent;
msg.MessageBlock.Message = Utils.StringToBytes(message);
@ -6919,10 +6919,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name="fromSessionID"></param>
/// <param name="FromAvatarName"></param>
/// <param name="Message"></param>
public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message)
public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message)
{
if (!ChildAgentStatus())
SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, 1, (uint)Util.UnixTimeSinceEpoch());
SendInstantMessage(FromAvatarID, Message, AgentId, FromAvatarName, 1, (uint)Util.UnixTimeSinceEpoch());
//SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch());
}
@ -7675,6 +7675,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
}
protected virtual void RegisterInterfaces()
{
RegisterInterface<IClientIM>(this);
}
public bool TryGet<T>(out T iface)
{
if (m_clientInterfaces.ContainsKey(typeof(T)))

10
OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
View File

@ -819,9 +819,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
Hashtable retparam = new Hashtable();
Hashtable requestData = (Hashtable) request.Params[0];
UUID agentId = UUID.Zero;
UUID soundId = UUID.Zero;
UUID regionId = UUID.Zero;
UUID agentId;
UUID soundId;
UUID regionId;
UUID.TryParse((string) requestData["agentId"], out agentId);
UUID.TryParse((string) requestData["soundId"], out soundId);
@ -832,7 +832,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
Scene userScene = GetSceneByUUID(regionId);
if (userScene != null)
{
if (userScene.RegionInfo.regionSecret.ToString() == secret)
if (userScene.RegionInfo.regionSecret == secret)
{
IClientAPI client = LocateClientObject(agentId);
@ -842,7 +842,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
if (soundId != UUID.Zero)
client.SendPlayAttachedSound(soundId, UUID.Zero, UUID.Zero, 1.0f, 0);
client.SendBlueBoxMessage(UUID.Zero, UUID.Zero, "", text);
client.SendBlueBoxMessage(UUID.Zero, "", text);
retparam.Add("success", true);
}

18
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@ -155,8 +155,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
if (!user.IsChildAgent)
{
user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message,
toAgentID, imSessionID, fromAgentName, dialog,
user.ControllingClient.SendInstantMessage(fromAgentID, message,
toAgentID, fromAgentName, dialog,
timestamp, fromGroup, binaryBucket);
// Message sent
return;
@ -172,8 +172,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
// Local message
ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message,
toAgentID, imSessionID, fromAgentName, dialog,
user.ControllingClient.SendInstantMessage(fromAgentID, message,
toAgentID, fromAgentName, dialog,
timestamp, fromGroup, binaryBucket);
// Message sent
return;
@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
if (client != null)
{
if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message. User is not logged in.", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
client.SendInstantMessage(toAgentID, "Unable to send instant message. User is not logged in.", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
}
}
}
@ -551,7 +551,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
if (client != null)
{
if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
client.SendInstantMessage(toAgentID, "Unable to send instant message", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());
}
return;
}
@ -562,7 +562,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
if (client != null)
{
if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
client.SendInstantMessage(toAgentID, "Unable to send instant message", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());
}
return;
}
@ -635,7 +635,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
if (client != null)
{
if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message: Agent Offline", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
client.SendInstantMessage(toAgentID, "Unable to send instant message: Agent Offline", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
}
}
}
@ -643,7 +643,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
{
// send Agent doesn't exist message
if (client != null)
client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message: Are you sure this agent exists anymore?", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.MessageFromObject, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
client.SendInstantMessage(toAgentID, "Unable to send instant message: Are you sure this agent exists anymore?", fromAgentID, "System", (byte)InstantMessageDialog.MessageFromObject, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
}
}

6
OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@ -135,7 +135,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
m_pendingOffers[imSessionID] = itemId;
user.ControllingClient.SendInstantMessage(
fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
fromAgentID, message, toAgentID, fromAgentName,
dialog, timestamp, false, binaryBucket);
return;
@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
if (!user.IsChildAgent)
{
user.ControllingClient.SendInstantMessage(
fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
fromAgentID, message, toAgentID, fromAgentName,
dialog, timestamp, false, binaryBucket);
if (m_pendingOffers.ContainsKey(imSessionID))
@ -213,7 +213,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
if (!user.IsChildAgent)
{
user.ControllingClient.SendInstantMessage(
fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
fromAgentID, message, toAgentID, fromAgentName,
dialog, timestamp, false, binaryBucket);
if (m_pendingOffers.ContainsKey(imSessionID))

11
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@ -471,15 +471,14 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
{
}
public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
UUID imSessionID, string fromName, byte dialog, uint timeStamp)
public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp)
{
}
public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
UUID imSessionID, string fromName, byte dialog, uint timeStamp,
bool fromGroup, byte[] binaryBucket)
public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, bool fromGroup, byte[] binaryBucket)
{
}
public void SendGenericMessage(string method, List<string> message)
@ -793,7 +792,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
set { m_circuitCode = value; }
}
public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message)
public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message)
{
}

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -3424,7 +3424,7 @@ namespace OpenSim.Region.Environment.Scenes
foreach (ScenePresence presence in presenceList)
{
if (!presence.IsChildAgent)
presence.ControllingClient.SendBlueBoxMessage(FromAvatarID, fromSessionID, FromAvatarName, Message);
presence.ControllingClient.SendBlueBoxMessage(FromAvatarID, FromAvatarName, Message);
}
}
@ -3441,7 +3441,7 @@ namespace OpenSim.Region.Environment.Scenes
ClientManager.ForEachClient(delegate(IClientAPI controller)
{
controller.SendBlueBoxMessage(FromAvatarID, fromSessionID, FromAvatarName, Message);
controller.SendBlueBoxMessage(FromAvatarID, FromAvatarName, Message);
}
);
}

11
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -383,15 +383,14 @@ namespace OpenSim.Region.Examples.SimpleModule
{
}
public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
UUID imSessionID, string fromName, byte dialog, uint timeStamp)
public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp)
{
}
public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
UUID imSessionID, string fromName, byte dialog, uint timeStamp,
bool fromGroup, byte[] binaryBucket)
public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, bool fromGroup, byte[] binaryBucket)
{
}
public void SendGenericMessage(string method, List<string> message)
@ -780,7 +779,7 @@ namespace OpenSim.Region.Examples.SimpleModule
set { m_circuitCode = value; }
}
public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message)
public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message)
{
}