diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0ca5948603..bebd4636b9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2680,6 +2680,7 @@ namespace OpenSim.Region.Framework.Scenes
                 ScenePresence sp = CreateAndAddScenePresence(client);
                 if (aCircuit != null)
                     sp.Appearance = aCircuit.Appearance;
+                sp.Viewer = aCircuit.Viewer;
 
                 // HERE!!! Do the initial attachments right here
                 // 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 987180bce8..f649dfebde 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -668,6 +668,7 @@ namespace OpenSim.Region.Framework.Scenes
         public string Viewer
         {
             get { return m_Viewer; }
+            set { m_Viewer = value; }
         }
 
         #endregion