aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-06 00:34:49 +0200
committerMelanie2010-05-05 22:15:32 +0100
commit2ebe1482664533bb9b9040134fe4a23fbc939d51 (patch)
tree41c7c99c6da6ecd1ff217730e1dd95dd680ec5da /OpenSim/Framework
parentAdd a XMLRPC method to remotely set the login level for the LLLoginService. (diff)
downloadopensim-SC_OLD-2ebe1482664533bb9b9040134fe4a23fbc939d51.zip
opensim-SC_OLD-2ebe1482664533bb9b9040134fe4a23fbc939d51.tar.gz
opensim-SC_OLD-2ebe1482664533bb9b9040134fe4a23fbc939d51.tar.bz2
opensim-SC_OLD-2ebe1482664533bb9b9040134fe4a23fbc939d51.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs11
1 files changed, 11 insertions, 0 deletions
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
108 public string ServiceSessionID = string.Empty; 108 public string ServiceSessionID = string.Empty;
109 109
110 /// <summary> 110 /// <summary>
111 /// Viewer's version string
112 /// </summary>
113 public string Viewer;
114
115 /// <summary>
111 /// Position the Agent's Avatar starts in the region 116 /// Position the Agent's Avatar starts in the region
112 /// </summary> 117 /// </summary>
113 public Vector3 startpos; 118 public Vector3 startpos;
@@ -136,6 +141,7 @@ namespace OpenSim.Framework
136 BaseFolder = new UUID(cAgent.BaseFolder); 141 BaseFolder = new UUID(cAgent.BaseFolder);
137 CapsPath = cAgent.CapsPath; 142 CapsPath = cAgent.CapsPath;
138 ChildrenCapSeeds = cAgent.ChildrenCapSeeds; 143 ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
144 Viewer = cAgent.Viewer;
139 } 145 }
140 146
141 /// <summary> 147 /// <summary>
@@ -173,6 +179,7 @@ namespace OpenSim.Framework
173 args["service_session_id"] = OSD.FromString(ServiceSessionID); 179 args["service_session_id"] = OSD.FromString(ServiceSessionID);
174 args["start_pos"] = OSD.FromString(startpos.ToString()); 180 args["start_pos"] = OSD.FromString(startpos.ToString());
175 args["appearance_serial"] = OSD.FromInteger(Appearance.Serial); 181 args["appearance_serial"] = OSD.FromInteger(Appearance.Serial);
182 args["viewer"] = OSD.FromString(Viewer);
176 183
177 if (Appearance != null) 184 if (Appearance != null)
178 { 185 {
@@ -272,6 +279,8 @@ namespace OpenSim.Framework
272 SessionID = args["session_id"].AsUUID(); 279 SessionID = args["session_id"].AsUUID();
273 if (args["service_session_id"] != null) 280 if (args["service_session_id"] != null)
274 ServiceSessionID = args["service_session_id"].AsString(); 281 ServiceSessionID = args["service_session_id"].AsString();
282 if (args["viewer"] != null)
283 Viewer = args["viewer"].AsString();
275 284
276 if (args["start_pos"] != null) 285 if (args["start_pos"] != null)
277 Vector3.TryParse(args["start_pos"].AsString(), out startpos); 286 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
@@ -339,6 +348,7 @@ namespace OpenSim.Framework
339 public float startposx; 348 public float startposx;
340 public float startposy; 349 public float startposy;
341 public float startposz; 350 public float startposz;
351 public string Viewer;
342 352
343 public sAgentCircuitData() 353 public sAgentCircuitData()
344 { 354 {
@@ -360,6 +370,7 @@ namespace OpenSim.Framework
360 BaseFolder = cAgent.BaseFolder.Guid; 370 BaseFolder = cAgent.BaseFolder.Guid;
361 CapsPath = cAgent.CapsPath; 371 CapsPath = cAgent.CapsPath;
362 ChildrenCapSeeds = cAgent.ChildrenCapSeeds; 372 ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
373 Viewer = cAgent.Viewer;
363 } 374 }
364 } 375 }
365} 376}