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/ScenePresence.cs | |
parent | * minor: add interface version to 'show version' command output (diff) | |
download | opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.zip opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.gz opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.bz2 opensim-SC-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 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 935c51b..3c51aa6 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Region.Environment.Interfaces; | |||
39 | using OpenSim.Region.Environment.Types; | 39 | using OpenSim.Region.Environment.Types; |
40 | using OpenSim.Region.Interfaces; | 40 | using OpenSim.Region.Interfaces; |
41 | using OpenSim.Region.Physics.Manager; | 41 | using OpenSim.Region.Physics.Manager; |
42 | using LLSD = OpenMetaverse.StructuredData.LLSD; | 42 | using OSD = OpenMetaverse.StructuredData.OSD; |
43 | 43 | ||
44 | 44 | ||
45 | namespace OpenSim.Region.Environment.Scenes | 45 | namespace OpenSim.Region.Environment.Scenes |
@@ -2170,7 +2170,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2170 | } | 2170 | } |
2171 | 2171 | ||
2172 | Vector3 vel = m_velocity; | 2172 | Vector3 vel = m_velocity; |
2173 | ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); | 2173 | ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); |
2174 | SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle); | 2174 | SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle); |
2175 | if (neighbourRegion != null && ValidateAttachments()) | 2175 | if (neighbourRegion != null && ValidateAttachments()) |
2176 | { | 2176 | { |
@@ -2208,7 +2208,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2208 | if (eq != null) | 2208 | if (eq != null) |
2209 | { | 2209 | { |
2210 | 2210 | ||
2211 | LLSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, | 2211 | OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, |
2212 | capsPath, UUID, ControllingClient.SessionId); | 2212 | capsPath, UUID, ControllingClient.SessionId); |
2213 | eq.Enqueue(Item, UUID); | 2213 | eq.Enqueue(Item, UUID); |
2214 | } | 2214 | } |