aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-201-12/+10
|\
| * If a physical prim is manually moved (e.g. by a user) then set the geometry p...Justin Clark-Casey (justincc)2012-04-201-12/+10
* | Merge branch 'master' into careminsterMelanie2012-04-203-46/+84
|\ \ | |/
| * Always dispose of existing opened bitmap from file in SaveFile(), instead of ...Justin Clark-Casey (justincc)2012-04-201-22/+37
| * Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and J...Justin Clark-Casey (justincc)2012-04-202-18/+31
| * concerns GenericSystemDrawing.csGarmin Kawaguichi2012-04-201-8/+9
| * Stop teleports from dropping tall avatars through or embedding them in the fl...Justin Clark-Casey (justincc)2012-04-201-1/+7
| * Fix a logic error in app domain creationMelanie2012-04-181-1/+1
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-209-221/+170
|\ \
| * | changed - VolumeDetect and phantom setting interaction. Script VD(true) forc...UbitUmarov2012-04-192-13/+40
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-04-196-4/+28
| |\ \
| | * | Allow setting a specific target velocity on TeleportWithMomentumMelanie2012-04-181-1/+11
| | * | Allow scripts in attachments owned by the NPC to control the NPCMelanie2012-04-181-1/+7
| | * | Prevent objects rezzed in sim from being seen as attachments and becoming une...Melanie2012-04-172-0/+8
| * | | ubitODE still retouching character pidUbitUmarov2012-04-181-2/+2
| * | | ubitODE - retouch character PIDsUbitUmarov2012-04-181-4/+4
| * | | ubitODE: prims - update managed dinamic parameters from unmanaged at ODE rate...UbitUmarov2012-04-171-78/+46
| * | | ubitODE: - character managed ode was only getting position etc from unmanaged...UbitUmarov2012-04-172-119/+48
| * | | ubitODE: - made avatar/ground collision pid servo a bit softer since seems a ...UbitUmarov2012-04-172-6/+7
* | | | 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-188-2/+1528
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-185-1/+1469
| |\ \ \
| | * | | 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
| | * | | 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-179-135/+72
|\ \ \ \ | |/ / /
| * | | 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-177-12/+12
| * | | 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