diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 515d0ea..ae0bd79 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -40,7 +40,7 @@ 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; |
@@ -4045,10 +4045,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4045 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); | 4045 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); |
4046 | edata.CovenantID = covenant; | 4046 | edata.CovenantID = covenant; |
4047 | edata.CovenantTimestamp = 0; | 4047 | edata.CovenantTimestamp = 0; |
4048 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 4048 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
4049 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
4050 | else | ||
4051 | edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
4052 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); | 4049 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); |
4053 | einfopack.Data = edata; | 4050 | einfopack.Data = edata; |
4054 | OutPacket(einfopack, ThrottleOutPacketType.Task); | 4051 | OutPacket(einfopack, ThrottleOutPacketType.Task); |
@@ -4069,8 +4066,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4069 | 4066 | ||
4070 | //Sending Estate Settings | 4067 | //Sending Estate Settings |
4071 | returnblock[0].Parameter = Utils.StringToBytes(estateName); | 4068 | returnblock[0].Parameter = Utils.StringToBytes(estateName); |
4072 | // TODO: remove this cruft once MasterAvatar is fully deprecated | ||
4073 | // | ||
4074 | returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); | 4069 | returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); |
4075 | returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); | 4070 | returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); |
4076 | 4071 | ||
@@ -5494,6 +5489,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5494 | // for the client session anyway, in order to protect ourselves against bad code in plugins | 5489 | // for the client session anyway, in order to protect ourselves against bad code in plugins |
5495 | try | 5490 | try |
5496 | { | 5491 | { |
5492 | |||
5497 | byte[] visualparams = new byte[appear.VisualParam.Length]; | 5493 | byte[] visualparams = new byte[appear.VisualParam.Length]; |
5498 | for (int i = 0; i < appear.VisualParam.Length; i++) | 5494 | for (int i = 0; i < appear.VisualParam.Length; i++) |
5499 | visualparams[i] = appear.VisualParam[i].ParamValue; | 5495 | visualparams[i] = appear.VisualParam[i].ParamValue; |
@@ -6977,7 +6973,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6977 | assetRequestItem = invService.GetItem(assetRequestItem); | 6973 | assetRequestItem = invService.GetItem(assetRequestItem); |
6978 | if (assetRequestItem == null) | 6974 | if (assetRequestItem == null) |
6979 | { | 6975 | { |
6980 | assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); | 6976 | ILibraryService lib = m_scene.RequestModuleInterface<ILibraryService>(); |
6977 | if (lib != null) | ||
6978 | assetRequestItem = lib.LibraryRootFolder.FindItem(itemID); | ||
6981 | if (assetRequestItem == null) | 6979 | if (assetRequestItem == null) |
6982 | return true; | 6980 | return true; |
6983 | } | 6981 | } |