aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-05-05 22:50:11 +0100
committerMelanie2010-05-05 22:50:11 +0100
commit7e0d5b866519a303490ee4c30b33c7598d99bbb1 (patch)
treeebe6627b312fb98e813ecc0d4adb98bf4fb36334 /OpenSim/Region/Framework
parentPlumb Viewer version into ScenePresence for initial login. It's still not (diff)
parentStab a test fail (diff)
downloadopensim-SC-7e0d5b866519a303490ee4c30b33c7598d99bbb1.zip
opensim-SC-7e0d5b866519a303490ee4c30b33c7598d99bbb1.tar.gz
opensim-SC-7e0d5b866519a303490ee4c30b33c7598d99bbb1.tar.bz2
opensim-SC-7e0d5b866519a303490ee4c30b33c7598d99bbb1.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index bebd463..897fda6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2679,8 +2679,10 @@ namespace OpenSim.Region.Framework.Scenes
2679 2679
2680 ScenePresence sp = CreateAndAddScenePresence(client); 2680 ScenePresence sp = CreateAndAddScenePresence(client);
2681 if (aCircuit != null) 2681 if (aCircuit != null)
2682 {
2682 sp.Appearance = aCircuit.Appearance; 2683 sp.Appearance = aCircuit.Appearance;
2683 sp.Viewer = aCircuit.Viewer; 2684 sp.Viewer = aCircuit.Viewer;
2685 }
2684 2686
2685 // HERE!!! Do the initial attachments right here 2687 // HERE!!! Do the initial attachments right here
2686 // first agent upon login is a root agent by design. 2688 // first agent upon login is a root agent by design.