diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1a46837d60..2579e9d040 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2652,6 +2652,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 b4bbbe3b26..fb66fcdb86 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -655,6 +655,7 @@ namespace OpenSim.Region.Framework.Scenes
         public string Viewer
         {
             get { return m_Viewer; }
+            set { m_Viewer = value; }
         }
 
         #endregion