aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-293-37/+136
|\
| * Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-283-57/+143
| |\
| | * make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| | |
| * | Fix a possible NREMelanie2012-09-281-3/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-2916-1403/+2222
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an ↵Justin Clark-Casey (justincc)2012-09-292-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | object is attached from the scene. Enables previously disabled regression test. Based on SingpostMarv's patch in http://opensimulator.org/mantis/view.php?id=6302 but I prefer a simpler approach that does not expose a resume scripts option right now.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-2913-1372/+2150
| |\ \ \
| | * | | BulletSim: remember to release the physical body and shape when a prim is ↵Robert Adams2012-09-282-16/+16
| | | | | | | | | | | | | | | | | | | | destroyed. This fixes many problems with physical linksets.
| | * | | BulletSim: add separate runtime and taint-time linkset children lists to ↵Robert Adams2012-09-273-80/+93
| | | | | | | | | | | | | | | | | | | | keep the creation of constraints separate from runtime.
| | * | | BulletSim: rename some constraint variables to be consistant with other name ↵Robert Adams2012-09-277-116/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use. Added callbacks for shape and body changes in GetBodyAndShape() so the linkset constraints can be picked up and restored. A better design might be to have a "prim shape changed" event. Think about that. Added constraint types to general constraint class.
| | * | | BulletSim: remove the trailing spaces from lines to make git happierRobert Adams2012-09-2710-276/+275
| | | | |
| | * | | BulletSim: remove the unused body management code from BSPrim. There is no ↵Robert Adams2012-09-271-374/+0
| | | | | | | | | | | | | | | | | | | | going back now.
| | * | | BulletSim: Fix linkset crash. Caused by the different body and shapeRobert Adams2012-09-279-94/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointers at runtime and at taint-time. Now passes the body into the taint. Vehicles zero inertia when active to eliminate Bullet's contribution to vehicle motion.
| | * | | BulletSim: Terrain sets proper collision flags on creation.Robert Adams2012-09-274-52/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static objects are set to ISLAND_SLEEPING rather than DISABLE_SIMULATION. Might reconsider this and, alternatively, have dynamic objects force activation. Clean up use of DetailLog().
| | * | | BulletSim: btGhostObjects working to make 'volume detect' work.Robert Adams2012-09-277-191/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrangement and cleanup of shape collection code. Much more readable. Enabling and use of collision filters and masks. Addition of ID to body creation BulletSimAPI calls so always set in shape for collision reporting. Change default of ShouldSplitSimulationIslands and ShouldRandomizeSolverOrder from 'false' to 'true'. When 'false', this suppresses NO_CONTACT_RESPONSE which makes volume detect fail.
| | * | | BulletSim: renamed members of BulletShape, BulletSim and BulletBodyRobert Adams2012-09-2711-270/+482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so the members case is consistant. Caused modifications everywhere. New logic in BSShapeCollection to track use and sharing of shapes. I just reslized, though, that shapes cannot be shared because the shape's UserPointer is the localID of the prim and is required for tracking collisions. More changes coming. Added DuplicateCollisionShape2() to API and changed BuildNativeShape2 to take a ShapeData structure so don't have to pass so many parameters. This matches the latest version of BulletSim.dll. Additions and removal of DetailLog() statements for debugging.
| | * | | BulletSim: fix regression that caused cylindar shapes to have a box ↵Robert Adams2012-09-271-1/+9
| | | | | | | | | | | | | | | | | | | | collision shape
| | * | | BulletSim: complete code for managed code shape and body tracking. Not debugged.Robert Adams2012-09-275-130/+675
| | | | | | | | | | | | | | | | | | | | | | | | | Eliminate some null exceptions created adding the above code. Add and remove some detailed logging statements.
| | * | | BulletSim: add class and infrastructure for shape and objectRobert Adams2012-09-275-39/+192
| | | | | | | | | | | | | | | | | | | | | | | | | tracking in the C# code. Needed for the changing body type (to and from GhostObjects) for volumeDetect.
| | * | | BulletSim: Convert BSCharacter to use common BSPhysObject code and variables.Robert Adams2012-09-275-117/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix avatar height calculation to properly account for the capsule ends. Rearrange some locking in TerrainManager to eliminate possible race conditions. Move DetailLog() definition into common BSPhysObject class. Some variable renaming to make usage clearer (refactor.rename makes this so easy).
| | * | | BulletSim: move a bunch of common logic out of BSPrim and BSCharacterRobert Adams2012-09-277-416/+361
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and into the parent class BSPhysObject. Rework collision logic to enable extra collision after done colliding. Rename 'Scene' to 'PhysicsScene' to differentiate it from the simulator 'Scene'.
| * | | | Extend attachment regression test to check for appropriate attach event firing.Justin Clark-Casey (justincc)2012-09-291-25/+49
| |/ / / | | | | | | | | | | | | | | | | This reveals that the event is not being fired when an object is attached from ground, which is incorrect. This check is temporairly disabled.
| * | | Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent ↵Justin Clark-Casey (justincc)2012-09-281-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | concurrent thread use provoking mono crashes. Same rationale as commit 13690582.
| * | | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-275-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | This controls how many undo steps the simulator will store for each prim. Default is now 20 rather than 5 as it briefly was. The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
| * | | Don't store undo states if a scene object is manipulated when it is not in a ↵Justin Clark-Casey (justincc)2012-09-262-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | scene. Adds regression test for this.
| * | | refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.Justin Clark-Casey (justincc)2012-09-261-45/+43
| | | |
| * | | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-262-34/+40
| | | |
| * | | Enforce existing 5 action hardcoded undo limit.Justin Clark-Casey (justincc)2012-09-263-27/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source. This commit enforces that limit, which will soon become configurable. Regression test for undo limit added Should help with http://opensimulator.org/mantis/view.php?id=6279
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-264-7/+11
| |\ \ \
| * | | | Add basic undo/redo regression tests.Justin Clark-Casey (justincc)2012-09-263-8/+137
| | | | |
* | | | | Merge branch 'avination' into careminsterMelanie2012-09-2721-375/+1465
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | Streamline and improve llGetMassMelanie2012-09-261-23/+17
| | |_|/ | |/| |
| * | | just remove the damm thingUbitUmarov2012-09-264-4/+4
| | | |
| * | | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-263-12/+2
| | | | | | | | | | | | | | | | control flag to false
| * | | UriModule GetEvents also doesn't need a request bodyUbitUmarov2012-09-261-0/+1
| | | |
| * | | more changes to PollServiceUbitUmarov2012-09-262-1/+7
| | | |
| * | | missed changeUbitUmarov2012-09-251-1/+2
| | | |
| * | | do the same to webFecthInvDescModuleUbitUmarov2012-09-251-33/+25
| | | |
| * | | change GetTextureModule processingUbitUmarov2012-09-251-29/+31
| | | |
| * | | Text changes for upload messagesMelanie2012-09-241-4/+4
| | | |
| * | | more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-242-68/+128
| | | |
| * | | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-245-7/+33
| | | | | | | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
| * | | Merge branch 'ubitwork' into avinationMelanie2012-09-244-37/+38
| |\ \ \
| | * | | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-244-37/+38
| | | | | | | | | | | | | | | | | | | | simply process it as if UUID.Zero had been given.
| * | | | Protect the responses map with a lock. Also remove ugly "this." type ofMelanie2012-09-232-18/+24
| | | | | | | | | | | | | | | | | | | | member notation.
| * | | | Comment out asset error for sculpts/meshes. If an asset is missing it's missing.Melanie2012-09-231-4/+4
| | | | | | | | | | | | | | | | | | | | We can't put it back so we don't need to know.
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-09-233-203/+373
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
| | * | | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-232-41/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures get into inventory again. Both features under config control. Have direct warnings to client, including a final one on upload complete since i see nothing. problems: textures don't showup in inventory til relog, also issues with permitions. A few more changes
| | * | | report asset upload errors the right awayUbitUmarov2012-09-222-29/+75
| | | | |
| | * | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of someUbitUmarov2012-09-221-42/+24
| | | | | | | | | | | | | | | | | | | | more needed fields in request
generated by cgit v1.1 at 2024-12-22 17:09:25 +0000