aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AgentCircuitData.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-07-17 00:54:23 +0100
committerUbitUmarov2012-07-17 00:54:23 +0100
commitd5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch)
tree8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Framework/AgentCircuitData.cs
parentUbitOde: remove useless water collider from active code. (diff)
parentMerge branch 'avination' into careminster (diff)
downloadopensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2
opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Framework/AgentCircuitData.cs')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 57fb808..ffcc584 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -99,6 +99,11 @@ namespace OpenSim.Framework
99 public string lastname; 99 public string lastname;
100 100
101 /// <summary> 101 /// <summary>
102 /// Agent's full name.
103 /// </summary>
104 public string Name { get { return string.Format("{0} {1}", firstname, lastname); } }
105
106 /// <summary>
102 /// Random Unique GUID for this session. Client gets this at login and it's 107 /// Random Unique GUID for this session. Client gets this at login and it's
103 /// only supposed to be disclosed over secure channels 108 /// only supposed to be disclosed over secure channels
104 /// </summary> 109 /// </summary>