diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 9fe61a7..0df1748 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -40,11 +40,10 @@ using OpenMetaverse.Packets; | |||
40 | using OpenMetaverse.StructuredData; | 40 | using OpenMetaverse.StructuredData; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
42 | using OpenSim.Framework.Client; | 42 | using OpenSim.Framework.Client; |
43 | using OpenSim.Framework.Communications.Cache; | 43 | |
44 | using OpenSim.Framework.Statistics; | 44 | using OpenSim.Framework.Statistics; |
45 | using OpenSim.Region.Framework.Interfaces; | 45 | using OpenSim.Region.Framework.Interfaces; |
46 | using OpenSim.Region.Framework.Scenes; | 46 | using OpenSim.Region.Framework.Scenes; |
47 | using OpenSim.Region.Framework.Scenes.Hypergrid; | ||
48 | using OpenSim.Services.Interfaces; | 47 | using OpenSim.Services.Interfaces; |
49 | using Timer = System.Timers.Timer; | 48 | using Timer = System.Timers.Timer; |
50 | using AssetLandmark = OpenSim.Framework.AssetLandmark; | 49 | using AssetLandmark = OpenSim.Framework.AssetLandmark; |
@@ -353,6 +352,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
353 | private bool m_SendLogoutPacketWhenClosing = true; | 352 | private bool m_SendLogoutPacketWhenClosing = true; |
354 | private AgentUpdateArgs lastarg; | 353 | private AgentUpdateArgs lastarg; |
355 | private bool m_IsActive = true; | 354 | private bool m_IsActive = true; |
355 | private bool m_IsLoggingOut = false; | ||
356 | 356 | ||
357 | protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>(); | 357 | protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>(); |
358 | protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers | 358 | protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers |
@@ -416,6 +416,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
416 | get { return m_IsActive; } | 416 | get { return m_IsActive; } |
417 | set { m_IsActive = value; } | 417 | set { m_IsActive = value; } |
418 | } | 418 | } |
419 | public bool IsLoggingOut | ||
420 | { | ||
421 | get { return m_IsLoggingOut; } | ||
422 | set { m_IsLoggingOut = value; } | ||
423 | } | ||
424 | |||
419 | public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } | 425 | public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } |
420 | 426 | ||
421 | #endregion Properties | 427 | #endregion Properties |
@@ -4065,10 +4071,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4065 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); | 4071 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); |
4066 | edata.CovenantID = covenant; | 4072 | edata.CovenantID = covenant; |
4067 | edata.CovenantTimestamp = 0; | 4073 | edata.CovenantTimestamp = 0; |
4068 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 4074 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
4069 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
4070 | else | ||
4071 | edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
4072 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); | 4075 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); |
4073 | einfopack.Data = edata; | 4076 | einfopack.Data = edata; |
4074 | OutPacket(einfopack, ThrottleOutPacketType.Task); | 4077 | OutPacket(einfopack, ThrottleOutPacketType.Task); |
@@ -4089,8 +4092,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4089 | 4092 | ||
4090 | //Sending Estate Settings | 4093 | //Sending Estate Settings |
4091 | returnblock[0].Parameter = Utils.StringToBytes(estateName); | 4094 | returnblock[0].Parameter = Utils.StringToBytes(estateName); |
4092 | // TODO: remove this cruft once MasterAvatar is fully deprecated | ||
4093 | // | ||
4094 | returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); | 4095 | returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); |
4095 | returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); | 4096 | returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); |
4096 | 4097 | ||
@@ -5518,6 +5519,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5518 | // for the client session anyway, in order to protect ourselves against bad code in plugins | 5519 | // for the client session anyway, in order to protect ourselves against bad code in plugins |
5519 | try | 5520 | try |
5520 | { | 5521 | { |
5522 | |||
5521 | byte[] visualparams = new byte[appear.VisualParam.Length]; | 5523 | byte[] visualparams = new byte[appear.VisualParam.Length]; |
5522 | for (int i = 0; i < appear.VisualParam.Length; i++) | 5524 | for (int i = 0; i < appear.VisualParam.Length; i++) |
5523 | visualparams[i] = appear.VisualParam[i].ParamValue; | 5525 | visualparams[i] = appear.VisualParam[i].ParamValue; |
@@ -7051,7 +7053,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7051 | assetRequestItem = invService.GetItem(assetRequestItem); | 7053 | assetRequestItem = invService.GetItem(assetRequestItem); |
7052 | if (assetRequestItem == null) | 7054 | if (assetRequestItem == null) |
7053 | { | 7055 | { |
7054 | assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); | 7056 | ILibraryService lib = m_scene.RequestModuleInterface<ILibraryService>(); |
7057 | if (lib != null) | ||
7058 | assetRequestItem = lib.LibraryRootFolder.FindItem(itemID); | ||
7055 | if (assetRequestItem == null) | 7059 | if (assetRequestItem == null) |
7056 | return true; | 7060 | return true; |
7057 | } | 7061 | } |