aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-06 00:54:21 +0200
committerMelanie Thielker2010-05-06 00:54:21 +0200
commit2d9a20529d6818093747eb764d86efa11f3874d5 (patch)
tree7d256e25914a0fe1c628f83874b7f9f127639880
parentPlumb the viewer version string through into AgentCircuitData. Now all that (diff)
downloadopensim-SC-2d9a20529d6818093747eb764d86efa11f3874d5.zip
opensim-SC-2d9a20529d6818093747eb764d86efa11f3874d5.tar.gz
opensim-SC-2d9a20529d6818093747eb764d86efa11f3874d5.tar.bz2
opensim-SC-2d9a20529d6818093747eb764d86efa11f3874d5.tar.xz
Plumb Viewer version into ScenePresence for initial login. It's still not
carried along
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0ca5948..bebd463 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2680,6 +2680,7 @@ namespace OpenSim.Region.Framework.Scenes
2680 ScenePresence sp = CreateAndAddScenePresence(client); 2680 ScenePresence sp = CreateAndAddScenePresence(client);
2681 if (aCircuit != null) 2681 if (aCircuit != null)
2682 sp.Appearance = aCircuit.Appearance; 2682 sp.Appearance = aCircuit.Appearance;
2683 sp.Viewer = aCircuit.Viewer;
2683 2684
2684 // HERE!!! Do the initial attachments right here 2685 // HERE!!! Do the initial attachments right here
2685 // first agent upon login is a root agent by design. 2686 // first agent upon login is a root agent by design.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 987180b..f649dfe 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -668,6 +668,7 @@ namespace OpenSim.Region.Framework.Scenes
668 public string Viewer 668 public string Viewer
669 { 669 {
670 get { return m_Viewer; } 670 get { return m_Viewer; }
671 set { m_Viewer = value; }
671 } 672 }
672 673
673 #endregion 674 #endregion