diff options
| author | dahlia | 2013-12-06 15:58:51 -0800 |
|---|---|---|
| committer | dahlia | 2013-12-06 15:58:51 -0800 |
| commit | aba2a444538fc0ab5ae093004dc9994abab299e3 (patch) | |
| tree | 21b1dc7790e08ba8de07c073dd7b6186ce10d938 /OpenSim/Framework | |
| parent | use System.IO.Compression.DeflateStream for mesh decompression in an attempt ... (diff) | |
| parent | Add support for user preferences (im via email) (diff) | |
| download | opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.zip opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.gz opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.bz2 opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 | { |