Melanie 2f365ea80b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-09-07 13:54:19 +01:00

..

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

GridUserService.cs

Fix logic errors in "show grid users online" console command which didn't actually filter out users shown continuously online for more than 5 days

2013-09-03 00:16:43 +01: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

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +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