aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/UserManagerBase.cs
diff options
context:
space:
mode:
authorMike Mazur2008-07-31 23:53:24 +0000
committerMike Mazur2008-07-31 23:53:24 +0000
commit15669281faab727cdf79ec1cee24d9b20fae8cbd (patch)
tree5680042e8c1a791eb23c70f6dfcae5d60ab91856 /OpenSim/Framework/Communications/UserManagerBase.cs
parent* Allow an individual item to be specified as well as a folder in save-inv (diff)
downloadopensim-SC_OLD-15669281faab727cdf79ec1cee24d9b20fae8cbd.zip
opensim-SC_OLD-15669281faab727cdf79ec1cee24d9b20fae8cbd.tar.gz
opensim-SC_OLD-15669281faab727cdf79ec1cee24d9b20fae8cbd.tar.bz2
opensim-SC_OLD-15669281faab727cdf79ec1cee24d9b20fae8cbd.tar.xz
Apply updated patch from issue 1871. Thanks sempuki.
Diffstat (limited to 'OpenSim/Framework/Communications/UserManagerBase.cs')
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs50
1 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index f8e77df..05077b6 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications
47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 public UserConfig _config; 49 public UserConfig _config;
50 private List<IUserData> _plugins = new List<IUserData>(); 50 private List<IUserDataPlugin> _plugins = new List<IUserDataPlugin>();
51 51
52 /// <summary> 52 /// <summary>
53 /// Adds a new user server plugin - user servers will be requested in the order they were loaded. 53 /// Adds a new user server plugin - user servers will be requested in the order they were loaded.
@@ -55,8 +55,8 @@ namespace OpenSim.Framework.Communications
55 /// <param name="provider">The filename to the user server plugin DLL</param> 55 /// <param name="provider">The filename to the user server plugin DLL</param>
56 public void AddPlugin(string provider, string connect) 56 public void AddPlugin(string provider, string connect)
57 { 57 {
58 PluginLoader<IUserData> loader = 58 PluginLoader<IUserDataPlugin> loader =
59 new PluginLoader<IUserData> (new UserDataInitialiser (connect)); 59 new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect));
60 60
61 // loader will try to load all providers (MySQL, MSSQL, etc) 61 // loader will try to load all providers (MySQL, MSSQL, etc)
62 // unless it is constrainted to the correct "Provider" entry in the addin.xml 62 // unless it is constrainted to the correct "Provider" entry in the addin.xml
@@ -71,7 +71,7 @@ namespace OpenSim.Framework.Communications
71 // see IUserService 71 // see IUserService
72 public UserProfileData GetUserProfile(string fname, string lname) 72 public UserProfileData GetUserProfile(string fname, string lname)
73 { 73 {
74 foreach (IUserData plugin in _plugins) 74 foreach (IUserDataPlugin plugin in _plugins)
75 { 75 {
76 UserProfileData profile = plugin.GetUserByName(fname, lname); 76 UserProfileData profile = plugin.GetUserByName(fname, lname);
77 77
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Communications
86 } 86 }
87 public UserAgentData GetAgentByUUID(LLUUID userId) 87 public UserAgentData GetAgentByUUID(LLUUID userId)
88 { 88 {
89 foreach (IUserData plugin in _plugins) 89 foreach (IUserDataPlugin plugin in _plugins)
90 { 90 {
91 UserAgentData agent = plugin.GetAgentByUUID(userId); 91 UserAgentData agent = plugin.GetAgentByUUID(userId);
92 92
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Communications
101 // see IUserService 101 // see IUserService
102 public UserProfileData GetUserProfile(LLUUID uuid) 102 public UserProfileData GetUserProfile(LLUUID uuid)
103 { 103 {
104 foreach (IUserData plugin in _plugins) 104 foreach (IUserDataPlugin plugin in _plugins)
105 { 105 {
106 UserProfileData profile = plugin.GetUserByUUID(uuid); 106 UserProfileData profile = plugin.GetUserByUUID(uuid);
107 107
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Communications
118 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) 118 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query)
119 { 119 {
120 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); 120 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
121 foreach (IUserData plugin in _plugins) 121 foreach (IUserDataPlugin plugin in _plugins)
122 { 122 {
123 try 123 try
124 { 124 {
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.Communications
140 /// <returns></returns> 140 /// <returns></returns>
141 public bool UpdateUserProfile(UserProfileData data) 141 public bool UpdateUserProfile(UserProfileData data)
142 { 142 {
143 foreach (IUserData plugin in _plugins) 143 foreach (IUserDataPlugin plugin in _plugins)
144 { 144 {
145 try 145 try
146 { 146 {
@@ -167,7 +167,7 @@ namespace OpenSim.Framework.Communications
167 /// <returns>Agent profiles</returns> 167 /// <returns>Agent profiles</returns>
168 public UserAgentData GetUserAgent(LLUUID uuid) 168 public UserAgentData GetUserAgent(LLUUID uuid)
169 { 169 {
170 foreach (IUserData plugin in _plugins) 170 foreach (IUserDataPlugin plugin in _plugins)
171 { 171 {
172 try 172 try
173 { 173 {
@@ -189,7 +189,7 @@ namespace OpenSim.Framework.Communications
189 /// <returns>A user agent</returns> 189 /// <returns>A user agent</returns>
190 public UserAgentData GetUserAgent(string name) 190 public UserAgentData GetUserAgent(string name)
191 { 191 {
192 foreach (IUserData plugin in _plugins) 192 foreach (IUserDataPlugin plugin in _plugins)
193 { 193 {
194 try 194 try
195 { 195 {
@@ -212,7 +212,7 @@ namespace OpenSim.Framework.Communications
212 /// <returns>A user agent</returns> 212 /// <returns>A user agent</returns>
213 public UserAgentData GetUserAgent(string fname, string lname) 213 public UserAgentData GetUserAgent(string fname, string lname)
214 { 214 {
215 foreach (IUserData plugin in _plugins) 215 foreach (IUserDataPlugin plugin in _plugins)
216 { 216 {
217 try 217 try
218 { 218 {
@@ -229,7 +229,7 @@ namespace OpenSim.Framework.Communications
229 229
230 public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 230 public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
231 { 231 {
232 foreach (IUserData plugin in _plugins) 232 foreach (IUserDataPlugin plugin in _plugins)
233 { 233 {
234 try 234 try
235 { 235 {
@@ -249,7 +249,7 @@ namespace OpenSim.Framework.Communications
249 /// <returns>A List of FriendListItems that contains info about the user's friends</returns> 249 /// <returns>A List of FriendListItems that contains info about the user's friends</returns>
250 public List<FriendListItem> GetUserFriendList(LLUUID ownerID) 250 public List<FriendListItem> GetUserFriendList(LLUUID ownerID)
251 { 251 {
252 foreach (IUserData plugin in _plugins) 252 foreach (IUserDataPlugin plugin in _plugins)
253 { 253 {
254 try 254 try
255 { 255 {
@@ -266,7 +266,7 @@ namespace OpenSim.Framework.Communications
266 266
267 public void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) 267 public void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey)
268 { 268 {
269 foreach (IUserData plugin in _plugins) 269 foreach (IUserDataPlugin plugin in _plugins)
270 { 270 {
271 try 271 try
272 { 272 {
@@ -281,7 +281,7 @@ namespace OpenSim.Framework.Communications
281 281
282 public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 282 public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)
283 { 283 {
284 foreach (IUserData plugin in _plugins) 284 foreach (IUserDataPlugin plugin in _plugins)
285 { 285 {
286 try 286 try
287 { 287 {
@@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications
296 296
297 public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 297 public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
298 { 298 {
299 foreach (IUserData plugin in _plugins) 299 foreach (IUserDataPlugin plugin in _plugins)
300 { 300 {
301 try 301 try
302 { 302 {
@@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications
311 311
312 public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 312 public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms)
313 { 313 {
314 foreach (IUserData plugin in _plugins) 314 foreach (IUserDataPlugin plugin in _plugins)
315 { 315 {
316 try 316 try
317 { 317 {
@@ -545,7 +545,7 @@ namespace OpenSim.Framework.Communications
545 user.HomeRegionX = regX; 545 user.HomeRegionX = regX;
546 user.HomeRegionY = regY; 546 user.HomeRegionY = regY;
547 547
548 foreach (IUserData plugin in _plugins) 548 foreach (IUserDataPlugin plugin in _plugins)
549 { 549 {
550 try 550 try
551 { 551 {
@@ -567,7 +567,7 @@ namespace OpenSim.Framework.Communications
567 m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString()); 567 m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString());
568 return false; 568 return false;
569 } 569 }
570 foreach (IUserData plugin in _plugins) 570 foreach (IUserDataPlugin plugin in _plugins)
571 { 571 {
572 try 572 try
573 { 573 {
@@ -593,7 +593,7 @@ namespace OpenSim.Framework.Communications
593 /// <param name="agentdata">The agent data to be added</param> 593 /// <param name="agentdata">The agent data to be added</param>
594 public bool AddUserAgent(UserAgentData agentdata) 594 public bool AddUserAgent(UserAgentData agentdata)
595 { 595 {
596 foreach (IUserData plugin in _plugins) 596 foreach (IUserDataPlugin plugin in _plugins)
597 { 597 {
598 try 598 try
599 { 599 {
@@ -612,7 +612,7 @@ namespace OpenSim.Framework.Communications
612 /// TODO: stubs for now to get us to a compiling state gently 612 /// TODO: stubs for now to get us to a compiling state gently
613 public AvatarAppearance GetUserAppearance(LLUUID user) 613 public AvatarAppearance GetUserAppearance(LLUUID user)
614 { 614 {
615 foreach (IUserData plugin in _plugins) 615 foreach (IUserDataPlugin plugin in _plugins)
616 { 616 {
617 try 617 try
618 { 618 {
@@ -628,7 +628,7 @@ namespace OpenSim.Framework.Communications
628 628
629 public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 629 public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
630 { 630 {
631 foreach (IUserData plugin in _plugins) 631 foreach (IUserDataPlugin plugin in _plugins)
632 { 632 {
633 try 633 try
634 { 634 {
@@ -643,7 +643,7 @@ namespace OpenSim.Framework.Communications
643 643
644 public void AddAttachment(LLUUID user, LLUUID item) 644 public void AddAttachment(LLUUID user, LLUUID item)
645 { 645 {
646 foreach (IUserData plugin in _plugins) 646 foreach (IUserDataPlugin plugin in _plugins)
647 { 647 {
648 try 648 try
649 { 649 {
@@ -658,7 +658,7 @@ namespace OpenSim.Framework.Communications
658 658
659 public void RemoveAttachment(LLUUID user, LLUUID item) 659 public void RemoveAttachment(LLUUID user, LLUUID item)
660 { 660 {
661 foreach (IUserData plugin in _plugins) 661 foreach (IUserDataPlugin plugin in _plugins)
662 { 662 {
663 try 663 try
664 { 664 {
@@ -673,7 +673,7 @@ namespace OpenSim.Framework.Communications
673 673
674 public List<LLUUID> GetAttachments(LLUUID user) 674 public List<LLUUID> GetAttachments(LLUUID user)
675 { 675 {
676 foreach (IUserData plugin in _plugins) 676 foreach (IUserDataPlugin plugin in _plugins)
677 { 677 {
678 try 678 try
679 { 679 {