aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Some more changes to catch up with coreMelanie2011-11-051-71/+49
* Remove unused and broken OffsetRotation from ScenePresenceMelanie2011-11-052-30/+5
* Some trivial changes to get closer to coreMelanie2011-11-051-12/+5
* Change comment formatting to match core for a cleaner diffMelanie2011-11-051-23/+23
* 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-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
| | |\
| | * | 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-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-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-0416-125/+95
|\ \ | |/
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-0315-34/+34
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-0322-153/+120
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-0314-110/+114
| |\
| * | Change default say distance to 20m from 30m, the same as on the big grid. Th...Justin Clark-Casey (justincc)2011-11-022-2/+2
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-0213-107/+112
|\ \ \
| * \ \ Merge branch 'master' into bigmergeMelanie2011-11-0313-107/+112
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-0213-101/+109
| | |\ \
| | | * \ Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-025-329/+394
| | | |\ \ | | | | |/
| | | | * 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
| | | * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-0210-87/+77
| | * | | 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
|\ \ \ | |/ /
| * | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenarioMelanie2011-11-021-4/+3
| |/
| * Removed redundant SceneContents property from Scene. It's the same as SceneGr...Dan Lake2011-11-012-6/+1
* | 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-017-64/+36
|\ \ | |/
| * 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-012-4/+21
| * Removed unused show commands from Scene.cs and SceneBase.cs. The show modules...Dan Lake2011-10-313-48/+13
| * Adding green dots to map response should be for root agents onlyDan Lake2011-10-311-1/+1
* | 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-3010-139/+125
|\ \ | |/
| * Remove the SyncRoot locking from Scene which was only being done around the m...Justin Clark-Casey (justincc)2011-10-293-32/+18