From 7e17cec182a793b231c636115640f27ff1cffe00 Mon Sep 17 00:00:00 2001 From: Dahlia Trimble Date: Fri, 30 Jan 2009 08:52:45 +0000 Subject: [PATCH] remove dummy parcel media settings from event queue message --- .../Framework/EventQueue/EventQueueHelper.cs | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs index d543450a31..15ed096de7 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs @@ -327,17 +327,22 @@ namespace OpenSim.Region.Environment ageVerificationBlock.Add(ageVerificationMap); body.Add("AgeVerificationBlock", ageVerificationBlock); - OSDArray mediaData = new OSDArray(); - OSDMap mediaDataMap = new OSDMap(); - mediaDataMap.Add("MediaDesc", OSD.FromString("")); - mediaDataMap.Add("MediaHeight", OSD.FromInteger(0)); - mediaDataMap.Add("MediaLoop", OSD.FromInteger(0)); - mediaDataMap.Add("MediaType", OSD.FromString("type/type")); - mediaDataMap.Add("MediaWidth", OSD.FromInteger(0)); - mediaDataMap.Add("ObscureMedia", OSD.FromInteger(0)); - mediaDataMap.Add("ObscureMusic", OSD.FromInteger(0)); - mediaData.Add(mediaDataMap); - body.Add("MediaData", mediaData); + // LL sims send media info in this event queue message but it's not in the UDP + // packet we construct this event queue message from. This should be refactored in + // other areas of the code so it can all be send in the same message. Until then we will + // still send the media info via UDP + + //OSDArray mediaData = new OSDArray(); + //OSDMap mediaDataMap = new OSDMap(); + //mediaDataMap.Add("MediaDesc", OSD.FromString("")); + //mediaDataMap.Add("MediaHeight", OSD.FromInteger(0)); + //mediaDataMap.Add("MediaLoop", OSD.FromInteger(0)); + //mediaDataMap.Add("MediaType", OSD.FromString("type/type")); + //mediaDataMap.Add("MediaWidth", OSD.FromInteger(0)); + //mediaDataMap.Add("ObscureMedia", OSD.FromInteger(0)); + //mediaDataMap.Add("ObscureMusic", OSD.FromInteger(0)); + //mediaData.Add(mediaDataMap); + //body.Add("MediaData", mediaData); OSDArray parcelData = new OSDArray(); OSDMap parcelDataMap = new OSDMap();