aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge branch 'avination-current' into careminsterMelanie2013-09-161-1/+7
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-072-0/+57
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-173-14/+7
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-072-3/+11
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-0112-282/+757
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-291-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-184-64/+30
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-233-174/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-131-68/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-04-101-110/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add delete maptile ability to MapImageService - yet untestedMelanie Thielker2014-03-181-0/+60
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix exception when brokering HG asset idsMelanie Thielker2013-09-081-1/+7
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+3
| * | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-02-274-81/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-12-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-172-1/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-137-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-11-041-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | Squash reporting HelloNeighbor exception - it simply means the other simMelanie2012-11-021-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-10-201-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-10-071-16/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Fix threading in remote asset connectorMelanie2012-10-051-16/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-10-072-4/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-09-271-37/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Sequence/throttle asset retrievals.Melanie2012-09-141-37/+67
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting max connections for an endpointMelanie2012-09-141-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-09-103-43/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent double slashes, try #4UbitUmarov2012-09-061-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent double slashes, try #3Melanie2012-09-061-0/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Change string concatenation to Path.Combine to eliminate extra slashes."Melanie2012-09-061-8/+6
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ubitwork' into avinationMelanie2012-09-061-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Change string concatenation to Path.Combine to eliminate extra slashes.Melanie2012-09-061-6/+8
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Revert " remove extra '/' in assets url"Melanie2012-09-061-13/+6
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | remove extra '/' in assets urlUbitUmarov2012-09-061-6/+13
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Make friend notifies and closing child agents async because both canMelanie2012-09-042-42/+47
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-09-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fix vs2010 buildUbitUmarov2012-08-161-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-152-0/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-08-011-9/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-08-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \