diff options
| author | Robert Adams | 2013-12-17 06:18:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-12-17 06:18:13 -0800 |
| commit | 6937eec2588fab5e73c3ddc74c4ddc1bb35e7527 (patch) | |
| tree | 4372b6dfa7f2e277312c0547a099f6ffeea6e91f /OpenSim/Framework/UserProfiles.cs | |
| parent | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. (diff) | |
| parent | Fix issue with editing notes for other avatars (diff) | |
| download | opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.zip opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.gz opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.bz2 opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.xz | |
Merge branch 'master' into varregion
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/UserProfiles.cs')
| -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 | { |