aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs22
1 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 6dc6f01..4e2a0b7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -40,11 +40,10 @@ using OpenMetaverse.Packets;
40using OpenMetaverse.StructuredData; 40using OpenMetaverse.StructuredData;
41using OpenSim.Framework; 41using OpenSim.Framework;
42using OpenSim.Framework.Client; 42using OpenSim.Framework.Client;
43using OpenSim.Framework.Communications.Cache; 43
44using OpenSim.Framework.Statistics; 44using OpenSim.Framework.Statistics;
45using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Framework.Scenes.Hypergrid;
48using OpenSim.Services.Interfaces; 47using OpenSim.Services.Interfaces;
49using Timer = System.Timers.Timer; 48using Timer = System.Timers.Timer;
50using AssetLandmark = OpenSim.Framework.AssetLandmark; 49using AssetLandmark = OpenSim.Framework.AssetLandmark;
@@ -351,6 +350,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
351 private bool m_SendLogoutPacketWhenClosing = true; 350 private bool m_SendLogoutPacketWhenClosing = true;
352 private AgentUpdateArgs lastarg; 351 private AgentUpdateArgs lastarg;
353 private bool m_IsActive = true; 352 private bool m_IsActive = true;
353 private bool m_IsLoggingOut = false;
354 354
355 protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>(); 355 protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>();
356 protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers 356 protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers
@@ -414,6 +414,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
414 get { return m_IsActive; } 414 get { return m_IsActive; }
415 set { m_IsActive = value; } 415 set { m_IsActive = value; }
416 } 416 }
417 public bool IsLoggingOut
418 {
419 get { return m_IsLoggingOut; }
420 set { m_IsLoggingOut = value; }
421 }
422
417 public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } 423 public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
418 424
419 #endregion Properties 425 #endregion Properties
@@ -4063,10 +4069,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4063 EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); 4069 EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
4064 edata.CovenantID = covenant; 4070 edata.CovenantID = covenant;
4065 edata.CovenantTimestamp = 0; 4071 edata.CovenantTimestamp = 0;
4066 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 4072 edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
4067 edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
4068 else
4069 edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
4070 edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); 4073 edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName);
4071 einfopack.Data = edata; 4074 einfopack.Data = edata;
4072 OutPacket(einfopack, ThrottleOutPacketType.Task); 4075 OutPacket(einfopack, ThrottleOutPacketType.Task);
@@ -4087,8 +4090,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4087 4090
4088 //Sending Estate Settings 4091 //Sending Estate Settings
4089 returnblock[0].Parameter = Utils.StringToBytes(estateName); 4092 returnblock[0].Parameter = Utils.StringToBytes(estateName);
4090 // TODO: remove this cruft once MasterAvatar is fully deprecated
4091 //
4092 returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); 4093 returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString());
4093 returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); 4094 returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString());
4094 4095
@@ -5514,6 +5515,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5514 // for the client session anyway, in order to protect ourselves against bad code in plugins 5515 // for the client session anyway, in order to protect ourselves against bad code in plugins
5515 try 5516 try
5516 { 5517 {
5518
5517 byte[] visualparams = new byte[appear.VisualParam.Length]; 5519 byte[] visualparams = new byte[appear.VisualParam.Length];
5518 for (int i = 0; i < appear.VisualParam.Length; i++) 5520 for (int i = 0; i < appear.VisualParam.Length; i++)
5519 visualparams[i] = appear.VisualParam[i].ParamValue; 5521 visualparams[i] = appear.VisualParam[i].ParamValue;
@@ -6997,7 +6999,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6997 assetRequestItem = invService.GetItem(assetRequestItem); 6999 assetRequestItem = invService.GetItem(assetRequestItem);
6998 if (assetRequestItem == null) 7000 if (assetRequestItem == null)
6999 { 7001 {
7000 assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); 7002 ILibraryService lib = m_scene.RequestModuleInterface<ILibraryService>();
7003 if (lib != null)
7004 assetRequestItem = lib.LibraryRootFolder.FindItem(itemID);
7001 if (assetRequestItem == null) 7005 if (assetRequestItem == null)
7002 return true; 7006 return true;
7003 } 7007 }