diff options
| author | diva | 2008-12-15 00:06:52 +0000 |
|---|---|---|
| committer | diva | 2008-12-15 00:06:52 +0000 |
| commit | d6d4c267e0014f8c9f8f49fd9c332aa93504f3d4 (patch) | |
| tree | 5830159c4e55341642a528e94cc0a57a82dbb368 /OpenSim/Region | |
| parent | Make scripted item and folder gives pop up a "accept, decline" message (diff) | |
| download | opensim-SC-d6d4c267e0014f8c9f8f49fd9c332aa93504f3d4.zip opensim-SC-d6d4c267e0014f8c9f8f49fd9c332aa93504f3d4.tar.gz opensim-SC-d6d4c267e0014f8c9f8f49fd9c332aa93504f3d4.tar.bz2 opensim-SC-d6d4c267e0014f8c9f8f49fd9c332aa93504f3d4.tar.xz | |
Bug fix for Hypergrid. This bug was introduced by the recent TP fixes, and affected the jump back home.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs index 4e94c52..9e23831 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | |||
| @@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid | |||
| 174 | agent.InventoryFolder = UUID.Zero; | 174 | agent.InventoryFolder = UUID.Zero; |
| 175 | agent.startpos = position; | 175 | agent.startpos = position; |
| 176 | agent.child = true; | 176 | agent.child = true; |
| 177 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) | 177 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) |
| 178 | { | 178 | { |
| 179 | // brand new agent | 179 | // brand new agent |
| 180 | agent.CapsPath = Util.GetRandomCapsPath(); | 180 | agent.CapsPath = Util.GetRandomCapsPath(); |
| @@ -210,16 +210,19 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid | |||
| 210 | // TODO: make Event Queue disablable! | 210 | // TODO: make Event Queue disablable! |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | if (!m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, | 213 | m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, |
| 214 | position, false)) | 214 | position, false); |
| 215 | { | 215 | |
| 216 | avatar.ControllingClient.SendTeleportFailed("Problem with destination."); | 216 | //if (!m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, |
| 217 | // We should close that agent we just created over at destination... | 217 | // position, false)) |
| 218 | List<ulong> lst = new List<ulong>(); | 218 | //{ |
| 219 | lst.Add(reg.RegionHandle); | 219 | // avatar.ControllingClient.SendTeleportFailed("Problem with destination."); |
| 220 | SendCloseChildAgentAsync(avatar.UUID, lst); | 220 | // // We should close that agent we just created over at destination... |
| 221 | return; | 221 | // List<ulong> lst = new List<ulong>(); |
| 222 | } | 222 | // lst.Add(realHandle); |
| 223 | // SendCloseChildAgentAsync(avatar.UUID, lst); | ||
| 224 | // return; | ||
| 225 | //} | ||
| 223 | 226 | ||
| 224 | Thread.Sleep(2000); | 227 | Thread.Sleep(2000); |
| 225 | 228 | ||