aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-055-32/+25
|\
| * add myself to the contributors.txtnebadon2011-11-051-0/+1
| * Fix avatar height, removes the hip offset hacknebadon2011-11-052-27/+12
| * Multiple lines in welcome message use '\n' in the welcome message tonebadon2011-11-051-0/+3
| * add Mana Janus and SpotOn3D to contributors.txt last patch was courtesynebadon2011-11-051-0/+2
| * Don't rotate child prims, if only the root prim is rotated.nebadon2011-11-051-2/+2
| * refactor: In sit code, compare against Vector3.Zero and Quaternion.Identity i...Justin Clark-Casey (justincc)2011-11-051-12/+12
* | Merge branch 'master' into bigmergeMelanie2011-11-056-8/+55
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-052-36/+12
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-052-1/+4
| | |\
| * | | Fix NPC sitting for prims without a sit target.Justin Clark-Casey (justincc)2011-11-054-14/+61
| | |/ | |/|
| * | Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPr...Justin Clark-Casey (justincc)2011-11-042-1/+4
* | | Merge branch 'master' into bigmergeMelanie2011-11-050-0/+0
|\ \ \ | | |/ | |/|
| * | Replacing te linking code with the code from Avination. Link sets prims are nowMelanie2011-11-052-36/+12
| |/
* | Merge branch 'master' into bigmergeMelanie2011-11-042-4/+28
|\ \ | |/
| * On standup, trigger the changed link script event after the avatar has been f...Justin Clark-Casey (justincc)2011-11-041-2/+3
| * Stop llPushObject() from causing problems by adding force via a taint rather ...Justin Clark-Casey (justincc)2011-11-041-2/+25
* | Merge branch 'master' into bigmergeMelanie2011-11-0427-238/+429
|\ \ | |/
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-0316-35/+35
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-0323-154/+121
| * remove the pointless check of the face texture struct against null in Bot.Obj...Justin Clark-Casey (justincc)2011-11-031-3/+1
| * actually remove the sleep from PhysicsBehaviour that I shifted to Bot a coupl...Justin Clark-Casey (justincc)2011-11-031-2/+0
| * Rename PhysicsBot => Bot since it doesn't just exercise physics anymoreJustin Clark-Casey (justincc)2011-11-035-12/+12
| * Move one of the old physics sleeps out into the main bot loop, so leaving out...Justin Clark-Casey (justincc)2011-11-031-0/+2
| * Add click/grab behaviour to pCampbot, which gets bots to randomly click things.Justin Clark-Casey (justincc)2011-11-036-8/+106
| * Move PhysicsBehaviour into a spearate behaviours folderJustin Clark-Casey (justincc)2011-11-033-3/+2
| * Separate out physics testing actions into a separate PhysicsBehaviour classJustin Clark-Casey (justincc)2011-11-035-95/+221
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-0316-116/+115
| |\
| | * Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer sizeMic Bowman2011-11-021-1/+1
| * | Change default say distance to 20m from 30m, the same as on the big grid. Th...Justin Clark-Casey (justincc)2011-11-024-6/+6
* | | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ \ | | |/ | |/|
| * | Revert "fix CopyTo call that was breaking under mono 2.10"Melanie2011-11-031-1/+1
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-0216-114/+121
|\ \ \
| * \ \ Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-11-024-23/+37
| | |\ \
| | * | | fix CopyTo call that was breaking under mono 2.10Mic Bowman2011-11-021-1/+1
| * | | | Merge branch 'master' into bigmergeMelanie2011-11-0315-113/+120
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-0215-107/+117
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-026-330/+402
| | | |\ \ | | | | |/
| | | | * Get some hopefully more useful exception information when OpenJPEG.EncodeFrom...Justin Clark-Casey (justincc)2011-11-022-5/+8
| | | | * Fix race condition that would sometimes send or save appearance for the wrong...Justin Clark-Casey (justincc)2011-11-022-9/+24
| | | | * Catch any exceptions exiting the top of the robust console, as we already do ...Justin Clark-Casey (justincc)2011-11-021-1/+8
| | | * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-0211-92/+77
| * | | | Merge branch 'master' into bigmergeMelanie2011-11-020-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Port the Avination offline messaging system to CoreMelanie2011-11-024-23/+37
| | | |/ | | |/|
* | | | Fix link order when linking sets to setsMelanie2011-11-022-40/+18
|/ / /
* | | Merge branch 'master' into bigmergeMelanie2011-11-021-322/+350
|\ \ \ | |/ /
| * | Restore the recursive calling of PRIM_LINK_TARGET because the version I madeMelanie2011-11-021-327/+334
| * | Some positioning fixes from AVN trunkMelanie2011-11-021-1/+42
* | | Merge branch 'master' into bigmergeMelanie2011-11-022-6/+1
|\ \ \ | |/ /