aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination-current' into careminsterMelanie2013-09-1615-88/+147
|\
| * Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-084-5/+19
| * Fix exception when brokering HG asset idsMelanie Thielker2013-09-081-1/+7
| * Harmonize the class name, ID and Name of the default perms moduleMelanie Thielker2013-09-084-11/+11
| * Reinstate SecurePermissionsLoading functionality, default ONMelanie Thielker2013-09-081-24/+16
| * Bring Core Groups up to current versionroot2013-09-0712-284/+504
| * Add two argument constructor to GridInstantMessageroot2013-09-071-0/+18
| * Add support for simple external CAPS texture servicesroot2013-09-071-19/+31
| * Fix the root cause of keyframe motion region crossing offset - UpdateSceneObjectMelanie2013-08-252-23/+5
| * * This fixes the border crossing offsets by storing the final keyframe locati...teravus2013-08-241-2/+22
| * * Fix a null ref that causes a stack unwind when crossing borders. Less stac...teravus2013-08-243-11/+48
| * Revert "* This increases accuracy when border crossing (the reason is.. the...teravus2013-08-241-7/+7
| * * This increases accuracy when border crossing (the reason is.. the border ...teravus2013-08-231-7/+7
* | Merge branch 'master' into careminsterMelanie2013-09-0737-114/+727
|\ \
| * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-09-053-5/+52
| |\ \
| | * | minor: add doc about DefaultHGRegion and some of the other GridService region...Justin Clark-Casey (justincc)2013-09-053-5/+52
| * | | Restore group membership check for HG users in QueryAccess.Diva Canto2013-09-053-12/+17
| |/ /
| * | Stop "show client stats" from throwing an exception if somehow Scene.m_client...Justin Clark-Casey (justincc)2013-09-041-1/+8
| * | Also check user authorization if looking to upgrade from a child to a root ag...Justin Clark-Casey (justincc)2013-09-041-0/+13
| * | For a Hypergrid user, delay estate access checks until NewUserConnection() so...Justin Clark-Casey (justincc)2013-09-041-2/+6
| * | In pCampbot PhysicsBehaviour.Close(), only cancel jumping if bot is connectedJustin Clark-Casey (justincc)2013-09-031-1/+2
| * | Make pCampbot "add behaviour" and "remove behaviour" console commands work fo...Justin Clark-Casey (justincc)2013-09-031-45/+78
| * | Consistently give responsibility for thread sleeping to behaviours rather tha...Justin Clark-Casey (justincc)2013-09-033-1/+7
| * | Add Close() method to IBehaviour to allow behaviours to cleanup when removed ...Justin Clark-Casey (justincc)2013-09-034-1/+30
| * | Add pCampbot "remove behaviour" console command for removing bot behaviours d...Justin Clark-Casey (justincc)2013-09-032-5/+60
| * | Add ability to adjust pCampbot bot behaviours whilst running with "add behavi...Justin Clark-Casey (justincc)2013-09-032-41/+157
| * | And fix break in "show bot" from commit 9c65207Justin Clark-Casey (justincc)2013-09-031-1/+1
| * | Fix build break from last commit 9c65207. Mono 2.4 lacks string.join(string,...Justin Clark-Casey (justincc)2013-09-031-1/+1
| * | Show behaviours of pCampbot bots in "show bots" and "show bot" console commandsJustin Clark-Casey (justincc)2013-09-038-12/+45
| * | minor simplification of some unix date functions in Util. No functional change.Justin Clark-Casey (justincc)2013-09-031-5/+3
| * | Fix logic errors in "show grid users online" console command which didn't act...Justin Clark-Casey (justincc)2013-09-031-3/+2
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-09-031-5/+1
| |\ \
| | * | Remove test that gives issue on Windows, just let the try/catch do the work.BlueWall2013-09-021-5/+1
| * | | Add experimental "show grid users online" console command to show grid users ...Justin Clark-Casey (justincc)2013-09-032-4/+43
| |/ /
| * | Fix bug where users teleporting to non-neighbour regions could continue to he...Justin Clark-Casey (justincc)2013-09-025-15/+85
| * | Comment out warning about agent updating without valid session ID for now.Justin Clark-Casey (justincc)2013-09-021-4/+4
| * | Allow one to specify a DefaultHGRegion flag in [GridService] in order to allo...Justin Clark-Casey (justincc)2013-09-0215-10/+172
* | | Merge branch 'master' into careminsterMelanie2013-09-0125-297/+943
|\ \ \ | |/ /
| * | Profiles: Clean up some log entries caused when visiting HG avatar is using l...BlueWall2013-08-291-16/+26
| * | Initialization: move key expansion out to operate on all sources and not just...BlueWall2013-08-291-2/+2
| * | Do not add a port zero to end of the hypergrid gateway host name.Robert Adams2013-08-281-1/+4
| * | BulletSim: add some protections for processing when shutting down.Robert Adams2013-08-271-2/+2
| * | Revert "Make HG logins fall back to fallback regions if the desired region fa...Justin Clark-Casey (justincc)2013-08-261-24/+3
| * | Revert "Added some more debug messages."Justin Clark-Casey (justincc)2013-08-261-4/+1
| * | Fix exception thrown after a region has been restarted through scheduling.Justin Clark-Casey (justincc)2013-08-251-10/+22
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-254-6/+30
| |\ \
| | * | Added some more debug messages.Diva Canto2013-08-241-1/+4
| | * | Potential fix for access control bug on login introduced with SeeIntoRegion c...Diva Canto2013-08-241-1/+1
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-2412-84/+132
| | |\ \
| | | * | Fix a printing of exception error in InventoryArchiveModule that onlyRobert Adams2013-08-231-1/+1