aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix phantom and temp flags not takingMelanie2011-12-061-2/+2
* Merge branch 'master' into bigmergeMelanie2011-11-141-24/+0
|\
| * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-111-24/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-101-1/+6
|\ \ | |/
| * Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant propert...Dan Lake2011-11-101-1/+6
* | Merge branch 'master' into bigmergeMelanie2011-11-101-10/+15
|\ \ | |/
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-101-1/+1
| |\
| * | When updating SOG, a physics taint should not override a full update with a t...Dan Lake2011-11-101-10/+15
* | | Merge branch 'master' into bigmergeMelanie2011-11-101-1/+1
|\ \ \ | | |/ | |/|
| * | minor: Correct misleading method doc on SOG.UpdateRootRotation()Justin Clark-Casey (justincc)2011-11-091-1/+1
| |/
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+1
|\ \ | |/
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-051-1/+0
|\ \ | |/
| * Don't rotate child prims, if only the root prim is rotated.nebadon2011-11-051-2/+2
| * Replacing te linking code with the code from Avination. Link sets prims are nowMelanie2011-11-051-35/+11
* | Merge branch 'master' into bigmergeMelanie2011-11-041-1/+1
|\ \ | |/
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-031-1/+1
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-031-1/+1
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-021-4/+4
|\ \
| * \ Merge branch 'master' into bigmergeMelanie2011-11-031-4/+4
| |\ \ | | |/
| | * Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-021-3/+3
* | | Fix link order when linking sets to setsMelanie2011-11-021-39/+11
|/ /
* | Merge branch 'master' into bigmergeMelanie2011-10-301-19/+14
|\ \ | |/
| * Remove completely unused SOG.Rotation parameterJustin Clark-Casey (justincc)2011-10-291-8/+0
| * 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 commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
* | MergeMelanie2011-10-251-1/+1
* | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * remove now redundant m_physical_prim flag from SOP.ApplyPhysics()Justin Clark-Casey (justincc)2011-10-151-2/+2
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-121-20/+17
|\ \
| * \ Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmergeMelanie2011-10-111-7/+0
| |\ \ | | |/
| | * Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-011-7/+0
| * | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmergeMelanie2011-10-111-0/+8
| |\ \ | | |/
| | * Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ar...Snoopy Pfeffer2011-09-251-1/+5
| * | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-111-1/+1
| |\ \ | | |/
| | * Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-221-1/+1
| * | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-12/+8
| |\ \ | | |/
| | * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle...Justin Clark-Casey (justincc)2011-09-151-12/+8
* | | Merge branch 'careminster-presence-refactor' into bigmergeMelanie2011-10-061-2/+6
|\ \ \ | |/ / |/| |
| * | Fix physics proxy position when linking and rotating the root prim onlyMelanie2011-10-061-2/+6
* | | Merge fixes, and fix the buildTom2011-09-141-105/+61
* | | First set of merge fixesTom2011-09-071-61/+26
* | | Now merging the core changes.Tom2011-09-041-421/+444
* | | Change of tactic. Reverting this to the careminster version, then i'll select...Tom2011-09-041-635/+1117
* | | I fucked up the merge for SOG, so reverting back to OpenSim Core's version...Tom2011-09-041-1005/+255
* | | Resolve merge commits, stage 1Tom2011-09-041-264/+532
|\ \ \ | |/ / |/| / | |/
| * Go back to resetting the State parameter for all parts of a SOG when SOG.Clea...Justin Clark-Casey (justincc)2011-09-021-0/+6
| * Eliminate pointless checks of SOG.RootPart != nullJustin Clark-Casey (justincc)2011-09-011-124/+70
| * add Name property to ISceneEntityJustin Clark-Casey (justincc)2011-08-301-2/+5