aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AssetRequestToClient.cs3
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs4
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs1
-rw-r--r--OpenSim/Framework/Client/IClientIM.cs45
-rw-r--r--OpenSim/Framework/ClientManager.cs2
-rw-r--r--OpenSim/Framework/ColliderData.cs3
-rw-r--r--OpenSim/Framework/ConfigSettings.cs4
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs2
-rw-r--r--OpenSim/Framework/EstateBan.cs3
-rw-r--r--OpenSim/Framework/EstateSettings.cs4
-rw-r--r--OpenSim/Framework/EventData.cs1
-rw-r--r--OpenSim/Framework/FriendRegionInfo.cs2
-rw-r--r--OpenSim/Framework/GroupData.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs22
-rw-r--r--OpenSim/Framework/LandStatReportItem.cs4
-rw-r--r--OpenSim/Framework/MapItemReplyStruct.cs1
-rw-r--r--OpenSim/Framework/ParcelMediaCommandEnum.cs4
-rw-r--r--OpenSim/Framework/PluginLoader.cs4
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
-rw-r--r--OpenSim/Framework/ProxyCodec.cs3
-rw-r--r--OpenSim/Framework/RegionInfo.cs3
-rw-r--r--OpenSim/Framework/RegionSettings.cs2
-rw-r--r--OpenSim/Framework/SurfaceTouchEventArgs.cs3
-rw-r--r--OpenSim/Framework/TaskInventoryDictionary.cs2
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs6
-rw-r--r--OpenSim/Framework/Util.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs31
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs18
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs11
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs11
33 files changed, 111 insertions, 116 deletions
diff --git a/OpenSim/Framework/AssetRequestToClient.cs b/OpenSim/Framework/AssetRequestToClient.cs
index 2bf3d3e..6e935e8 100644
--- a/OpenSim/Framework/AssetRequestToClient.cs
+++ b/OpenSim/Framework/AssetRequestToClient.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index e1d0bbe..74a9f92 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -28,13 +28,9 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using System.Runtime.Serialization; 31using System.Runtime.Serialization;
33using System.Security.Permissions; 32using System.Security.Permissions;
34using log4net;
35using OpenMetaverse; 33using OpenMetaverse;
36using OpenMetaverse.Packets;
37using OpenSim.Framework;
38 34
39namespace OpenSim.Framework 35namespace OpenSim.Framework
40{ 36{
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 0515aeb..260d6cf 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
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 @@
1using System;
2using OpenMetaverse;
3
4namespace OpenSim.Framework.Client
5{
6 public class ClientInstantMessageArgs : EventArgs
7 {
8 public IClientCore client;
9 public string message;
10 public DateTime time;
11 public ClientInstantMessageSender sender;
12 }
13
14 public class ClientInstantMessageSender
15 {
16 public UUID ID;
17 public bool online;
18 public string name;
19 public Vector3 position;
20 public UUID regionID;
21 }
22
23 public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e);
24
25 public class ClientInstantMessageParms
26 {
27 public ClientInstantMessageSender senderInfo;
28 }
29
30 // Porting Guide from old IM
31 // SendIM(...)
32 // Loses FromAgentSession - this should be added by implementers manually.
33 //
34
35 public interface IClientIM
36 {
37 void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
38 string fromName, byte dialog, uint timeStamp);
39
40 void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
41 string fromName, byte dialog, uint timeStamp,
42 bool fromGroup, byte[] binaryBucket);
43 event ImprovedInstantMessage OnInstantMessage;
44 }
45}
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 3f83f5c..1bb9836 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using log4net;
31using OpenMetaverse; 32using OpenMetaverse;
32using OpenMetaverse.Packets; 33using OpenMetaverse.Packets;
33using log4net;
34 34
35namespace OpenSim.Framework 35namespace OpenSim.Framework
36{ 36{
diff --git a/OpenSim/Framework/ColliderData.cs b/OpenSim/Framework/ColliderData.cs
index 4e94d6d..51ab5a8 100644
--- a/OpenSim/Framework/ColliderData.cs
+++ b/OpenSim/Framework/ColliderData.cs
@@ -26,9 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using OpenMetaverse;
31using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse;
32 31
33namespace OpenSim.Framework 32namespace OpenSim.Framework
34{ 33{
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 1a24711..02b8465 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Framework 28namespace OpenSim.Framework
33{ 29{
34 public class ConfigSettings 30 public class ConfigSettings
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 2a2b9b2..bbfe28d 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -31,8 +31,8 @@ using System.Globalization;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Xml;
34using OpenMetaverse;
35using log4net; 34using log4net;
35using OpenMetaverse;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37 37
38namespace OpenSim.Framework 38namespace OpenSim.Framework
diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index 4d31514..5c3aa42 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -26,9 +26,6 @@
26 */ 26 */
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using System;
30using System.Collections.Generic;
31using System.Text;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
34{ 31{
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index f8595e0..81f85cd 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -26,11 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Reflection;
31using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
32using OpenMetaverse; 31using OpenMetaverse;
33using log4net;
34 32
35namespace OpenSim.Framework 33namespace OpenSim.Framework
36{ 34{
diff --git a/OpenSim/Framework/EventData.cs b/OpenSim/Framework/EventData.cs
index 70554d0..a7d3260 100644
--- a/OpenSim/Framework/EventData.cs
+++ b/OpenSim/Framework/EventData.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using OpenMetaverse; 28using OpenMetaverse;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/FriendRegionInfo.cs b/OpenSim/Framework/FriendRegionInfo.cs
index 04e00e8..ee308ea 100644
--- a/OpenSim/Framework/FriendRegionInfo.cs
+++ b/OpenSim/Framework/FriendRegionInfo.cs
@@ -25,8 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29
30namespace OpenSim.Framework 28namespace OpenSim.Framework
31{ 29{
32 public class FriendRegionInfo 30 public class FriendRegionInfo
diff --git a/OpenSim/Framework/GroupData.cs b/OpenSim/Framework/GroupData.cs
index 3b980e7..8b8c6e0 100644
--- a/OpenSim/Framework/GroupData.cs
+++ b/OpenSim/Framework/GroupData.cs
@@ -26,11 +26,7 @@
26 */ 26 */
27 27
28 28
29using System;
30using System.Collections;
31using OpenMetaverse; 29using OpenMetaverse;
32using System.Collections.Generic;
33using System.Text;
34 30
35namespace OpenSim.Framework 31namespace OpenSim.Framework
36{ 32{
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4759761..0e88dbd 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -638,7 +638,6 @@ namespace OpenSim.Framework
638 /// <summary> 638 /// <summary>
639 /// Tell this client what items it should be wearing now 639 /// Tell this client what items it should be wearing now
640 /// </summary> 640 /// </summary>
641 /// <param name="wearables"></param>
642 void SendWearables(AvatarWearable[] wearables, int serial); 641 void SendWearables(AvatarWearable[] wearables, int serial);
643 642
644 /// <summary> 643 /// <summary>
@@ -660,15 +659,18 @@ namespace OpenSim.Framework
660 659
661 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId); 660 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId);
662 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); 661 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
663 void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
664 void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
665 662
666 void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 663 void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
667 UUID imSessionID, string fromName, byte dialog, uint timeStamp); 664 byte audible);
668 665
669 void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 666 void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
670 UUID imSessionID, string fromName, byte dialog, uint timeStamp, 667 byte audible);
671 bool fromGroup, byte[] binaryBucket); 668
669 void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
670 uint timeStamp);
671
672 void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
673 uint timeStamp, bool fromGroup, byte[] binaryBucket);
672 674
673 void SendGenericMessage(string method, List<string> message); 675 void SendGenericMessage(string method, List<string> message);
674 676
@@ -833,7 +835,6 @@ namespace OpenSim.Framework
833 /// <summary> 835 /// <summary>
834 /// Tell the client that the requested texture cannot be found 836 /// Tell the client that the requested texture cannot be found
835 /// </summary> 837 /// </summary>
836 /// <param name="imageId"></param>
837 void SendImageNotFound(UUID imageid); 838 void SendImageNotFound(UUID imageid);
838 839
839 void SendShutdownConnectionNotice(); 840 void SendShutdownConnectionNotice();
@@ -880,7 +881,6 @@ namespace OpenSim.Framework
880 /// <summary> 881 /// <summary>
881 /// Set the debug level at which packet output should be printed to console. 882 /// Set the debug level at which packet output should be printed to console.
882 /// </summary> 883 /// </summary>
883 /// <param name="newDebugPacketLevel"></param>
884 void SetDebugPacketLevel(int newDebug); 884 void SetDebugPacketLevel(int newDebug);
885 885
886 void InPacket(object NewPack); 886 void InPacket(object NewPack);
@@ -892,7 +892,7 @@ namespace OpenSim.Framework
892 event Action<IClientAPI> OnLogout; 892 event Action<IClientAPI> OnLogout;
893 event Action<IClientAPI> OnConnectionClosed; 893 event Action<IClientAPI> OnConnectionClosed;
894 894
895 void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message); 895 void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
896 896
897 void SendLogoutPacket(); 897 void SendLogoutPacket();
898 ClientInfo GetClientInfo(); 898 ClientInfo GetClientInfo();
diff --git a/OpenSim/Framework/LandStatReportItem.cs b/OpenSim/Framework/LandStatReportItem.cs
index b3ad02a..e93dda9 100644
--- a/OpenSim/Framework/LandStatReportItem.cs
+++ b/OpenSim/Framework/LandStatReportItem.cs
@@ -26,12 +26,8 @@
26 */ 26 */
27 27
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32using OpenMetaverse; 29using OpenMetaverse;
33 30
34
35namespace OpenSim.Framework 31namespace OpenSim.Framework
36{ 32{
37 public class LandStatReportItem 33 public class LandStatReportItem
diff --git a/OpenSim/Framework/MapItemReplyStruct.cs b/OpenSim/Framework/MapItemReplyStruct.cs
index f088085..3b3107b 100644
--- a/OpenSim/Framework/MapItemReplyStruct.cs
+++ b/OpenSim/Framework/MapItemReplyStruct.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using OpenMetaverse; 28using OpenMetaverse;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/ParcelMediaCommandEnum.cs b/OpenSim/Framework/ParcelMediaCommandEnum.cs
index 644c6ee..93c41ec 100644
--- a/OpenSim/Framework/ParcelMediaCommandEnum.cs
+++ b/OpenSim/Framework/ParcelMediaCommandEnum.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Framework 28namespace OpenSim.Framework
33{ 29{
34 public enum ParcelMediaCommandEnum 30 public enum ParcelMediaCommandEnum
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index a39f787..497d9f5 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -26,14 +26,12 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Xml;
31using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
32using System.Reflection; 31using System.Reflection;
33using log4net; 32using log4net;
34using Mono.Addins; 33using Mono.Addins;
35 34
36
37namespace OpenSim.Framework 35namespace OpenSim.Framework
38{ 36{
39 /// <summary> 37 /// <summary>
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 49bc953..cd50e9e 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Xml.Serialization; 30using System.Xml.Serialization;
31using OpenMetaverse;
32using log4net; 31using log4net;
32using OpenMetaverse;
33 33
34namespace OpenSim.Framework 34namespace OpenSim.Framework
35{ 35{
diff --git a/OpenSim/Framework/ProxyCodec.cs b/OpenSim/Framework/ProxyCodec.cs
index e1aeeda..df4be64 100644
--- a/OpenSim/Framework/ProxyCodec.cs
+++ b/OpenSim/Framework/ProxyCodec.cs
@@ -26,10 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Net; 29using System.Net;
31using OpenMetaverse;
32using OpenMetaverse.Packets;
33 30
34namespace OpenSim.Framework 31namespace OpenSim.Framework
35{ 32{
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 34a69d7..cac68d9 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -26,12 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Net; 29using System.Net;
31using System.Net.Sockets; 30using System.Net.Sockets;
32using System.Xml; 31using System.Xml;
33using OpenMetaverse;
34using Nini.Config; 32using Nini.Config;
33using OpenMetaverse;
35 34
36namespace OpenSim.Framework 35namespace OpenSim.Framework
37{ 36{
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index ba04513..e1e747a 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -27,9 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
31using OpenMetaverse; 30using OpenMetaverse;
32using log4net;
33 31
34namespace OpenSim.Framework 32namespace OpenSim.Framework
35{ 33{
diff --git a/OpenSim/Framework/SurfaceTouchEventArgs.cs b/OpenSim/Framework/SurfaceTouchEventArgs.cs
index ae85197..5d4802a 100644
--- a/OpenSim/Framework/SurfaceTouchEventArgs.cs
+++ b/OpenSim/Framework/SurfaceTouchEventArgs.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 16ea042..4a1aa17 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -27,12 +27,10 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
31using System.Xml; 30using System.Xml;
32using System.Xml.Schema; 31using System.Xml.Schema;
33using System.Xml.Serialization; 32using System.Xml.Serialization;
34using OpenMetaverse; 33using OpenMetaverse;
35using log4net;
36 34
37namespace OpenSim.Framework 35namespace OpenSim.Framework
38{ 36{
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index fdb1137..1443e74 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -26,13 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using System.Xml;
32using System.Xml.Schema;
33using System.Xml.Serialization;
34using OpenMetaverse; 29using OpenMetaverse;
35using log4net;
36 30
37namespace OpenSim.Framework 31namespace OpenSim.Framework
38{ 32{
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 122f104..7caa414 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -39,10 +39,10 @@ using System.Security.Cryptography;
39using System.Text; 39using System.Text;
40using System.Text.RegularExpressions; 40using System.Text.RegularExpressions;
41using System.Xml; 41using System.Xml;
42using OpenMetaverse;
43using log4net; 42using log4net;
44using Nini.Config; 43using Nini.Config;
45using Nwc.XmlRpc; 44using Nwc.XmlRpc;
45using OpenMetaverse;
46 46
47namespace OpenSim.Framework 47namespace OpenSim.Framework
48{ 48{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index d63933d..2a0f97d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
52 /// Handles new client connections 52 /// Handles new client connections
53 /// Constructor takes a single Packet and authenticates everything 53 /// Constructor takes a single Packet and authenticates everything
54 /// </summary> 54 /// </summary>
55 public class LLClientView : IClientAPI, IClientCore 55 public class LLClientView : IClientAPI, IClientCore, IClientIM
56 { 56 {
57 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 57 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
58 58
@@ -394,6 +394,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
394 AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP, 394 AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP,
395 ClientStackUserSettings userSettings) 395 ClientStackUserSettings userSettings)
396 { 396 {
397 // Should be called first?
398 RegisterInterfaces();
399
397 m_GroupsModule = scene.RequestModuleInterface<IGroupsModule>(); 400 m_GroupsModule = scene.RequestModuleInterface<IGroupsModule>();
398 m_moneyBalance = 1000; 401 m_moneyBalance = 1000;
399 402
@@ -1076,19 +1079,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1076 /// <summary> 1079 /// <summary>
1077 /// Send an instant message to this client 1080 /// Send an instant message to this client
1078 /// </summary> 1081 /// </summary>
1079 public void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 1082 public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp)
1080 UUID imSessionID, string fromName, byte dialog, uint timeStamp)
1081 { 1083 {
1082 SendInstantMessage( 1084 SendInstantMessage(fromAgent, message, toAgent, fromName, dialog, timeStamp, false, new byte[0]);
1083 fromAgent, fromAgentSession, message, toAgent,
1084 imSessionID, fromName, dialog, timeStamp, false, new byte[0]);
1085 } 1085 }
1086 1086
1087 /// <summary> 1087 /// <summary>
1088 /// Send an instant message to this client 1088 /// Send an instant message to this client
1089 /// </summary> 1089 /// </summary>
1090 public void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 1090 public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
1091 UUID imSessionID, string fromName, byte dialog, uint timeStamp, 1091 string fromName, byte dialog, uint timeStamp,
1092 bool fromGroup, byte[] binaryBucket) 1092 bool fromGroup, byte[] binaryBucket)
1093 { 1093 {
1094 if (((Scene)(m_scene)).ExternalChecks.ExternalChecksCanInstantMessage(fromAgent, toAgent)) 1094 if (((Scene)(m_scene)).ExternalChecks.ExternalChecksCanInstantMessage(fromAgent, toAgent))
@@ -1097,15 +1097,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1097 = (ImprovedInstantMessagePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedInstantMessage); 1097 = (ImprovedInstantMessagePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedInstantMessage);
1098 1098
1099 msg.AgentData.AgentID = fromAgent; 1099 msg.AgentData.AgentID = fromAgent;
1100 msg.AgentData.SessionID = fromAgentSession; 1100 msg.AgentData.SessionID = UUID.Zero;
1101 msg.MessageBlock.FromAgentName = Utils.StringToBytes(fromName); 1101 msg.MessageBlock.FromAgentName = Utils.StringToBytes(fromName);
1102 msg.MessageBlock.Dialog = dialog; 1102 msg.MessageBlock.Dialog = dialog;
1103 msg.MessageBlock.FromGroup = fromGroup; 1103 msg.MessageBlock.FromGroup = fromGroup;
1104 msg.MessageBlock.ID = imSessionID; 1104 msg.MessageBlock.ID = fromAgent ^ toAgent;
1105 msg.MessageBlock.Offline = 0; 1105 msg.MessageBlock.Offline = 0;
1106 msg.MessageBlock.ParentEstateID = 0; 1106 msg.MessageBlock.ParentEstateID = 0;
1107 msg.MessageBlock.Position = new Vector3(); 1107 msg.MessageBlock.Position = new Vector3();
1108 msg.MessageBlock.RegionID = UUID.Random(); 1108 msg.MessageBlock.RegionID = UUID.Zero;
1109 msg.MessageBlock.Timestamp = timeStamp; 1109 msg.MessageBlock.Timestamp = timeStamp;
1110 msg.MessageBlock.ToAgentID = toAgent; 1110 msg.MessageBlock.ToAgentID = toAgent;
1111 msg.MessageBlock.Message = Utils.StringToBytes(message); 1111 msg.MessageBlock.Message = Utils.StringToBytes(message);
@@ -6919,10 +6919,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6919 /// <param name="fromSessionID"></param> 6919 /// <param name="fromSessionID"></param>
6920 /// <param name="FromAvatarName"></param> 6920 /// <param name="FromAvatarName"></param>
6921 /// <param name="Message"></param> 6921 /// <param name="Message"></param>
6922 public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message) 6922 public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message)
6923 { 6923 {
6924 if (!ChildAgentStatus()) 6924 if (!ChildAgentStatus())
6925 SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, 1, (uint)Util.UnixTimeSinceEpoch()); 6925 SendInstantMessage(FromAvatarID, Message, AgentId, FromAvatarName, 1, (uint)Util.UnixTimeSinceEpoch());
6926 6926
6927 //SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch()); 6927 //SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch());
6928 } 6928 }
@@ -7675,6 +7675,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7675 } 7675 }
7676 } 7676 }
7677 7677
7678 protected virtual void RegisterInterfaces()
7679 {
7680 RegisterInterface<IClientIM>(this);
7681 }
7682
7678 public bool TryGet<T>(out T iface) 7683 public bool TryGet<T>(out T iface)
7679 { 7684 {
7680 if (m_clientInterfaces.ContainsKey(typeof(T))) 7685 if (m_clientInterfaces.ContainsKey(typeof(T)))
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index fc1decf..c8050da 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -819,9 +819,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
819 Hashtable retparam = new Hashtable(); 819 Hashtable retparam = new Hashtable();
820 Hashtable requestData = (Hashtable) request.Params[0]; 820 Hashtable requestData = (Hashtable) request.Params[0];
821 821
822 UUID agentId = UUID.Zero; 822 UUID agentId;
823 UUID soundId = UUID.Zero; 823 UUID soundId;
824 UUID regionId = UUID.Zero; 824 UUID regionId;
825 825
826 UUID.TryParse((string) requestData["agentId"], out agentId); 826 UUID.TryParse((string) requestData["agentId"], out agentId);
827 UUID.TryParse((string) requestData["soundId"], out soundId); 827 UUID.TryParse((string) requestData["soundId"], out soundId);
@@ -832,7 +832,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
832 Scene userScene = GetSceneByUUID(regionId); 832 Scene userScene = GetSceneByUUID(regionId);
833 if (userScene != null) 833 if (userScene != null)
834 { 834 {
835 if (userScene.RegionInfo.regionSecret.ToString() == secret) 835 if (userScene.RegionInfo.regionSecret == secret)
836 { 836 {
837 837
838 IClientAPI client = LocateClientObject(agentId); 838 IClientAPI client = LocateClientObject(agentId);
@@ -842,7 +842,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
842 if (soundId != UUID.Zero) 842 if (soundId != UUID.Zero)
843 client.SendPlayAttachedSound(soundId, UUID.Zero, UUID.Zero, 1.0f, 0); 843 client.SendPlayAttachedSound(soundId, UUID.Zero, UUID.Zero, 1.0f, 0);
844 844
845 client.SendBlueBoxMessage(UUID.Zero, UUID.Zero, "", text); 845 client.SendBlueBoxMessage(UUID.Zero, "", text);
846 846
847 retparam.Add("success", true); 847 retparam.Add("success", true);
848 } 848 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 5597381..b8fbe2b 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -155,8 +155,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
155 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 155 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
156 if (!user.IsChildAgent) 156 if (!user.IsChildAgent)
157 { 157 {
158 user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, 158 user.ControllingClient.SendInstantMessage(fromAgentID, message,
159 toAgentID, imSessionID, fromAgentName, dialog, 159 toAgentID, fromAgentName, dialog,
160 timestamp, fromGroup, binaryBucket); 160 timestamp, fromGroup, binaryBucket);
161 // Message sent 161 // Message sent
162 return; 162 return;
@@ -172,8 +172,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
172 // Local message 172 // Local message
173 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 173 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
174 174
175 user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, 175 user.ControllingClient.SendInstantMessage(fromAgentID, message,
176 toAgentID, imSessionID, fromAgentName, dialog, 176 toAgentID, fromAgentName, dialog,
177 timestamp, fromGroup, binaryBucket); 177 timestamp, fromGroup, binaryBucket);
178 // Message sent 178 // Message sent
179 return; 179 return;
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
199 if (client != null) 199 if (client != null)
200 { 200 {
201 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop) 201 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
202 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"); 202 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");
203 } 203 }
204 } 204 }
205 } 205 }
@@ -551,7 +551,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
551 if (client != null) 551 if (client != null)
552 { 552 {
553 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop) 553 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
554 client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message"); 554 client.SendInstantMessage(toAgentID, "Unable to send instant message", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());
555 } 555 }
556 return; 556 return;
557 } 557 }
@@ -562,7 +562,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
562 if (client != null) 562 if (client != null)
563 { 563 {
564 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop) 564 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
565 client.SendInstantMessage(toAgentID, fromAgentSession, "Unable to send instant message", fromAgentID, imSessionID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message"); 565 client.SendInstantMessage(toAgentID, "Unable to send instant message", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());
566 } 566 }
567 return; 567 return;
568 } 568 }
@@ -635,7 +635,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
635 if (client != null) 635 if (client != null)
636 { 636 {
637 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop) 637 if (dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.SessionDrop)
638 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"); 638 client.SendInstantMessage(toAgentID, "Unable to send instant message: Agent Offline", fromAgentID, "System", (byte)InstantMessageDialog.BusyAutoResponse, (uint)Util.UnixTimeSinceEpoch());// SendAlertMessage("Unable to send instant message");
639 } 639 }
640 } 640 }
641 } 641 }
@@ -643,7 +643,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
643 { 643 {
644 // send Agent doesn't exist message 644 // send Agent doesn't exist message
645 if (client != null) 645 if (client != null)
646 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"); 646 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");
647 } 647 }
648 648
649 } 649 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index a07fc5f..d8b203f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
135 m_pendingOffers[imSessionID] = itemId; 135 m_pendingOffers[imSessionID] = itemId;
136 136
137 user.ControllingClient.SendInstantMessage( 137 user.ControllingClient.SendInstantMessage(
138 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, 138 fromAgentID, message, toAgentID, fromAgentName,
139 dialog, timestamp, false, binaryBucket); 139 dialog, timestamp, false, binaryBucket);
140 140
141 return; 141 return;
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
167 if (!user.IsChildAgent) 167 if (!user.IsChildAgent)
168 { 168 {
169 user.ControllingClient.SendInstantMessage( 169 user.ControllingClient.SendInstantMessage(
170 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, 170 fromAgentID, message, toAgentID, fromAgentName,
171 dialog, timestamp, false, binaryBucket); 171 dialog, timestamp, false, binaryBucket);
172 172
173 if (m_pendingOffers.ContainsKey(imSessionID)) 173 if (m_pendingOffers.ContainsKey(imSessionID))
@@ -213,7 +213,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
213 if (!user.IsChildAgent) 213 if (!user.IsChildAgent)
214 { 214 {
215 user.ControllingClient.SendInstantMessage( 215 user.ControllingClient.SendInstantMessage(
216 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, 216 fromAgentID, message, toAgentID, fromAgentName,
217 dialog, timestamp, false, binaryBucket); 217 dialog, timestamp, false, binaryBucket);
218 218
219 if (m_pendingOffers.ContainsKey(imSessionID)) 219 if (m_pendingOffers.ContainsKey(imSessionID))
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 369b56c..155a01b 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -471,15 +471,14 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
471 { 471 {
472 } 472 }
473 473
474 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 474 public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp)
475 UUID imSessionID, string fromName, byte dialog, uint timeStamp)
476 { 475 {
476
477 } 477 }
478 478
479 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 479 public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, bool fromGroup, byte[] binaryBucket)
480 UUID imSessionID, string fromName, byte dialog, uint timeStamp,
481 bool fromGroup, byte[] binaryBucket)
482 { 480 {
481
483 } 482 }
484 483
485 public void SendGenericMessage(string method, List<string> message) 484 public void SendGenericMessage(string method, List<string> message)
@@ -793,7 +792,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
793 set { m_circuitCode = value; } 792 set { m_circuitCode = value; }
794 } 793 }
795 794
796 public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message) 795 public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message)
797 { 796 {
798 797
799 } 798 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 4b8df37..70ea709 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3424,7 +3424,7 @@ namespace OpenSim.Region.Environment.Scenes
3424 foreach (ScenePresence presence in presenceList) 3424 foreach (ScenePresence presence in presenceList)
3425 { 3425 {
3426 if (!presence.IsChildAgent) 3426 if (!presence.IsChildAgent)
3427 presence.ControllingClient.SendBlueBoxMessage(FromAvatarID, fromSessionID, FromAvatarName, Message); 3427 presence.ControllingClient.SendBlueBoxMessage(FromAvatarID, FromAvatarName, Message);
3428 } 3428 }
3429 } 3429 }
3430 3430
@@ -3441,7 +3441,7 @@ namespace OpenSim.Region.Environment.Scenes
3441 3441
3442 ClientManager.ForEachClient(delegate(IClientAPI controller) 3442 ClientManager.ForEachClient(delegate(IClientAPI controller)
3443 { 3443 {
3444 controller.SendBlueBoxMessage(FromAvatarID, fromSessionID, FromAvatarName, Message); 3444 controller.SendBlueBoxMessage(FromAvatarID, FromAvatarName, Message);
3445 } 3445 }
3446 ); 3446 );
3447 } 3447 }
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 0131109..85d51e6 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -383,15 +383,14 @@ namespace OpenSim.Region.Examples.SimpleModule
383 { 383 {
384 } 384 }
385 385
386 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 386 public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp)
387 UUID imSessionID, string fromName, byte dialog, uint timeStamp)
388 { 387 {
388
389 } 389 }
390 390
391 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 391 public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, bool fromGroup, byte[] binaryBucket)
392 UUID imSessionID, string fromName, byte dialog, uint timeStamp,
393 bool fromGroup, byte[] binaryBucket)
394 { 392 {
393
395 } 394 }
396 395
397 public void SendGenericMessage(string method, List<string> message) 396 public void SendGenericMessage(string method, List<string> message)
@@ -780,7 +779,7 @@ namespace OpenSim.Region.Examples.SimpleModule
780 set { m_circuitCode = value; } 779 set { m_circuitCode = value; }
781 } 780 }
782 781
783 public void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message) 782 public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message)
784 { 783 {
785 784
786 } 785 }