aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-211-9/+35
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| * Materials-capable viewers send ImageUpdate packets when updating materials ↵dahlia2013-04-191-11/+35
| | | | | | | | that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed.
| * 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 ↵Justin Clark-Casey (justincc)2013-04-031-11/+2
| | | | | | | | values could be returned if the sit orientation was changed whilst the property was being fetched.
* | Merge branch 'master' into careminsterMelanie2013-04-021-5/+6
|\ \ | |/
| * Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather ↵Justin Clark-Casey (justincc)2013-04-031-5/+6
| | | | | | | | than one that could change whilst the method is being executed.
* | Merge branch 'master' into careminsterMelanie2013-04-021-1/+1
|\ \ | |/
| * fix minor race condition in SOP.SitTargetPositionLL where inconsistency ↵Justin Clark-Casey (justincc)2013-04-031-1/+1
| | | | | | | | could occur if the sit target position changed whilst the property was fetched
* | Merge branch 'master' into careminsterMelanie2013-04-021-7/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * minor: Make SOP.UpdateOffset() more consistent by checking against the same ↵Justin Clark-Casey (justincc)2013-04-031-7/+7
| | | | | | | | old OffsetPosition rather than one which may vary if it simultaneously changes.
| * Fix minor race condition where SOP.GetGeometricCenter() and ↵Justin Clark-Casey (justincc)2013-04-021-4/+4
| | | | | | | | | | | | GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running No need to create new Vector3s since these are structs.
| * Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-311-7/+22
| | | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-311-0/+4
|\ \
| * \ Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminsterMelanie2013-03-291-0/+4
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| | * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for ↵Justin Clark-Casey (justincc)2013-03-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | scripts in attachments. This was because the script resumption in AttachmentsModule was firing the attach event instead. Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal. This is to resolve http://opensimulator.org/mantis/view.php?id=6578
| | * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+1
| | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | | Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-311-7/+22
|/ / | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' into careminsterMelanie2013-03-141-0/+21
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since ↵Justin Clark-Casey (justincc)2013-03-131-1/+0
| | | | | | | | this is being done lazily
| * Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-131-0/+22
| | | | | | | | | | | | | | | | | | This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes. This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes. This commit adds a DOExampleModule to demonstrate/evolve this code. Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap. DOExampleModule in this commit only attaches a fresh dynamic object. Actually constructing this from stored dynamic attributes and handling persistence is left for later. These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
* | Merge branch 'master' into careminsterMelanie2013-03-111-0/+17
|\ \ | |/
| * * Apparently, sometimes texture entries come in from the wire with no ↵teravus2013-03-081-0/+17
| | | | | | | | default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception.
* | * 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
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-141-0/+2
| | | | | | | | from the physical scene. Invocations added in SceneObjectPart.
* | 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
| | | | | | | | to work with the new params. Not actually plumbed just yet.
| * 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
| | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a.
| * Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-071-6/+50
| | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart.
| * 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
| | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset.
* | 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
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Added DynAttrs to the serialized XML format of prims. When copying prims, ↵Oren Hurvitz2013-01-251-0/+2
| | | | | | | | use deep copy for DynAttrs.
| * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-251-2/+2
| | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| * 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
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * * This makes the non-physics llCastRay 'better'. It's not 'correctly ↵teravus2013-01-231-0/+1
| | | | | | | | working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-01-231-1/+1
|\ \ | | | | | | | | | careminster
| * \ Merge branch 'avination'Melanie2013-01-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| | * | 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
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * | Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenterRobert Adams2013-01-211-0/+10
| | | | | | | | | | | | | | | routines on the physics engine. Won't make a difference for any existing scripts since ODE always returned Vector3.Zero.
* | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-161-3/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
generated by cgit v1.1 at 2024-12-25 09:42:20 +0000