aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* remove sceneGraph MoveObject and make it part of ProcessObjectGrabUpdate ( ↵UbitUmarov2016-08-211-2/+2
| | | | scene.PacketHandlers) where it belongs
* remove more code related to Mega regionsUbitUmarov2016-07-281-37/+34
|
* add missing prim count for statsUbitUmarov2016-07-131-0/+8
|
* scale down position X and Y acording to region size on sending coarse ↵UbitUmarov2016-07-031-2/+17
| | | | Updates. Viewers need to scale up by same amount.
* Mantis #7878 -- Landmarks were not being created in HGSuitcaseInventoryDiva Canto2016-05-161-0/+1
|
* Mantis #7765: Add new ClampNegativeZ option. Defaults to false to restore ↵Melanie Thielker2015-11-261-2/+4
| | | | | | prior functionality. Avination code wasn't designed for deep building.
* dont find parts of groups marked as DeletedUbitUmarov2015-11-161-1/+1
|
* Make physics engines finish internal representation of loaded prims before ↵UbitUmarov2015-10-221-0/+6
| | | | starting simulation so it does start for all at same time. Currently only in use by ubOde
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-5/+10
|\ | | | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
| * In SceneGraph, use the property PhysicsScene instead of the variable ↵Diva Canto2015-09-041-3/+3
| | | | | | | | _PhysScene, so that it gets properly initialized before being dereferenced.
| * First commit where physics work as region module.Diva Canto2015-08-311-1/+6
| | | | | | | | | | Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader. Removed call to PhysicsPluginManager.
| * More namespace and dll name changes. Still no functional changes.Diva Canto2015-08-301-1/+1
| |
| * Renamed the namespaces tooDiva Canto2015-08-301-1/+1
| |
* | seems to compile ( tests comented out)UbitUmarov2015-09-021-58/+2
| |
* | bad merge?UbitUmarov2015-09-011-130/+366
|\ \ | |/ |/|
| * some code reorder/minor changesUbitUmarov2014-10-251-50/+40
| |
| * debug show stack traceUbitUmarov2014-09-221-1/+1
| |
| * a few more changes on link/unlinkUbitUmarov2014-09-221-10/+7
| |
| * same in a few more spotsUbitUmarov2014-09-221-3/+10
| |
| * send to world or backup, after setting finding informationUbitUmarov2014-09-221-4/+6
| |
| * update scenegraph group find by part information in sog link, so script ↵UbitUmarov2014-09-221-3/+18
| | | | | | | | link functions do update that also.
| * limit number of prims on physical objects. Not all cases covered stillUbitUmarov2014-09-081-1/+9
| |
| * Merge branch 'master' into careminsterMelanie2013-09-011-28/+6
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * \ Merge branch 'master' into careminsterMelanie2012-10-261-0/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * \ \ Merge branch 'avination' into careminsterMelanie2012-10-171-0/+2
| |\ \ \
| | * | | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | of the link set to make the build floater behave consistently. Fixes permissions exploit introduced on 23 August.
| * | | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-08-181-6/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | | | | Remove AreUpdatesSuspended flag because it does nothingMelanie2012-08-161-7/+0
| | | | | |
| * | | | | Change case of areUpdatesSuspended to upper case as is proper for a propertyMelanie2012-08-161-7/+7
| | | | | |
| * | | | | Merge branch 'master' into careminsterMelanie2012-07-201-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-07-111-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| | * | | | | | Melanie fix: detach SOGs from backup on linkingUbitUmarov2012-07-111-0/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-07-111-8/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-07-061-2/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | | | | fix SceneGraph Add/Remove PhysicalPrim countersUbitUmarov2012-06-211-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into careminsterMelanie2012-06-081-6/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-06-061-1/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | | | | | fix the real cause of double velocityUbitUmarov2012-06-051-1/+0
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into careminsterMelanie2012-05-191-5/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-091-10/+15
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-081-0/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix moving no-mod objects. Fixes a regression introduced with the undo fixMelanie2012-05-071-0/+27
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | careminster
| | * | | | | | | | | | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more lobe ?
| * | | | | | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-201-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | careminster
| | * | | | | | | | | | changed - VolumeDetect and phantom setting interaction. Script VD(true) ↵UbitUmarov2012-04-191-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics.
| * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-181-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-031-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-311-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
generated by cgit v1.1 at 2024-12-20 16:48:40 +0000