aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2010-01-13 09:34:08 -0800
committerDiva Canto2010-01-13 09:34:08 -0800
commit4de82891a9c1219fd798fc005f5dea4dc7ea13f2 (patch)
tree23d8af3f3d5f08cc7752116b051ea229cbbc5ac6 /OpenSim/Region
parentSeveral more buglets removed. (diff)
downloadopensim-SC-4de82891a9c1219fd798fc005f5dea4dc7ea13f2.zip
opensim-SC-4de82891a9c1219fd798fc005f5dea4dc7ea13f2.tar.gz
opensim-SC-4de82891a9c1219fd798fc005f5dea4dc7ea13f2.tar.bz2
opensim-SC-4de82891a9c1219fd798fc005f5dea4dc7ea13f2.tar.xz
Bug in Teleport fixed -- Appearance was missing from AgentCircuitData.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs1
2 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index e7a97f1..2821be2 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -189,6 +189,8 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
189 agentCircuit.InventoryFolder = UUID.Zero; 189 agentCircuit.InventoryFolder = UUID.Zero;
190 agentCircuit.startpos = position; 190 agentCircuit.startpos = position;
191 agentCircuit.child = true; 191 agentCircuit.child = true;
192 agentCircuit.Appearance = avatar.Appearance;
193
192 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) 194 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
193 { 195 {
194 // brand new agent, let's create a new caps seed 196 // brand new agent, let's create a new caps seed
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 63719ac..f99df29 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -803,6 +803,7 @@ namespace OpenSim.Region.Framework.Scenes
803 agentCircuit.InventoryFolder = UUID.Zero; 803 agentCircuit.InventoryFolder = UUID.Zero;
804 agentCircuit.startpos = position; 804 agentCircuit.startpos = position;
805 agentCircuit.child = true; 805 agentCircuit.child = true;
806 agentCircuit.Appearance = avatar.Appearance;
806 807
807 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) 808 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
808 { 809 {