aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Fx up estate settingsMelanie2012-04-182-97/+97
* Merge branch 'master' into careminsterMelanie2012-04-182-4/+8
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-04-181-1/+1
| |\
| | * On "show part" command, show link number.Justin Clark-Casey (justincc)2012-04-181-1/+1
| * | Don't re-add the assembly resolver for each script if not creating the appdomainMelanie2012-04-181-4/+8
| |/
* | Merge branch 'master' into careminsterMelanie2012-04-189-2/+1534
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-186-1/+1475
| |\
| | * clean up some more logging spam in the jsonstore modulesMic Bowman2012-04-172-2/+4
| | * Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.Mic Bowman2012-04-173-5/+7
| | * add configuration for jsonstore module, disabled by defaultMic Bowman2012-04-171-0/+6
| | * This commit adds a new optional region module, JsonStore, that provides struc...Mic Bowman2012-04-174-0/+1464
| | * make the namespace for the ScriptModuleComms consistent with its file system ...Mic Bowman2012-04-171-1/+1
| * | minor: Add some method doc. Add warnings since calling SOG link/delink metho...Justin Clark-Casey (justincc)2012-04-172-0/+22
| |/
| * Add TestGetChildPartPositionAfterObjectRotation()Justin Clark-Casey (justincc)2012-04-171-1/+37
* | Merge branch 'master' into careminsterMelanie2012-04-1711-139/+76
|\ \ | |/
| * Add test TestGetChildPartPosition()Justin Clark-Casey (justincc)2012-04-171-0/+28
| * Move some public methods on WebStatsModule to private to reduce some static a...Justin Clark-Casey (justincc)2012-04-171-14/+14
| * refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateM...Justin Clark-Casey (justincc)2012-04-179-16/+16
| * Null reference in llGetObjectMass on a seated avatar.Talun2012-04-171-1/+1
| * Use INSERT OR REPLACE INTO sql in WebStatsModule for session update rather th...Justin Clark-Casey (justincc)2012-04-171-77/+7
| * correct bug where f_invalid was being inserted on a webstats update for an ex...Justin Clark-Casey (justincc)2012-04-171-2/+2
| * Simplify WebStatsModule by removing the uncompleted migrations section.Justin Clark-Casey (justincc)2012-04-171-29/+3
| * Fix bug in WebStatsModule where an exception would always be output on update...Justin Clark-Casey (justincc)2012-04-171-5/+10
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-1713-766/+1167
|\ \
| * \ Merge branch 'ubitwork'Melanie2012-04-172-2/+24
| |\ \
| | * | ubitODE: bug fix let avatars colide with volume detectorsUbitUmarov2012-04-171-0/+1
| | * | fix (http://opensimulator.org/mantis/view.php?id=5965) llGetObjectMass was ba...UbitUmarov2012-04-161-2/+23
| * | | Merge branch 'ubitwork'Melanie2012-04-162-8/+16
| |\ \ \ | | |/ /
| | * | ubitODE: - fix remove characters from default raycasts filters as older code ...UbitUmarov2012-04-162-8/+16
| * | | Downgrade an error log message to info because there is nothing we can do ifMelanie2012-04-162-2/+2
| |/ /
| * | chODE: if character velocity > 50m/s apply breaks. In free fall this will giv...UbitUmarov2012-04-161-1/+10
| * | chODE bug fixUbitUmarov2012-04-161-7/+9
| * | Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that ...UbitUmarov2012-04-161-22/+86
| * | added suport funtions for ubitODE raycastFilteredUbitUmarov2012-04-161-0/+13
| * | ubitODE + physmanager: - Revised use of ODE collisions categories and bits(fl...UbitUmarov2012-04-167-729/+983
| * | Use chode character actor.SetMomentum() to force full restore Velocity in sce...UbitUmarov2012-04-142-2/+22
| * | Use presence absolute position to request raycast to camera. Used m_pos maybe...UbitUmarov2012-04-131-3/+11
| * | don't do Animator.UpdateMovementAnimations() in scenepresence RegionHeartbea...UbitUmarov2012-04-131-2/+3
* | | Merge branch 'master' into careminsterMelanie2012-04-141-5/+30
|\ \ \ | | |/ | |/|
| * | Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()Justin Clark-Casey (justincc)2012-04-141-1/+3
| * | minor: make test names consistentJustin Clark-Casey (justincc)2012-04-141-1/+1
| * | refactor: move common init code into SetUp() in SceneObjectSpatialTestsJustin Clark-Casey (justincc)2012-04-141-8/+13
| * | refactor: put SOG position test in a separate TestSceneObjectGroupPosition()Justin Clark-Casey (justincc)2012-04-141-1/+17
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-145-12/+62
| |\ \
| * | | Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPositionJustin Clark-Casey (justincc)2012-04-141-0/+2
* | | | Merge branch 'master' into careminsterMelanie2012-04-148-95/+250
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-04-141-0/+1
| |\ \ \
| | * | | Add Talun to the CONTRIBUTORS.txt, Thank you for the great patchesnebadon2012-04-131-0/+1
| * | | | Correct whitespace error introduced by previous commitMelanie2012-04-141-1/+1
| |/ / /
| * | | Missing or unimplemented LSL memory functions.Talun2012-04-134-13/+62
| |/ /