From 2ebe1482664533bb9b9040134fe4a23fbc939d51 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 6 May 2010 00:34:49 +0200
Subject: Plumb the viewer version string through into AgentCircuitData. Now
 all that is left os to figure out what black magic turns AgentCircuitData
 into AgentData and then copy that into the ScenePresence, where m_Viewer is
 already added with this commit and waits for the data.

---
 OpenSim/Framework/AgentCircuitData.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 353e5bf..783a833 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -108,6 +108,11 @@ namespace OpenSim.Framework
         public string ServiceSessionID = string.Empty;
 
         /// <summary>
+        /// Viewer's version string
+        /// </summary>
+        public string Viewer;
+
+        /// <summary>
         /// Position the Agent's Avatar starts in the region
         /// </summary>
         public Vector3 startpos;
@@ -136,6 +141,7 @@ namespace OpenSim.Framework
             BaseFolder = new UUID(cAgent.BaseFolder);
             CapsPath = cAgent.CapsPath;
             ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
+            Viewer = cAgent.Viewer;
         }
 
         /// <summary>
@@ -173,6 +179,7 @@ namespace OpenSim.Framework
             args["service_session_id"] = OSD.FromString(ServiceSessionID);
             args["start_pos"] = OSD.FromString(startpos.ToString());
             args["appearance_serial"] = OSD.FromInteger(Appearance.Serial);
+            args["viewer"] = OSD.FromString(Viewer);
 
             if (Appearance != null)
             {
@@ -272,6 +279,8 @@ namespace OpenSim.Framework
                 SessionID = args["session_id"].AsUUID();
             if (args["service_session_id"] != null)
                 ServiceSessionID = args["service_session_id"].AsString();
+            if (args["viewer"] != null)
+                Viewer = args["viewer"].AsString();
 
             if (args["start_pos"] != null)
                 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
@@ -339,6 +348,7 @@ namespace OpenSim.Framework
         public float startposx;
         public float startposy;
         public float startposz;
+        public string Viewer;
 
         public sAgentCircuitData()
         {
@@ -360,6 +370,7 @@ namespace OpenSim.Framework
             BaseFolder = cAgent.BaseFolder.Guid;
             CapsPath = cAgent.CapsPath;
             ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
+            Viewer = cAgent.Viewer;
         }
     }
 }
-- 
cgit v1.1