aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-031-1/+1
|\
| * string format arguments in wrong orderSignpostMarv2012-10-021-1/+1
* | Merge branch 'master' into careminsterMelanie2012-10-021-1/+1
|\ \ | |/
| * On more virtual methodDiva Canto2012-10-011-1/+1
| * Allow setting max connections for an endpointMelanie2012-09-301-3/+3
* | Merge branch 'master' into careminsterMelanie2012-09-301-12/+1
|\ \ | |/
| * Revert "Added request.Proxy=null everywhere, as discussed in http://stackover...Diva Canto2012-09-305-9/+1
| * Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com...Diva Canto2012-09-305-1/+9
| * Made a method of GridUserService virtual so it can be overridden.Diva Canto2012-09-301-12/+1
* | Merge branch 'master' into careminsterMelanie2012-09-292-11/+0
|\ \ | |/
| * Removed the bits about the TOSModule. That module doesn't go into core. WARNI...Diva Canto2012-09-272-11/+0
* | Merge branch 'avination' into careminsterMelanie2012-09-271-37/+67
|\ \
| * | Sequence/throttle asset retrievals.Melanie2012-09-141-37/+67
* | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-273-4/+37
|\ \ \ | | |/ | |/|
| * | Use GridUser properly for foreign users.Diva Canto2012-09-261-4/+27
| * | TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-252-0/+10
* | | Merge branch 'master' into careminsterMelanie2012-09-243-14/+177
|\ \ \ | |/ /
| * | HG 2.0: User Agent Service now can also control where the local users can go....Diva Canto2012-09-221-3/+100
| * | More HG 2.0: access control at the Gatekeeper. \o/Diva Canto2012-09-211-8/+54
| * | Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-211-1/+1
| * | Improvement over last commit: refactor the asset permissions code, so that it...Diva Canto2012-09-201-58/+5
| * | More HG2.0: Added permission policies in HGAsset Service based on asset types...Diva Canto2012-09-201-3/+76
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \ \ | | |/ | |/|
| * | Allow setting max connections for an endpointMelanie2012-09-141-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-09-162-6/+59
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-151-2/+2
| |\ \
| | * | Add basic asset connector tests to check behaviour for normal, local and temp...Justin Clark-Casey (justincc)2012-09-151-2/+2
| * | | More on HG2.0: added the possibility of controlling the appearance that avies...Diva Canto2012-09-151-0/+1
| |/ /
| * | Restarting to work on HGSuitcaseInventoryService: added the ability for the o...Diva Canto2012-09-131-4/+56
* | | 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
|\ \ \ | | |/ | |/|
| * | 4096 is used in various places as the maximum height of a region, refactoring...SignpostMarv2012-09-081-2/+2
* | | Merge branch 'avination' into careminsterMelanie2012-08-314-3/+5
|\ \ \ | | |/ | |/|
| * | fix vs2010 buildUbitUmarov2012-08-164-3/+5
* | | Merge branch 'master' into careminsterMelanie2012-08-291-1/+2
|\ \ \ | | |/ | |/|
| * | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folder...Justin Clark-Casey (justincc)2012-08-291-1/+2
* | | Merge branch 'master' into careminsterMelanie2012-08-251-25/+28
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-251-15/+49
| |\ \
| * | | Fix and refactor region registration. Reorder checks to short-curcuit expensi...Melanie2012-08-251-25/+28
* | | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-15/+49
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Following on from f8a89a79, do not allow more than one 'type' folder (e.g. ca...Justin Clark-Casey (justincc)2012-08-251-16/+49
| * | Allow multiple calling card type inventory folders to be created.Justin Clark-Casey (justincc)2012-08-251-0/+1
| |/