diff options
| author | Melanie | 2013-12-07 01:19:20 +0000 |
|---|---|---|
| committer | Melanie | 2013-12-07 01:19:20 +0000 |
| commit | ba48816fb676d17298e03e82579fc4f54fa48800 (patch) | |
| tree | cfa25ad1116eb0f7bd42eb2d2ebecf19eae939e8 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.zip opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.tar.gz opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.tar.bz2 opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/UserProfiles.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs index 6133591..492f6b9 100644 --- a/OpenSim/Framework/UserProfiles.cs +++ b/OpenSim/Framework/UserProfiles.cs | |||
| @@ -90,6 +90,14 @@ namespace OpenSim.Framework | |||
| 90 | public UUID TargetId; | 90 | public UUID TargetId; |
| 91 | public string Notes; | 91 | public string Notes; |
| 92 | } | 92 | } |
| 93 | |||
| 94 | public class UserPreferences | ||
| 95 | { | ||
| 96 | public UUID UserId; | ||
| 97 | public bool IMViaEmail = false; | ||
| 98 | public bool Visible = false; | ||
| 99 | public string EMail = string.Empty; | ||
| 100 | } | ||
| 93 | 101 | ||
| 94 | public class UserAccountProperties | 102 | public class UserAccountProperties |
| 95 | { | 103 | { |