diff options
author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
download | opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz |
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to '')
-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 19f0f9c..19532e6 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 OSD = OpenMetaverse.StructuredData.OSD; | 42 | using LLSD = OpenMetaverse.StructuredData.LLSD; |
43 | 43 | ||
44 | 44 | ||
45 | namespace OpenSim.Region.Environment.Scenes | 45 | namespace OpenSim.Region.Environment.Scenes |
@@ -2171,7 +2171,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2171 | } | 2171 | } |
2172 | 2172 | ||
2173 | Vector3 vel = m_velocity; | 2173 | Vector3 vel = m_velocity; |
2174 | ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); | 2174 | ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); |
2175 | SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle); | 2175 | SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle); |
2176 | if (neighbourRegion != null && ValidateAttachments()) | 2176 | if (neighbourRegion != null && ValidateAttachments()) |
2177 | { | 2177 | { |
@@ -2209,7 +2209,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2209 | if (eq != null) | 2209 | if (eq != null) |
2210 | { | 2210 | { |
2211 | 2211 | ||
2212 | OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, | 2212 | LLSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, |
2213 | capsPath, UUID, ControllingClient.SessionId); | 2213 | capsPath, UUID, ControllingClient.SessionId); |
2214 | eq.Enqueue(Item, UUID); | 2214 | eq.Enqueue(Item, UUID); |
2215 | } | 2215 | } |