diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Services/UserProfilesService/UserProfilesService.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Services/UserProfilesService/UserProfilesService.cs')
-rw-r--r-- | OpenSim/Services/UserProfilesService/UserProfilesService.cs | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs index 96c13c0..76aa093 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Services.ProfilesService | |||
45 | static readonly ILog m_log = | 45 | static readonly ILog m_log = |
46 | LogManager.GetLogger( | 46 | LogManager.GetLogger( |
47 | MethodBase.GetCurrentMethod().DeclaringType); | 47 | MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | IUserAccountService userAccounts; | 49 | IUserAccountService userAccounts; |
50 | 50 | ||
51 | public UserProfilesService(IConfigSource config, string configName): | 51 | public UserProfilesService(IConfigSource config, string configName): |
@@ -58,23 +58,23 @@ namespace OpenSim.Services.ProfilesService | |||
58 | return; | 58 | return; |
59 | } | 59 | } |
60 | Object[] args = null; | 60 | Object[] args = null; |
61 | 61 | ||
62 | args = new Object[] { config }; | 62 | args = new Object[] { config }; |
63 | string accountService = Config.GetString("UserAccountService", String.Empty); | 63 | string accountService = Config.GetString("UserAccountService", String.Empty); |
64 | if (accountService != string.Empty) | 64 | if (accountService != string.Empty) |
65 | userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); | 65 | userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); |
66 | 66 | ||
67 | args = new Object[] { config }; | 67 | args = new Object[] { config }; |
68 | } | 68 | } |
69 | 69 | ||
70 | #region Classifieds | 70 | #region Classifieds |
71 | public OSD AvatarClassifiedsRequest(UUID creatorId) | 71 | public OSD AvatarClassifiedsRequest(UUID creatorId) |
72 | { | 72 | { |
73 | OSDArray records = ProfilesData.GetClassifiedRecords(creatorId); | 73 | OSDArray records = ProfilesData.GetClassifiedRecords(creatorId); |
74 | 74 | ||
75 | return records; | 75 | return records; |
76 | } | 76 | } |
77 | 77 | ||
78 | public bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result) | 78 | public bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result) |
79 | { | 79 | { |
80 | if(!ProfilesData.UpdateClassifiedRecord(ad, ref result)) | 80 | if(!ProfilesData.UpdateClassifiedRecord(ad, ref result)) |
@@ -84,74 +84,74 @@ namespace OpenSim.Services.ProfilesService | |||
84 | result = "success"; | 84 | result = "success"; |
85 | return true; | 85 | return true; |
86 | } | 86 | } |
87 | 87 | ||
88 | public bool ClassifiedDelete(UUID recordId) | 88 | public bool ClassifiedDelete(UUID recordId) |
89 | { | 89 | { |
90 | if(ProfilesData.DeleteClassifiedRecord(recordId)) | 90 | if(ProfilesData.DeleteClassifiedRecord(recordId)) |
91 | return true; | 91 | return true; |
92 | 92 | ||
93 | return false; | 93 | return false; |
94 | } | 94 | } |
95 | 95 | ||
96 | public bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result) | 96 | public bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result) |
97 | { | 97 | { |
98 | if(ProfilesData.GetClassifiedInfo(ref ad, ref result)) | 98 | if(ProfilesData.GetClassifiedInfo(ref ad, ref result)) |
99 | return true; | 99 | return true; |
100 | 100 | ||
101 | return false; | 101 | return false; |
102 | } | 102 | } |
103 | #endregion Classifieds | 103 | #endregion Classifieds |
104 | 104 | ||
105 | #region Picks | 105 | #region Picks |
106 | public OSD AvatarPicksRequest(UUID creatorId) | 106 | public OSD AvatarPicksRequest(UUID creatorId) |
107 | { | 107 | { |
108 | OSDArray records = ProfilesData.GetAvatarPicks(creatorId); | 108 | OSDArray records = ProfilesData.GetAvatarPicks(creatorId); |
109 | 109 | ||
110 | return records; | 110 | return records; |
111 | } | 111 | } |
112 | 112 | ||
113 | public bool PickInfoRequest(ref UserProfilePick pick, ref string result) | 113 | public bool PickInfoRequest(ref UserProfilePick pick, ref string result) |
114 | { | 114 | { |
115 | pick = ProfilesData.GetPickInfo(pick.CreatorId, pick.PickId); | 115 | pick = ProfilesData.GetPickInfo(pick.CreatorId, pick.PickId); |
116 | result = "OK"; | 116 | result = "OK"; |
117 | return true; | 117 | return true; |
118 | } | 118 | } |
119 | 119 | ||
120 | public bool PicksUpdate(ref UserProfilePick pick, ref string result) | 120 | public bool PicksUpdate(ref UserProfilePick pick, ref string result) |
121 | { | 121 | { |
122 | return ProfilesData.UpdatePicksRecord(pick); | 122 | return ProfilesData.UpdatePicksRecord(pick); |
123 | } | 123 | } |
124 | 124 | ||
125 | public bool PicksDelete(UUID pickId) | 125 | public bool PicksDelete(UUID pickId) |
126 | { | 126 | { |
127 | return ProfilesData.DeletePicksRecord(pickId); | 127 | return ProfilesData.DeletePicksRecord(pickId); |
128 | } | 128 | } |
129 | #endregion Picks | 129 | #endregion Picks |
130 | 130 | ||
131 | #region Notes | 131 | #region Notes |
132 | public bool AvatarNotesRequest(ref UserProfileNotes note) | 132 | public bool AvatarNotesRequest(ref UserProfileNotes note) |
133 | { | 133 | { |
134 | return ProfilesData.GetAvatarNotes(ref note); | 134 | return ProfilesData.GetAvatarNotes(ref note); |
135 | } | 135 | } |
136 | 136 | ||
137 | public bool NotesUpdate(ref UserProfileNotes note, ref string result) | 137 | public bool NotesUpdate(ref UserProfileNotes note, ref string result) |
138 | { | 138 | { |
139 | return ProfilesData.UpdateAvatarNotes(ref note, ref result); | 139 | return ProfilesData.UpdateAvatarNotes(ref note, ref result); |
140 | } | 140 | } |
141 | #endregion Notes | 141 | #endregion Notes |
142 | 142 | ||
143 | #region Profile Properties | 143 | #region Profile Properties |
144 | public bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result) | 144 | public bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result) |
145 | { | 145 | { |
146 | return ProfilesData.GetAvatarProperties(ref prop, ref result); | 146 | return ProfilesData.GetAvatarProperties(ref prop, ref result); |
147 | } | 147 | } |
148 | 148 | ||
149 | public bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result) | 149 | public bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result) |
150 | { | 150 | { |
151 | return ProfilesData.UpdateAvatarProperties(ref prop, ref result); | 151 | return ProfilesData.UpdateAvatarProperties(ref prop, ref result); |
152 | } | 152 | } |
153 | #endregion Profile Properties | 153 | #endregion Profile Properties |
154 | 154 | ||
155 | #region Interests | 155 | #region Interests |
156 | public bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result) | 156 | public bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result) |
157 | { | 157 | { |
@@ -159,6 +159,7 @@ namespace OpenSim.Services.ProfilesService | |||
159 | } | 159 | } |
160 | #endregion Interests | 160 | #endregion Interests |
161 | 161 | ||
162 | |||
162 | #region User Preferences | 163 | #region User Preferences |
163 | public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result) | 164 | public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result) |
164 | { | 165 | { |
@@ -239,6 +240,7 @@ namespace OpenSim.Services.ProfilesService | |||
239 | } | 240 | } |
240 | #endregion User Preferences | 241 | #endregion User Preferences |
241 | 242 | ||
243 | |||
242 | #region Utility | 244 | #region Utility |
243 | public OSD AvatarImageAssetsRequest(UUID avatarId) | 245 | public OSD AvatarImageAssetsRequest(UUID avatarId) |
244 | { | 246 | { |
@@ -252,7 +254,7 @@ namespace OpenSim.Services.ProfilesService | |||
252 | { | 254 | { |
253 | return ProfilesData.GetUserAppData(ref prop, ref result); | 255 | return ProfilesData.GetUserAppData(ref prop, ref result); |
254 | } | 256 | } |
255 | 257 | ||
256 | public bool SetUserAppData(UserAppData prop, ref string result) | 258 | public bool SetUserAppData(UserAppData prop, ref string result) |
257 | { | 259 | { |
258 | return true; | 260 | return true; |