diff options
author | Diva Canto | 2010-05-05 16:54:48 -0700 |
---|---|---|
committer | Diva Canto | 2010-05-05 16:54:48 -0700 |
commit | ebc3726d52c772962cfa551721168079d5d563d2 (patch) | |
tree | 69bfd8d39e32a3fabb0709c5f05343554c2c357e /OpenSim/Region/CoreModules | |
parent | Stab a test fail (diff) | |
download | opensim-SC-ebc3726d52c772962cfa551721168079d5d563d2.zip opensim-SC-ebc3726d52c772962cfa551721168079d5d563d2.tar.gz opensim-SC-ebc3726d52c772962cfa551721168079d5d563d2.tar.bz2 opensim-SC-ebc3726d52c772962cfa551721168079d5d563d2.tar.xz |
Added copying of Viewer field to the agent circuit data that is being passed on TPs and crossings.
(XmlRpcGroups files want to be committed too)
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 80c0af8..f2b03e4 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -290,7 +290,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
290 | agentCircuit.child = true; | 290 | agentCircuit.child = true; |
291 | agentCircuit.Appearance = sp.Appearance; | 291 | agentCircuit.Appearance = sp.Appearance; |
292 | if (currentAgentCircuit != null) | 292 | if (currentAgentCircuit != null) |
293 | { | ||
293 | agentCircuit.ServiceURLs = currentAgentCircuit.ServiceURLs; | 294 | agentCircuit.ServiceURLs = currentAgentCircuit.ServiceURLs; |
295 | agentCircuit.Viewer = currentAgentCircuit.Viewer; | ||
296 | } | ||
294 | 297 | ||
295 | if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY)) | 298 | if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY)) |
296 | { | 299 | { |
@@ -986,7 +989,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
986 | agent.child = true; | 989 | agent.child = true; |
987 | agent.Appearance = sp.Appearance; | 990 | agent.Appearance = sp.Appearance; |
988 | if (currentAgentCircuit != null) | 991 | if (currentAgentCircuit != null) |
992 | { | ||
989 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; | 993 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; |
994 | agent.Viewer = currentAgentCircuit.Viewer; | ||
995 | } | ||
990 | 996 | ||
991 | if (newRegions.Contains(neighbour.RegionHandle)) | 997 | if (newRegions.Contains(neighbour.RegionHandle)) |
992 | { | 998 | { |