aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-211-9/+35
|\
| * Materials-capable viewers send ImageUpdate packets when updating materials th...dahlia2013-04-191-11/+35
| * Allow changes to TextureEntry to propagate to viewers when MaterialID changesdahlia2013-04-171-0/+2
* | Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminsterMelanie2013-04-041-11/+2
|\ \ | |/
| * Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent val...Justin Clark-Casey (justincc)2013-04-031-11/+2
* | Merge branch 'master' into careminsterMelanie2013-04-021-5/+6
|\ \ | |/
| * Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than...Justin Clark-Casey (justincc)2013-04-031-5/+6
* | Merge branch 'master' into careminsterMelanie2013-04-021-1/+1
|\ \ | |/
| * fix minor race condition in SOP.SitTargetPositionLL where inconsistency could...Justin Clark-Casey (justincc)2013-04-031-1/+1
* | Merge branch 'master' into careminsterMelanie2013-04-021-7/+7
|\ \ | |/
| * minor: Make SOP.UpdateOffset() more consistent by checking against the same o...Justin Clark-Casey (justincc)2013-04-031-7/+7
| * Fix minor race condition where SOP.GetGeometricCenter() and GetCenterOfMass()...Justin Clark-Casey (justincc)2013-04-021-4/+4
| * Export permission, part two. Setting export perms for textures and clothing w...Melanie2013-03-311-7/+22
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-311-0/+4
|\ \
| * \ Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminsterMelanie2013-03-291-0/+4
| |\ \ | | |/
| | * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scrip...Justin Clark-Casey (justincc)2013-03-291-0/+4
| | * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+1
* | | Export permission, part two. Setting export perms for textures and clothing w...Melanie2013-03-311-7/+22
|/ /
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
* | Merge branch 'master' into careminsterMelanie2013-03-141-0/+21
|\ \ | |/
| * Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this...Justin Clark-Casey (justincc)2013-03-131-1/+0
| * Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-131-0/+22
* | Merge branch 'master' into careminsterMelanie2013-03-111-0/+17
|\ \ | |/
| * * Apparently, sometimes texture entries come in from the wire with no default...teravus2013-03-081-0/+17
* | * Separate two if trees that got merged into one if tree with borked logic.teravus2013-03-061-2/+25
* | Merge branch 'master' into careminsterMelanie2013-02-151-1/+5
|\ \ | |/
| * Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-141-0/+2
* | Merge branch 'master' into careminsterMelanie2013-02-071-0/+20
|\ \ | |/
| * Actually plumb the new values to physics.Melanie2013-02-071-0/+20
| * Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-071-37/+152
| * Plumb the path from the client to the extra physics params and backMelanie2013-02-071-0/+1
| * Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-071-50/+6
| * Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-071-6/+50
| * Rename "Bounciness" to "Restitution"Melanie2013-02-071-3/+3
| * Partial port of Avination's support for the new physics parameters.Melanie2013-02-061-3/+93
* | Rename Bounciness to RestitutionMelanie2013-02-071-3/+3
* | Merge branch 'master' into careminsterMelanie2013-02-061-1/+1
|\ \ | |/
| * Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-061-1/+1
* | Merge branch 'master' into careminsterMelanie2013-02-051-0/+9
|\ \ | |/
| * Added DynAttrs to the serialized XML format of prims. When copying prims, use...Oren Hurvitz2013-01-251-0/+2
| * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting fr...Justin Clark-Casey (justincc)2013-01-251-2/+2
| * Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2013-01-251-1/+8
* | Merge branch 'master' into careminsterMelanie2013-01-251-0/+1
|\ \ | |/
| * * This makes the non-physics llCastRay 'better'. It's not 'correctly work...teravus2013-01-231-0/+1
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-01-231-1/+1
|\ \
| * \ Merge branch 'avination'Melanie2013-01-191-1/+1
| |\ \
| | * | dont send a full grp update on stopmovetotarget. just a rootpart terseUbitUmarov2013-01-161-1/+1
* | | | Merge branch 'master' into careminsterMelanie2013-01-231-12/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenterRobert Adams2013-01-211-0/+10
* | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-161-3/+3
|\ \ \ | |/ /