Tom 66dec3b874 Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

..

AuthenticationServiceBase.cs

Add the ability for gods to impersonate users. For this, bit 6 needs to be

2010-11-25 20:34:55 +01:00

PasswordAuthenticationService.cs

Fix bug introduced by Query Access. The response does not come in a packaged _Result field, it comes as simple OSDMap with 2 fields in it.

2011-02-16 09:57:12 -08:00

WebkeyAuthenticationService.cs

Merge branch 'master' into careminster-presence-refactor

2011-03-27 21:41:54 +01:00

WebkeyOrPasswordAuthenticationService.cs

minor: remove mono compiler warning

2011-08-22 23:10:43 +01:00