aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-2/+6
|\
| * Clean up viewer-based access control specifications.Diva Canto2015-09-061-2/+6
* | seems to compile ( tests comented out)UbitUmarov2015-09-022-19/+9
* | bad merge?UbitUmarov2015-09-012-5/+49
|\ \ | |/ |/|
| * review llLoginService for var supportUbitUmarov2015-08-281-8/+1
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-292-6/+20
| * TEST**** wingridproxy detection at grid login. Untested possible notUbitUmarov2014-10-241-3/+6
| * Intermediate commit. Sill errors.Melanie2014-01-052-1/+12
| |\
| * \ Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-06-231-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-06-182-2/+20
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-112-2/+25
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-281-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-231-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-222-4/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-171-0/+33
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-152-3/+15
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-07-051-13/+43
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-052-5/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-04-251-13/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-04-241-1/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-081-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-042-2/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-181-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-11-051-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Resolve merge commits, stage 1Tom2011-09-042-4/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-131-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-092-14/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-05-052-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-3/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Also set Godlike flag. Might be usefulMelanie2011-01-271-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add TeleportFlags.ViaRegionID to the flags sent on login when the regionMelanie2011-01-271-8/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-182-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-062-32/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-031-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to beMelanie2010-11-251-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-171-10/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-291-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-1/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-28/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-041-6/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-211-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace conflictMelanie Thielker2010-08-091-4/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-091-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \