aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs37
1 files changed, 36 insertions, 1 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 783a833..4f89d78 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -108,11 +108,31 @@ 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 111 /// The client's IP address, as captured by the login service
112 /// </summary>
113 public string IPAddress;
114
115 /// <summary>
116 /// Viewer's version string as reported by the viewer at login
112 /// </summary> 117 /// </summary>
113 public string Viewer; 118 public string Viewer;
114 119
115 /// <summary> 120 /// <summary>
121 /// The channel strinf sent by the viewer at login
122 /// </summary>
123 public string Channel;
124
125 /// <summary>
126 /// The Mac address as reported by the viewer at login
127 /// </summary>
128 public string Mac;
129
130 /// <summary>
131 /// The id0 as reported by the viewer at login
132 /// </summary>
133 public string Id0;
134
135 /// <summary>
116 /// Position the Agent's Avatar starts in the region 136 /// Position the Agent's Avatar starts in the region
117 /// </summary> 137 /// </summary>
118 public Vector3 startpos; 138 public Vector3 startpos;
@@ -179,7 +199,11 @@ namespace OpenSim.Framework
179 args["service_session_id"] = OSD.FromString(ServiceSessionID); 199 args["service_session_id"] = OSD.FromString(ServiceSessionID);
180 args["start_pos"] = OSD.FromString(startpos.ToString()); 200 args["start_pos"] = OSD.FromString(startpos.ToString());
181 args["appearance_serial"] = OSD.FromInteger(Appearance.Serial); 201 args["appearance_serial"] = OSD.FromInteger(Appearance.Serial);
202 args["client_ip"] = OSD.FromString(IPAddress);
182 args["viewer"] = OSD.FromString(Viewer); 203 args["viewer"] = OSD.FromString(Viewer);
204 args["channel"] = OSD.FromString(Channel);
205 args["mac"] = OSD.FromString(Mac);
206 args["id0"] = OSD.FromString(Id0);
183 207
184 if (Appearance != null) 208 if (Appearance != null)
185 { 209 {
@@ -279,8 +303,16 @@ namespace OpenSim.Framework
279 SessionID = args["session_id"].AsUUID(); 303 SessionID = args["session_id"].AsUUID();
280 if (args["service_session_id"] != null) 304 if (args["service_session_id"] != null)
281 ServiceSessionID = args["service_session_id"].AsString(); 305 ServiceSessionID = args["service_session_id"].AsString();
306 if (args["client_ip"] != null)
307 IPAddress = args["client_ip"].AsString();
282 if (args["viewer"] != null) 308 if (args["viewer"] != null)
283 Viewer = args["viewer"].AsString(); 309 Viewer = args["viewer"].AsString();
310 if (args["channel"] != null)
311 Channel = args["channel"].AsString();
312 if (args["mac"] != null)
313 Mac = args["mac"].AsString();
314 if (args["id0"] != null)
315 Id0 = args["id0"].AsString();
284 316
285 if (args["start_pos"] != null) 317 if (args["start_pos"] != null)
286 Vector3.TryParse(args["start_pos"].AsString(), out startpos); 318 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
@@ -349,6 +381,9 @@ namespace OpenSim.Framework
349 public float startposy; 381 public float startposy;
350 public float startposz; 382 public float startposz;
351 public string Viewer; 383 public string Viewer;
384 public string Channel;
385 public string Mac;
386 public string Id0;
352 387
353 public sAgentCircuitData() 388 public sAgentCircuitData()
354 { 389 {