aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-06 00:54:21 +0200
committerMelanie2010-05-05 22:33:22 +0100
commite45f5ac12653f2ca5cef495db1607bea699ceb76 (patch)
treee5f1b4c3673c9cc24754931cb71811fd31289bbd
parentPlumb the viewer version string through into AgentCircuitData. Now all that (diff)
downloadopensim-SC_OLD-e45f5ac12653f2ca5cef495db1607bea699ceb76.zip
opensim-SC_OLD-e45f5ac12653f2ca5cef495db1607bea699ceb76.tar.gz
opensim-SC_OLD-e45f5ac12653f2ca5cef495db1607bea699ceb76.tar.bz2
opensim-SC_OLD-e45f5ac12653f2ca5cef495db1607bea699ceb76.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 1a46837..2579e9d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2652,6 +2652,7 @@ namespace OpenSim.Region.Framework.Scenes
2652 ScenePresence sp = CreateAndAddScenePresence(client); 2652 ScenePresence sp = CreateAndAddScenePresence(client);
2653 if (aCircuit != null) 2653 if (aCircuit != null)
2654 sp.Appearance = aCircuit.Appearance; 2654 sp.Appearance = aCircuit.Appearance;
2655 sp.Viewer = aCircuit.Viewer;
2655 2656
2656 // HERE!!! Do the initial attachments right here 2657 // HERE!!! Do the initial attachments right here
2657 // first agent upon login is a root agent by design. 2658 // 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 b4bbbe3..fb66fcd 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -655,6 +655,7 @@ namespace OpenSim.Region.Framework.Scenes
655 public string Viewer 655 public string Viewer
656 { 656 {
657 get { return m_Viewer; } 657 get { return m_Viewer; }
658 set { m_Viewer = value; }
658 } 659 }
659 660
660 #endregion 661 #endregion