Melanie 69054ad134 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs

2013-10-06 18:32:20 +01:00

..

Properties

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01: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