From c25a0ea7923aa390d30b8eebdbca4e599edf9b0d Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 17 Nov 2008 21:00:34 +0000 Subject: * Update libOMV to r2359. This is necessary for the progressive texture patch * Update libopenjpeg as well for this patch. * Appears to be okay on a very short sniff test * Source code will be placed in opensim-libs shortly --- OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs') diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 3948d31..8167c68 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -36,7 +36,7 @@ using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Region.Interfaces; -using LLSD = OpenMetaverse.StructuredData.LLSD; +using OSD = OpenMetaverse.StructuredData.OSD; namespace OpenSim.Region.Environment.Scenes { @@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment.Scenes IEventQueue eq = avatar.Scene.RequestModuleInterface(); if (eq != null) { - LLSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint); + OSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint); eq.Enqueue(Item, avatar.UUID); } else @@ -698,7 +698,7 @@ namespace OpenSim.Region.Environment.Scenes if (eq != null) { - LLSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, reg.ExternalEndPoint, + OSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, reg.ExternalEndPoint, 4, teleportFlags, capsPath, avatar.UUID); eq.Enqueue(Item, avatar.UUID); } @@ -748,7 +748,7 @@ namespace OpenSim.Region.Environment.Scenes // and set the map-tile to '(Offline)' uint regX, regY; - Helpers.LongToUInts(regionHandle, out regX, out regY); + Utils.LongToUInts(regionHandle, out regX, out regY); MapBlockData block = new MapBlockData(); block.X = (ushort)(regX / Constants.RegionSize); -- cgit v1.1