Merge branch 'master' into careminster

2026-08-06 01:06:30 +08:00 · 2013-12-07 01:19:20 +00:00
parent 6d6b9ab791 8f221a3077
commit ba48816fb6
17 changed files with 305 additions and 48 deletions
--- a/OpenSim/Framework/UserProfiles.cs
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -90,6 +90,14 @@ namespace OpenSim.Framework
        public UUID TargetId;
        public string Notes;
    }
+
+    public class UserPreferences
+    {
+        public UUID UserId;
+        public bool IMViaEmail = false;
+        public bool Visible = false;
+        public string EMail = string.Empty;
+    }
    
    public class UserAccountProperties
    {