b3e99a4d48
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
2012-11-08 04:51:00 +00:00
a407eb287f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-07 20:05:30 -08:00
eb273b808e
HG: Hopefully this fixes the issues with port 80 once and for all.
2012-11-07 19:59:54 -08:00
3666518319
BulletSim: add skeleton classes for shape objectification. This will eventually replace all the if's and switches in ShapeCollection with polymorphism.
2012-11-07 15:29:51 -08:00
67d5dbbb49
BulletSim: add classes for physics motors. Eventually these will replace the manual code for vehicles and add PID functionality to avatar movement.
2012-11-07 15:28:06 -08:00
6df9d40d99
BulletSim: update the DLLs and SOs
2012-11-06 18:17:00 -08:00
ee00c5c885
BulletSim: many changes to tune vehicles for BulletSim.
...
The problem left is that the vehicle sitting on something needs
to press down for gravity and what its sitting on pushes up
so the vehicle does not penetrate. The effect is Bullet calculates
a lot of random angular motion for the vehicle. Various schemes
of damping and zeroing has not resolved the problem.
2012-11-06 18:16:47 -08:00
76cc303031
BulletSim: Add ZeroAngularMotion method to physical objects. Add inTaint flag to ZeroMotion method. Update the references to those functions.
2012-11-06 18:16:35 -08:00
e2130817e5
BulletSim: remove limit on taints that can happen before a step. Remove some debugging code (detail log flushing).
2012-11-06 18:16:23 -08:00
f70a3099b5
BulletSim: recalculate the compound shape bounding box when built.
2012-11-06 18:16:12 -08:00
702fd1e094
BulletSim: only compute linkset mass when membership changes rather than everytime someone asks for it.
2012-11-06 18:16:00 -08:00
36d77fe27c
BulletSim: Add separate linear and angular damping function calls. Add function for recalculating compound shape bounding box.
2012-11-06 18:15:48 -08:00
b2dfa6f022
To keep things consistent allowing an UnregisterModuleInterface... Force the GodModule to request the dialog module interface on a kickuser call and not to use the 'in memory cached one'. Thanks Ar3s for locating the offending inconsistency.
2012-11-06 19:03:41 -05:00
bf469819a6
Update folder version numbers when moving items and making the Delete(string[], string[]) call (not just string, string).
...
This is to stop viewer inventory cache version numbers becoming out of sync with grid stored numbers when viewer performs these actions.
If there are no problems with these changes, they will be propogated to SQLite (and MSSQL if that's simple enough).
May also need to do the same on folder store/create/delete and maybe propogate version increments up the folder hierarchy, but that requires investigation.
2012-11-06 23:44:52 +00:00
a8424490ae
Increment version number of a folder when an object it contains is deleted.
...
Not doing this was allowing the viewer inventory cache to become out of sync if an item was directly deleted.
2012-11-06 23:40:33 +00:00
5cbf7b3997
Merge branch 'ubitwork' into avination
2012-11-06 11:32:53 +01:00
182b487243
This implements the Caps throttler. After some testing, the system seemed to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference.
...
Tested with Two Clients on a region with 1800 textures all visible at once.
2012-11-05 22:05:10 -05:00
b7b96a5e4f
Another step in the chain. Pipe the throttle update to the appropriate PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator.
...
Next step is hooking it up to HasEvents
2012-11-05 13:10:00 -05:00
4fa088bafb
Pipe Throttle Update Event to EventManager, client --> ScenePresence --> EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
2012-11-04 22:57:24 -05:00
6b32348b9e
Merge branch 'master' into careminster
2012-11-05 00:06:38 +00:00
236cc1f268
Change user message on TeskInventoryAccepted to let the viewer format it
...
properly
2012-11-05 00:05:01 +00:00
4d6ee1aea6
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
2012-11-04 23:30:11 +00:00
006d70582b
Merge branch 'master' into careminster
2012-11-04 23:29:18 +00:00
08b37efc32
Prevent IMs being sent to prims when avies decline inventory offers from them.
2012-11-04 23:28:05 +00:00
89322aaf94
Prevent IMs being sent to prims when avies decline inventory offers from them.
2012-11-04 15:17:47 -08:00
c623e35805
Merge branch 'master' into careminster
2012-11-04 22:44:42 +00:00
f391d028de
Add a method to query all registered script constants to allow non-XEngine
...
script engines to use them.
2012-11-04 22:39:15 +00:00
dd416298f1
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-11-04 22:37:28 +00:00
7e91a787fb
Add a method to query all registered script constants to allow non-XEngine
...
script engines to use them.
2012-11-04 22:01:34 +01:00
1090ff7278
removed potencial null refs and rearrange code a bit
2012-11-04 14:57:27 +00:00
895d28f14d
BulletSim: update the DLLs and SOs
2012-11-03 21:28:23 -07:00
79f7c466a1
BulletSim: fix compound linkset crash by not freeing shape of child prims.
...
Remove all compilation warnings (mostly 'protected' in sealed classes.)
Add the dynamicAabbEnable parameter to creation of compound shapes.
2012-11-03 21:16:02 -07:00
894bb4893b
BulletSim: search the mesh and hull lists to find shapes if type is not known. This makes sure the correct accounting is done for the particular shape.
2012-11-03 21:15:54 -07:00
498ea76e63
BulletSim: Move construction of compound linkset from ShapeCollection
...
into LinksetCompound where it should be.
Create meshes for native shapes when part of a compound linkset because
scale is currently per object and not per collision shape.
Don't schedule a LinksetCompound refresh if just changing properties.
2012-11-03 21:15:46 -07:00
1dc23b2b97
BulletSim: parameterize selection of linkset implementation
2012-11-03 21:15:39 -07:00
b0eccd5044
BulletSim: debugging of compound shape implementation of linksets.
...
Add compound shape creation and freeing in shape manager.
Add optional taint-time execution method and update code to use it.
Add API2 linkage for more compound shape methods (get num, get/remove by index, ...)
Modify perferred shape return so linkset children can have differet shapes than root.
Add Position and Orientation calls to linksets so children can be moved around by
the linkset by its own calculation. Allows for very general linkset implementations.
2012-11-03 21:15:30 -07:00
f53b4e7a21
BulletSim: Add RawPosition and RawOrientation to BSPhysObject and rename MassRaw to RawMass. Fix BSShapeCollection to use Raw* for creating the body to eliminate exception from referencing the physical body before it has been created.
2012-11-03 21:15:22 -07:00
39c02dcc8c
BulletSim: Remove use of shapeData in ShapeCollection and rely on the available BSPhysObject varaiables. Fix line endings in BSLinksetCompound.
2012-11-03 21:15:14 -07:00
364a7c3088
BulletSim: rename BSBody and BSShape to PhysBody and PhysShape. Add skeleton of BSLinksetCompound.
2012-11-03 21:15:06 -07:00
28e2cd3fa2
BulletSim: vehicle tweeking.
...
Add AddTorque() method to BSPrim. Remove some manual motor actions
in computing angular force (will eventually be replaced with motor class).
Remove some experimental changes.
2012-11-03 21:14:58 -07:00
52be581f71
BulletSim: remove center-of-mass setting for linksets because it causes the constraint calculation to pull the objects together.
2012-11-03 21:14:49 -07:00
93fe384cce
BulletSim: Use the PostTaints operation to build the linkset once before the next simulation step. This eliminates the management of children vs taintChildren and simplifies the constratin creation code.
2012-11-03 21:14:41 -07:00
42d65840c8
BulletSim: Add gravity force to vehicle. Some debugging additions.
2012-11-03 21:14:33 -07:00
dae038a117
BulletSim: fix problem with multiple linksets stepping on each other if they are built at the same time.
2012-11-03 21:14:25 -07:00
4cfa3be4ef
BulletSim: add definitions for linkset collision mask
2012-11-03 21:14:16 -07:00
bc43c7007d
BulletSim: code rearrangement
2012-11-03 21:14:08 -07:00
8c9e4c1f7b
BulletSim: Use Refresh/PostTaints to cause recomputing of constraint variables before the simulation step. Update logging and messages to properly name LinksetConstraints. Use UpdatePhysicalMassProperties to put the whole linkset mass into all the physical linkset members so they have the inertia to move the whole linkset.
2012-11-03 21:14:00 -07:00
9568f24c26
BulletSim: add post taint taints and post step taints. The post taints operation is most useful and is used by linksets to build and rebuild only once before the simulation step.
2012-11-03 21:13:52 -07:00
2f25f70316
BulletSim: remove unneeded parameter from Refresh().
2012-11-03 21:13:44 -07:00
e20bad12cc
BulletSim: centralize mass/inertia computation with UpdatePhysicalMassProperties() function. Didn't add setMassRaw because assignment with side effect is dirty.
2012-11-03 21:13:35 -07:00
Melanie