ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 05:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Plumb the viewer version string through into AgentCircuitData. Now all that

Browse Source 
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.
This commit is contained in:
Melanie Thielker
2010-05-06 00:34:49 +02:00
parent 65775b87e5
commit 733a07e061
5 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/AgentCircuitData.cs
View File

@@ -107,6 +107,11 @@ namespace OpenSim.Framework
/// </summary>
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>
@@ -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;
}
}
}