diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index a785e64..3b8b48f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -33,17 +33,16 @@ using System.Text; | |||
33 | using System.Threading; | 33 | using System.Threading; |
34 | using System.Timers; | 34 | using System.Timers; |
35 | using System.Xml; | 35 | using System.Xml; |
36 | using log4net; | ||
36 | using OpenMetaverse; | 37 | using OpenMetaverse; |
37 | using OpenMetaverse.Packets; | 38 | using OpenMetaverse.Packets; |
38 | using OpenMetaverse.StructuredData; | ||
39 | using log4net; | ||
40 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
41 | using OpenSim.Framework.Client; | 40 | using OpenSim.Framework.Client; |
42 | using OpenSim.Framework.Communications.Cache; | 41 | using OpenSim.Framework.Communications.Cache; |
43 | using OpenSim.Framework.Statistics; | 42 | using OpenSim.Framework.Statistics; |
44 | using OpenSim.Region.Framework.Interfaces; | 43 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Region.Framework.Scenes; | 44 | using OpenSim.Region.Framework.Scenes; |
46 | using Timer = System.Timers.Timer; | 45 | using Timer=System.Timers.Timer; |
47 | 46 | ||
48 | namespace OpenSim.Region.ClientStack.LindenUDP | 47 | namespace OpenSim.Region.ClientStack.LindenUDP |
49 | { | 48 | { |
@@ -474,7 +473,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
474 | m_PacketHandler.OnPacketStats += PopulateStats; | 473 | m_PacketHandler.OnPacketStats += PopulateStats; |
475 | 474 | ||
476 | RegisterLocalPacketHandlers(); | 475 | RegisterLocalPacketHandlers(); |
477 | m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Framework.Interfaces.IJ2KDecoder>()); | 476 | m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<IJ2KDecoder>()); |
478 | } | 477 | } |
479 | 478 | ||
480 | public void SetDebugPacketLevel(int newDebugPacketLevel) | 479 | public void SetDebugPacketLevel(int newDebugPacketLevel) |
@@ -1230,7 +1229,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1230 | fromAgent, toAgent, false, false, false); | 1229 | fromAgent, toAgent, false, false, false); |
1231 | } | 1230 | } |
1232 | 1231 | ||
1233 | System.Console.WriteLine("SendInstantMessage: " + msg); | 1232 | Console.WriteLine("SendInstantMessage: " + msg); |
1234 | } | 1233 | } |
1235 | else | 1234 | else |
1236 | OutPacket(msg, ThrottleOutPacketType.Task); | 1235 | OutPacket(msg, ThrottleOutPacketType.Task); |
@@ -6857,15 +6856,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6857 | groupTitlesRequest.AgentData.GroupID); | 6856 | groupTitlesRequest.AgentData.GroupID); |
6858 | 6857 | ||
6859 | groupTitlesReply.GroupData = | 6858 | groupTitlesReply.GroupData = |
6860 | new GroupTitlesReplyPacket. | 6859 | new GroupTitlesReplyPacket.GroupDataBlock[titles.Count]; |
6861 | GroupDataBlock[titles.Count]; | ||
6862 | 6860 | ||
6863 | int i = 0; | 6861 | int i = 0; |
6864 | foreach (GroupTitlesData d in titles) | 6862 | foreach (GroupTitlesData d in titles) |
6865 | { | 6863 | { |
6866 | groupTitlesReply.GroupData[i] = | 6864 | groupTitlesReply.GroupData[i] = |
6867 | new GroupTitlesReplyPacket. | 6865 | new GroupTitlesReplyPacket.GroupDataBlock(); |
6868 | GroupDataBlock(); | ||
6869 | 6866 | ||
6870 | groupTitlesReply.GroupData[i].Title = | 6867 | groupTitlesReply.GroupData[i].Title = |
6871 | Utils.StringToBytes(d.Name); | 6868 | Utils.StringToBytes(d.Name); |
@@ -6980,8 +6977,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6980 | groupRolesReply.AgentData.AgentID = AgentId; | 6977 | groupRolesReply.AgentData.AgentID = AgentId; |
6981 | 6978 | ||
6982 | groupRolesReply.GroupData = | 6979 | groupRolesReply.GroupData = |
6983 | new GroupRoleDataReplyPacket. | 6980 | new GroupRoleDataReplyPacket.GroupDataBlock(); |
6984 | GroupDataBlock(); | ||
6985 | 6981 | ||
6986 | groupRolesReply.GroupData.GroupID = | 6982 | groupRolesReply.GroupData.GroupID = |
6987 | groupRolesRequest.GroupData.GroupID; | 6983 | groupRolesRequest.GroupData.GroupID; |
@@ -6997,15 +6993,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6997 | titles.Count; | 6993 | titles.Count; |
6998 | 6994 | ||
6999 | groupRolesReply.RoleData = | 6995 | groupRolesReply.RoleData = |
7000 | new GroupRoleDataReplyPacket. | 6996 | new GroupRoleDataReplyPacket.RoleDataBlock[titles.Count]; |
7001 | RoleDataBlock[titles.Count]; | ||
7002 | 6997 | ||
7003 | int i = 0; | 6998 | int i = 0; |
7004 | foreach (GroupRolesData d in titles) | 6999 | foreach (GroupRolesData d in titles) |
7005 | { | 7000 | { |
7006 | groupRolesReply.RoleData[i] = | 7001 | groupRolesReply.RoleData[i] = |
7007 | new GroupRoleDataReplyPacket. | 7002 | new GroupRoleDataReplyPacket.RoleDataBlock(); |
7008 | RoleDataBlock(); | ||
7009 | 7003 | ||
7010 | groupRolesReply.RoleData[i].RoleID = | 7004 | groupRolesReply.RoleData[i].RoleID = |
7011 | d.RoleID; | 7005 | d.RoleID; |
@@ -7051,15 +7045,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7051 | (uint)mappings.Count; | 7045 | (uint)mappings.Count; |
7052 | 7046 | ||
7053 | groupRoleMembersReply.MemberData = | 7047 | groupRoleMembersReply.MemberData = |
7054 | new GroupRoleMembersReplyPacket. | 7048 | new GroupRoleMembersReplyPacket.MemberDataBlock[mappings.Count]; |
7055 | MemberDataBlock[mappings.Count]; | ||
7056 | 7049 | ||
7057 | int i = 0; | 7050 | int i = 0; |
7058 | foreach (GroupRoleMembersData d in mappings) | 7051 | foreach (GroupRoleMembersData d in mappings) |
7059 | { | 7052 | { |
7060 | groupRoleMembersReply.MemberData[i] = | 7053 | groupRoleMembersReply.MemberData[i] = |
7061 | new GroupRoleMembersReplyPacket. | 7054 | new GroupRoleMembersReplyPacket.MemberDataBlock(); |
7062 | MemberDataBlock(); | ||
7063 | 7055 | ||
7064 | groupRoleMembersReply.MemberData[i].RoleID = | 7056 | groupRoleMembersReply.MemberData[i].RoleID = |
7065 | d.RoleID; | 7057 | d.RoleID; |