Melanie 5768a151ff Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/MySQLXAssetData.cs

2012-03-20 02:48:11 +00:00

..

GridUserService.cs

Allow retrival of multiple user records in one operation, analog to presence

2012-01-16 23:09:24 +00:00

GridUserServiceBase.cs

Justin, I must have been dyslexic when I wrote UserGridService as the name for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere.

2010-03-05 21:36:45 -08:00

UserAccountService.cs

Merge branch 'master' into careminster

2012-03-20 02:48:11 +00:00

UserAccountServiceBase.cs

Fixed mixed-case use in UserAccounts table. Plus some more sanity checks on filling out the UserAccount data.

2010-01-13 14:16:05 -08:00