diff options
author | Justin Clarke Casey | 2008-11-17 21:00:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-17 21:00:34 +0000 |
commit | c25a0ea7923aa390d30b8eebdbca4e599edf9b0d (patch) | |
tree | 775133790681153be9edc6d640162271750a1fd0 /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |
parent | * minor: add interface version to 'show version' command output (diff) | |
download | opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.zip opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.gz opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.bz2 opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.xz |
* 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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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; | |||
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications; | 37 | using OpenSim.Framework.Communications; |
38 | using OpenSim.Region.Interfaces; | 38 | using OpenSim.Region.Interfaces; |
39 | using LLSD = OpenMetaverse.StructuredData.LLSD; | 39 | using OSD = OpenMetaverse.StructuredData.OSD; |
40 | 40 | ||
41 | namespace OpenSim.Region.Environment.Scenes | 41 | namespace OpenSim.Region.Environment.Scenes |
42 | { | 42 | { |
@@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
284 | IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); | 284 | IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); |
285 | if (eq != null) | 285 | if (eq != null) |
286 | { | 286 | { |
287 | LLSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint); | 287 | OSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint); |
288 | eq.Enqueue(Item, avatar.UUID); | 288 | eq.Enqueue(Item, avatar.UUID); |
289 | } | 289 | } |
290 | else | 290 | else |
@@ -698,7 +698,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
698 | 698 | ||
699 | if (eq != null) | 699 | if (eq != null) |
700 | { | 700 | { |
701 | LLSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, reg.ExternalEndPoint, | 701 | OSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, reg.ExternalEndPoint, |
702 | 4, teleportFlags, capsPath, avatar.UUID); | 702 | 4, teleportFlags, capsPath, avatar.UUID); |
703 | eq.Enqueue(Item, avatar.UUID); | 703 | eq.Enqueue(Item, avatar.UUID); |
704 | } | 704 | } |
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
748 | 748 | ||
749 | // and set the map-tile to '(Offline)' | 749 | // and set the map-tile to '(Offline)' |
750 | uint regX, regY; | 750 | uint regX, regY; |
751 | Helpers.LongToUInts(regionHandle, out regX, out regY); | 751 | Utils.LongToUInts(regionHandle, out regX, out regY); |
752 | 752 | ||
753 | MapBlockData block = new MapBlockData(); | 753 | MapBlockData block = new MapBlockData(); |
754 | block.X = (ushort)(regX / Constants.RegionSize); | 754 | block.X = (ushort)(regX / Constants.RegionSize); |