diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Framework/UserProfiles.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Framework/UserProfiles.cs')
| -rw-r--r-- | OpenSim/Framework/UserProfiles.cs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs index 98ab651..944a492 100644 --- a/OpenSim/Framework/UserProfiles.cs +++ b/OpenSim/Framework/UserProfiles.cs | |||
| @@ -91,14 +91,6 @@ namespace OpenSim.Framework | |||
| 91 | public UUID TargetId; | 91 | public UUID TargetId; |
| 92 | public string Notes; | 92 | public string Notes; |
| 93 | } | 93 | } |
| 94 | |||
| 95 | public class UserPreferences | ||
| 96 | { | ||
| 97 | public UUID UserId; | ||
| 98 | public bool IMViaEmail = false; | ||
| 99 | public bool Visible = false; | ||
| 100 | public string EMail = string.Empty; | ||
| 101 | } | ||
| 102 | 94 | ||
| 103 | public class UserAccountProperties | 95 | public class UserAccountProperties |
| 104 | { | 96 | { |