aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-101-2/+2
|\
| * move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-301-2/+2
* | Merge branch 'avination' into careminsterMelanie2012-08-311-1/+7
|\ \ | |/
| * [possible still bad] make use of keyframemotion.copy on sop.copy, replacingUbitUmarov2012-08-301-0/+3
| * [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-281-1/+4
* | Merge branch 'avination' into careminsterMelanie2012-08-241-0/+21
|\ \ | |/
| * Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-231-0/+21
* | Merge branch 'master' into careminsterMelanie2012-08-231-13/+30
|\ \
| * | refactoring out SetFaceColorSignpostMarv2012-08-201-52/+15
| * | making use of implicit operators and Util.Clip handling of Vector3SignpostMarv2012-08-201-21/+26
| * | single operation for PRIM_COLORSignpostMarv2012-08-201-0/+49
| * | fix typoSignpostMarv2012-08-201-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-08-181-8/+58
|\ \ \ | |/ / | | / | |/ |/|
| * fixing bug that get/set the wrong property for prim types other than sphere &...SignpostMarv2012-08-171-1/+2
| * implementedSignpostMarv2012-08-171-0/+50
| * Correct an exception report in SceneObjectPart so it outputs the stack.Robert Adams2012-08-151-1/+1
| * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-151-7/+6
* | Merge branch 'master' into careminsterMelanie2012-08-031-1/+1
|\ \ | |/
| * ImprovedTerseObjectUpdate packet does not support shape updates, thus schedul...SignpostMarv2012-08-031-1/+1
* | Merge branch 'avination' into ubitworkUbitUmarov2012-07-171-29/+171
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-07-121-8/+19
| |\ \ | | |/
| | * Many explanitory comments added to the link and delink code inRobert Adams2012-07-111-8/+20
| * | Merge branch 'avination' into careminsterMelanie2012-07-111-22/+57
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-07-111-7/+122
| |\ \ \ | | | |/ | | |/|
| | * | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ...Justin Clark-Casey (justincc)2012-07-101-0/+6
| | * | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-101-6/+1
| | * | refactor: Add SOP.IsSitTargetOccupied to improve readabilityJustin Clark-Casey (justincc)2012-07-101-1/+6
| | * | Move common code to detect whether a part has a valid sit target into a SOP p...Justin Clark-Casey (justincc)2012-07-101-0/+15
| | * | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ava...Justin Clark-Casey (justincc)2012-07-101-2/+12
| | * | Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-091-7/+91
| * | | Merge branch 'avination' into careminsterMelanie2012-07-061-28/+56
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-06-211-3/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() ...Justin Clark-Casey (justincc)2012-06-201-2/+3
| | * | | minor: If logging because mesh/sculpt data isn't present for an object, log o...Justin Clark-Casey (justincc)2012-06-201-1/+1
| * | | | Merge branch 'master' into careminsterMelanie2012-06-141-2/+3
| |\ \ \ \ | | |/ / /
| | * | | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment p...Justin Clark-Casey (justincc)2012-06-141-2/+3
| * | | | Merge branch 'avination' into careminsterMelanie2012-06-061-7/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-311-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-311-9/+9
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Fix collision filtering. The filter should be checked on the receiving part!Melanie2012-05-291-9/+9
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-05-271-22/+86
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-171-5/+40
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-161-1/+12
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-151-501/+184
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix issue where loading OARs could sometimes result in link numbers being reo...Justin Clark-Casey (justincc)2012-05-151-1/+12
| * | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-05-151-50/+124
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-151-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Guard against null root part on SQLite. This really needs to be fixed so SQLiteMelanie2012-05-151-1/+1
| | * | | | | | | | | Try to fix sqlite breakageMelanie2012-05-151-0/+3
| | * | | | | | | | | Port Avination's collision fixes to core.Melanie2012-05-151-501/+181
| | | |/ / / / / / / | | |/| | | | | | |