diff options
| author | Dahlia Trimble | 2009-01-30 08:52:45 +0000 |
|---|---|---|
| committer | Dahlia Trimble | 2009-01-30 08:52:45 +0000 |
| commit | 7e17cec182a793b231c636115640f27ff1cffe00 (patch) | |
| tree | b11465f173183af4939616d776316f5f0548899f | |
| parent | (no commit message) (diff) | |
| download | opensim-SC-7e17cec182a793b231c636115640f27ff1cffe00.zip opensim-SC-7e17cec182a793b231c636115640f27ff1cffe00.tar.gz opensim-SC-7e17cec182a793b231c636115640f27ff1cffe00.tar.bz2 opensim-SC-7e17cec182a793b231c636115640f27ff1cffe00.tar.xz | |
remove dummy parcel media settings from event queue message
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs | 27 |
1 files 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 d543450..15ed096 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 | |||
| 327 | ageVerificationBlock.Add(ageVerificationMap); | 327 | ageVerificationBlock.Add(ageVerificationMap); |
| 328 | body.Add("AgeVerificationBlock", ageVerificationBlock); | 328 | body.Add("AgeVerificationBlock", ageVerificationBlock); |
| 329 | 329 | ||
| 330 | OSDArray mediaData = new OSDArray(); | 330 | // LL sims send media info in this event queue message but it's not in the UDP |
| 331 | OSDMap mediaDataMap = new OSDMap(); | 331 | // packet we construct this event queue message from. This should be refactored in |
| 332 | mediaDataMap.Add("MediaDesc", OSD.FromString("")); | 332 | // other areas of the code so it can all be send in the same message. Until then we will |
| 333 | mediaDataMap.Add("MediaHeight", OSD.FromInteger(0)); | 333 | // still send the media info via UDP |
| 334 | mediaDataMap.Add("MediaLoop", OSD.FromInteger(0)); | 334 | |
| 335 | mediaDataMap.Add("MediaType", OSD.FromString("type/type")); | 335 | //OSDArray mediaData = new OSDArray(); |
| 336 | mediaDataMap.Add("MediaWidth", OSD.FromInteger(0)); | 336 | //OSDMap mediaDataMap = new OSDMap(); |
| 337 | mediaDataMap.Add("ObscureMedia", OSD.FromInteger(0)); | 337 | //mediaDataMap.Add("MediaDesc", OSD.FromString("")); |
| 338 | mediaDataMap.Add("ObscureMusic", OSD.FromInteger(0)); | 338 | //mediaDataMap.Add("MediaHeight", OSD.FromInteger(0)); |
| 339 | mediaData.Add(mediaDataMap); | 339 | //mediaDataMap.Add("MediaLoop", OSD.FromInteger(0)); |
| 340 | body.Add("MediaData", mediaData); | 340 | //mediaDataMap.Add("MediaType", OSD.FromString("type/type")); |
| 341 | //mediaDataMap.Add("MediaWidth", OSD.FromInteger(0)); | ||
| 342 | //mediaDataMap.Add("ObscureMedia", OSD.FromInteger(0)); | ||
| 343 | //mediaDataMap.Add("ObscureMusic", OSD.FromInteger(0)); | ||
| 344 | //mediaData.Add(mediaDataMap); | ||
| 345 | //body.Add("MediaData", mediaData); | ||
| 341 | 346 | ||
| 342 | OSDArray parcelData = new OSDArray(); | 347 | OSDArray parcelData = new OSDArray(); |
| 343 | OSDMap parcelDataMap = new OSDMap(); | 348 | OSDMap parcelDataMap = new OSDMap(); |