aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* send updates on selected attachments as sl ( warinin if reverted then aUbitUmarov2014-07-221-3/+3
| | | | fix is needed elsewhere since the changes are never sent)
* physics engine cannot change internal positions of linksets, at least notUbitUmarov2014-07-201-2/+2
| | | | in teaseupdates
* replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-201-3/+0
| | | | artifacts
* Merge branch 'master' into careminsterMelanie2014-01-281-0/+58
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Refactored setting permissions when rezzing items: use the same function ↵Oren Hurvitz2014-01-101-0/+58
| | | | | | | | | | | | when rezzing from user inventory and prim inventory. Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
| * Remove unused sp.ParentPosition, which has not been used for some timeJustin Clark-Casey (justincc)2013-11-291-10/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-11-231-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | Merge branch 'master' into careminsterMelanie2013-11-031-1/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * After finishing to edit an attachment, let other avatars see the changes. ↵Oren Hurvitz2013-10-171-1/+2
| | | | | | | | (The changes weren't visible before because updates to attachments aren't sent while the attachment is selected.)
* | Merge branch 'master' into careminsterMelanie2013-10-041-0/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: remove chatty debug message from previous commit.Robert Adams2013-09-111-3/+3
| |
| * BulletSim: add position and rotation update for child prim physics update ↵Robert Adams2013-09-111-0/+20
| | | | | | | | events. Normally, physics engines do not return updates for child prims so, under normal operation, this code should never execute. Will only be used when using flexible linkset linkages.
| * Change collision logic in SceneObjectPart so land_collision will happen.Robert Adams2013-09-091-6/+3
| | | | | | | | | | The previous logic would generate land_collision_start and land_collision_end but would not generate the land_collision itself.
* | Merge branch 'master' into careminsterMelanie2013-09-011-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * * Fix some threading issues in BulletXNA (the managed bullet library), this ↵teravus2013-08-201-2/+3
| | | | | | | | | | | | should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs. * Fixed a null ref during shutdown.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-07-181-2/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * \ Merge branch 'master' into careminsterMelanie2013-07-131-8/+12
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
| * | Merge branch 'master' into careminsterMelanie2013-07-131-27/+50
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
* | \ \ Merge branch 'master' into careminsterMelanie2013-07-181-0/+4
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * | Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() ↵Justin Clark-Casey (justincc)2013-07-131-8/+12
| |/ | | | | | | | | | | | | | | in order to avoid a race condition. A separate PhysicsActor variable is used in case some other thread removes the PhysicsActor whilst this code is executing. If this is now impossible please revert - just adding this now whilst I remember. Also makes method comment into proper method doc.
| * Centralize duplicated code in SceneObjectPart for subscribing toRobert Adams2013-07-111-54/+43
| | | | | | | | | | collision events. Improve logic for knowing when to add processing routine to physics actor.
| * minor: remove mono compiler warnings related to keyframe codeJustin Clark-Casey (justincc)2013-07-081-2/+0
| |
| * Try to normalize the creatorData of scene object parts with the trailing ↵Diva Canto2013-07-061-0/+4
| | | | | | | | '/'. What a nightmare this '/' is!
* | Merge branch 'master' into careminsterMelanie2013-06-111-2/+3
|\ \ | |/
| * * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ↵teravus2013-06-111-2/+3
| | | | | | | | | | | | | | there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this. * Has a prim table migration.. that might take a while, hold on to your hats. * Fixes a null-ref when shutting down while keyframed motion is active.
| * Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-061-0/+15
| | | | | | | | may yield unexpected results in some cases. No database persistence yet,
* | Merge branch 'master' into careminsterMelanie2013-05-241-0/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
| * Fix issue where llSetPayPrice on either one of a clone prim in the same ↵Justin Clark-Casey (justincc)2013-05-241-0/+2
| | | | | | | | | | | | | | OpenSimulator session would change the prices on both prims. This is because the PayPrice array refernence was being memberwise cloned and not the array itself. Addresses http://opensimulator.org/mantis/view.php?id=6639
* | Merge branch 'master' into careminsterMelanie2013-05-241-0/+7
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Implement llSetSoundQueueing().Justin Clark-Casey (justincc)2013-05-221-1/+9
| | | | | | | | | | | | This is controlled by the viewer, not the server. So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim. You probably need to use llPreloadSound() for best results
* | 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"
generated by cgit v1.1 at 2025-01-04 12:11:02 +0000