aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AgentCircuitData.cs
diff options
context:
space:
mode:
authorDiva Canto2010-01-27 08:00:29 -0800
committerDiva Canto2010-01-27 08:00:29 -0800
commit7c00469cd210cfdda3dd835867469159d4c8b9d9 (patch)
tree11dc9aa7d60ce0067c44d37ec3a0638753441cb7 /OpenSim/Framework/AgentCircuitData.cs
parentAdded image for hyperlink map tiles. (diff)
downloadopensim-SC-7c00469cd210cfdda3dd835867469159d4c8b9d9.zip
opensim-SC-7c00469cd210cfdda3dd835867469159d4c8b9d9.tar.gz
opensim-SC-7c00469cd210cfdda3dd835867469159d4c8b9d9.tar.bz2
opensim-SC-7c00469cd210cfdda3dd835867469159d4c8b9d9.tar.xz
Added ExternalName config on Gatekeeper.
Diffstat (limited to 'OpenSim/Framework/AgentCircuitData.cs')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index f2f0a53..142ca2c 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -97,6 +97,12 @@ namespace OpenSim.Framework
97 public UUID SessionID; 97 public UUID SessionID;
98 98
99 /// <summary> 99 /// <summary>
100 /// Hypergrid service token; generated by the user domain, consumed by the receiving grid.
101 /// There is one such unique token for each grid visited.
102 /// </summary>
103 public string ServiceSessionID = string.Empty;
104
105 /// <summary>
100 /// Position the Agent's Avatar starts in the region 106 /// Position the Agent's Avatar starts in the region
101 /// </summary> 107 /// </summary>
102 public Vector3 startpos; 108 public Vector3 startpos;
@@ -156,6 +162,7 @@ namespace OpenSim.Framework
156 args["inventory_folder"] = OSD.FromUUID(InventoryFolder); 162 args["inventory_folder"] = OSD.FromUUID(InventoryFolder);
157 args["secure_session_id"] = OSD.FromUUID(SecureSessionID); 163 args["secure_session_id"] = OSD.FromUUID(SecureSessionID);
158 args["session_id"] = OSD.FromUUID(SessionID); 164 args["session_id"] = OSD.FromUUID(SessionID);
165 args["service_session_id"] = OSD.FromString(ServiceSessionID);
159 args["start_pos"] = OSD.FromString(startpos.ToString()); 166 args["start_pos"] = OSD.FromString(startpos.ToString());
160 args["appearance_serial"] = OSD.FromInteger(Appearance.Serial); 167 args["appearance_serial"] = OSD.FromInteger(Appearance.Serial);
161 168
@@ -253,6 +260,8 @@ namespace OpenSim.Framework
253 SecureSessionID = args["secure_session_id"].AsUUID(); 260 SecureSessionID = args["secure_session_id"].AsUUID();
254 if (args["session_id"] != null) 261 if (args["session_id"] != null)
255 SessionID = args["session_id"].AsUUID(); 262 SessionID = args["session_id"].AsUUID();
263 if (args["service_session_id"] != null)
264 ServiceSessionID = args["service_session_id"].AsString();
256 if (args["start_pos"] != null) 265 if (args["start_pos"] != null)
257 Vector3.TryParse(args["start_pos"].AsString(), out startpos); 266 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
258 267