diff options
| author | Melanie | 2009-10-02 08:23:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 08:23:38 +0100 |
| commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
| tree | a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Framework/UserProfileData.cs | |
| parent | Restore the missing image handling to the image manager. The missing (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz | |
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Framework/UserProfileData.cs')
| -rw-r--r-- | OpenSim/Framework/UserProfileData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs index f51a199..413f152 100644 --- a/OpenSim/Framework/UserProfileData.cs +++ b/OpenSim/Framework/UserProfileData.cs | |||
| @@ -217,7 +217,7 @@ namespace OpenSim.Framework | |||
| 217 | public string Name | 217 | public string Name |
| 218 | { | 218 | { |
| 219 | get { return String.Format("{0} {1}", m_firstname, m_surname); } | 219 | get { return String.Format("{0} {1}", m_firstname, m_surname); } |
| 220 | } | 220 | } |
| 221 | 221 | ||
| 222 | public string Email | 222 | public string Email |
| 223 | { | 223 | { |