aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Replace our patched up, broken an rebroken sit code with the code fromMelanie2011-11-051-303/+106
* Merge branch 'master' into bigmergeMelanie2011-11-052-8/+7
|\
| * Fix avatar height, removes the hip offset hacknebadon2011-11-051-3/+0
| * 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-052-4/+11
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-052-36/+12
| |\
| | * Replacing te linking code with the code from Avination. Link sets prims are nowMelanie2011-11-052-36/+12
| * | Fix NPC sitting for prims without a sit target.Justin Clark-Casey (justincc)2011-11-052-11/+21
| |/
* | Merge branch 'master' into bigmergeMelanie2011-11-041-2/+3
|\ \ | |/
| * On standup, trigger the changed link script event after the avatar has been f...Justin Clark-Casey (justincc)2011-11-041-2/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-046-56/+48
|\ \ | |/
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-035-13/+13
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-036-63/+55
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-027-82/+73
|\ \
| * \ Merge branch 'master' into bigmergeMelanie2011-11-037-82/+73
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-027-76/+69
| | |\
| | | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-021-2/+3
| | | |\
| | | | * Fix race condition that would sometimes send or save appearance for the wrong...Justin Clark-Casey (justincc)2011-11-021-2/+3
| | | * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-027-74/+66
| | | |/
| | * | Port the Avination offline messaging system to CoreMelanie2011-11-021-1/+1
| | |/
* | | Fix link order when linking sets to setsMelanie2011-11-022-40/+18
|/ /
* | Merge branch 'master' into bigmergeMelanie2011-11-021-5/+0
|\ \ | |/
| * Removed redundant SceneContents property from Scene. It's the same as SceneGr...Dan Lake2011-11-011-5/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-021-10/+7
|\ \ | |/
| * Part 2 of see_into_this_sim_from_neighbor configuration option removalDan Lake2011-11-011-10/+7
* | Merge branch 'master' into bigmergeMelanie2011-11-014-62/+4
|\ \ | |/
| * Removed see_into_this_sim_from_neighbor configuration option.Dan Lake2011-11-012-11/+1
| * Add "appearance send" command to allow manual sending of appearance.Justin Clark-Casey (justincc)2011-11-011-3/+3
| * Removed unused show commands from Scene.cs and SceneBase.cs. The show modules...Dan Lake2011-10-312-48/+0
* | Merge branch 'master' into bigmergeMelanie2011-10-311-27/+25
|\ \ | |/
| * Fix line endingsDan Lake2011-10-301-23/+23
| * Experimental reorder of Heartbeat loop now simulates physics and sends update...Dan Lake2011-10-301-29/+27
* | Merge branch 'master' into bigmergeMelanie2011-10-306-66/+62
|\ \ | |/
| * Remove the SyncRoot locking from Scene which was only being done around the m...Justin Clark-Casey (justincc)2011-10-293-32/+18
| * Remove completely unused SOG.Rotation parameterJustin Clark-Casey (justincc)2011-10-292-17/+9
| * set grp.RootPart.GroupPosition for code consistency (and readability) rather ...Justin Clark-Casey (justincc)2011-10-281-5/+0
| * Add missing doc to rotation/position methods in SOGJustin Clark-Casey (justincc)2011-10-281-5/+5
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-285-71/+76
| |\
| * | fetch SOP.RotationOffset once in UpdateRotation() and compare rather than fet...Justin Clark-Casey (justincc)2011-10-282-6/+21
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-275-71/+78
|\ \ \
| * \ \ Merge branch 'master' into bigmergeMelanie2011-10-275-71/+78
| |\ \ \ | | | |/ | | |/|
| | * | Continuation of previous checkin. Found more places where ForEachScenePresenc...Dan Lake2011-10-272-36/+26
| | * | Added new ForEachRootScenePresence to Scene since almost every delegate passe...Dan Lake2011-10-273-35/+50
| | |/
| | * Fix a bug I introduced yesterday in ODE physics where prim scripts would only...Justin Clark-Casey (justincc)2011-10-271-0/+2
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-264-12/+8
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-10-261-1/+1
| |\ \ | | |/
| * | Merge branch 'master' into bigmergeMelanie2011-10-263-11/+7
| |\ \ | | |/
| | * Get rid of the pointless null checks on collision listeners. Add warning abo...Justin Clark-Casey (justincc)2011-10-252-7/+0
| | * For ScenePresence collision events, instead of creating a new CollisionEvents...Justin Clark-Casey (justincc)2011-10-251-4/+6