opensim

mirror of https://github.com/opensim/opensim.git synced 2026-09-02 11:22:26 +08:00

Files

Melanie 71dd55a1ce Merge branch 'master' into careminster

Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs

2012-09-29 19:21:07 +01:00

GridUserService.cs

Removed the bits about the TOSModule. That module doesn't go into core. WARNING: migration on GridUser withdrawn too, but left the migration number there.

2012-09-27 16:43:18 -07: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