Melanie 3589acdab1 Merge branch 'master' into careminster ...

Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat

2013-11-23 19:13:22 +00:00

..

Properties

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

GridUserService.cs

minor: comment out "SetLastPosition" GridUserService debug message for now.

2013-11-05 23:18:09 +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

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