Diva Canto
583e44103c
Bug fix in OfflineMessageModule. Mantis #6446
2012-12-04 08:36:54 -08:00
Diva Canto
a4821c5e01
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-04 08:08:58 -08:00
Diva Canto
dc80c2afb3
Improvement in HGInstantMessageService: account for the existence of an offline IM service.
2012-12-04 08:08:34 -08:00
ubit
40bb996b36
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-04 03:50:48 +01:00
UbitUmarov
b6d29aa124
move characters (avatars) to own collision space, also fixing a problem
...
with previus code that was still assuming the avatar is g2
2012-12-04 02:46:40 +00:00
ubit
f26abce753
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-04 02:55:50 +01:00
UbitUmarov
fc1be7e41f
raise standing avatar a bit to reduce knees bending on some collisions.
...
reduce head size a bit
2012-12-04 01:54:37 +00:00
BlueWall
0c7d6adef1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-03 20:17:00 -05:00
BlueWall
ac65085cc3
XmlRpcGridRouter
...
Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called.
See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or
https://github.com/BlueWall/XmlRpcRouter
for php gateway and test code.
2012-12-03 20:16:44 -05:00
Robert Adams
787636b97a
BulletSim: Reduce idle region physics overhead where there are MANY
...
static objects by more restrictive selection of objects that collide
with static objects.
Rename collision mask fuctions from 'filter' to 'group' so it is clear
what is being set.
Rename BulletSimAPI.SetCollisionFilterMask() to SetCollisionGroupMask to match above.
Restore passing of time step to linear and angular motion component routines.
Use buffering vehicle physical parameter get/set routines consistantly.
Make range enforcement clearer by using ClampInRange() function for parameter setting.
Remove commented out experimental vehicle calculations.
2012-12-03 16:25:51 -08:00
ubit
5d4b7d537d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-03 21:26:36 +01:00
Melanie
b7c3a4fa7f
Merge branch 'avination' into ubitwork
2012-12-03 19:46:16 +01:00
UbitUmarov
8aa5fdb6a3
*TEST* diferent avatar collider
2012-12-03 19:45:45 +01:00
UbitUmarov
f21d990820
fix vertex rounding direction
2012-12-03 19:41:29 +01:00
UbitUmarov
aa00308b10
*TEST* reduce all mesh vertices resolution to 1e-5. This reduces number
...
of unique vertices only originated by math errors in PrimMesher
2012-12-03 19:41:21 +01:00
UbitUmarov
c50fda8bf5
adjust avatar standing Z position
2012-12-03 19:41:14 +01:00
Melanie
d3904ff484
Add a transaction ID to the money module path for llTransferLindenDollars
2012-12-03 19:34:22 +01:00
Robert Adams
41f1c5b7f7
BulletSim: rework angular corrections to remove any hybrid code and compute absolute collections.
2012-12-03 07:59:56 -08:00
Robert Adams
2586bab2dd
BulletSim: add stubs for generalization of preStep actions. Will eventually replace the specialized vehicle processing with preStep event processing. Add TODO comments about this feature. Redo line endings in TODO file to be all Linux.
2012-12-03 07:59:52 -08:00
Robert Adams
dc0497c1b8
BulletSim: begin tracking a TODO list. There just are so many things to remember to do.
2012-12-03 07:59:49 -08:00
Robert Adams
10fcc70b36
BulletSim: revert angular vertical attraction from motor to code. The motor code did not return the restoring difference but the current value. Remove unused commented out code.
2012-12-03 07:59:46 -08:00
Robert Adams
f9fed421fe
BulletSim: format vehicle detail logging messages so vehicle changs are grouped better in the log output.
2012-12-03 07:59:42 -08:00
Robert Adams
20c3ec7d92
BulletSim: localize vehicle property setting so the vehicle prim is only updated at the end of the vehicle simulation step and the push of the physics property update event only happens if the properties are actually changed.
2012-12-03 07:59:39 -08:00
Robert Adams
b124aae05e
BulletSim: Add DumpActivationInfo2 function. Change static objects from DISABLE_SIMULATION to ISLAND_SLEEPING. Update DLLs and SOs to add DumpActivationInfo2 function.
2012-12-01 15:39:13 -08:00
UbitUmarov
9c7c703360
Merge branch 'avination' into ubitwork
2012-12-01 12:39:55 +00:00
Robert Adams
ec63e4ff29
BulletSim: remove time scaling of computed vehicle absolute velocity since Bullet will scale the movement by the time slice. Restore LIMIT_MOTOR_UP to definitition of BOAT simce some vehicle engines use it even for land vehicles. Push vehicle parameter updates through the regular property update to solve vehicles floating off when they should be stopped.
2012-11-29 22:21:45 -08:00
Melanie
56b2bc7101
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/Manager/IMesher.cs
2012-11-30 01:54:13 +00:00
Melanie
daa1d99513
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-11-30 01:19:08 +00:00
Robert Adams
0bda35e18f
BulletSim: add copyright header where it is missing. Remove some unnecessary 'using' requirements so testing framework is less complicated.
2012-11-29 09:53:59 -08:00
Robert Adams
0cd99c74a7
BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables mesh caching. Since BulletSim caches and tracks the unmanaged memory version of meshes, the Meshmerizer itself does not need to cache built meshes once BulletSim has made the physical proxy mesh.
2012-11-29 09:24:53 -08:00
Robert Adams
b8a7cbb9e9
BulletSim: reverse direction of hover correction. Removes problem with vehicles being orbited.
2012-11-29 08:03:30 -08:00
Robert Adams
2ccd4c1302
BulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from TYPE_BOAT definition.
2012-11-28 09:48:48 -08:00
Robert Adams
24b3b4df2e
BulletSim: update DLLs and SOs to remove simulator crash when calling SetInterpolationAngularVelocity.
2012-11-28 09:48:41 -08:00
Robert Adams
0a66317fa6
BulletSim: move GetWaterLevelAtXYZ from BSScene to BSPhysTerrain.
2012-11-28 09:48:33 -08:00
Diva Canto
d656ec8f33
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-27 21:11:19 -08:00
Diva Canto
92a766e8cb
Bug fix in Offline IM for inventory transfers. The items were being placed twice in the receiver's inventory.
2012-11-27 21:10:58 -08:00
Justin Clark-Casey (justincc)
aae76f7be4
Stop logging spurious asset data for {0} is zero length error for sculpts/mesh
...
ODEPrim, for instance, always hits this code path twice at the moment
Firstly before any sculpt data has been loaded (hence the spurious message)
Secondly when any sculpt data has been loaded or failed to load (when the message would be valid).
Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead
(though this is not ideal since it requires all physics plugins to copy/paste similar code).
2012-11-28 02:01:04 +00:00
Justin Clark-Casey (justincc)
8a1d3b322f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-28 02:00:34 +00:00
Justin Clark-Casey (justincc)
c17ea2049b
Show many more primitive properties on console command "show part name/id/pos"
2012-11-28 01:42:58 +00:00
Diva Canto
a82f699f43
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-27 14:43:01 -08:00
Diva Canto
2cd88787af
Prevent the core Groups module from being enabled when its name doesn't match the "default" ini choice
2012-11-27 14:42:28 -08:00
Robert Adams
8e459a0346
BulletSim: reorganize linear movement routine into separate subroutines enabling external calibration routines and unit tests.
2012-11-27 10:04:00 -08:00
Robert Adams
a5100cafee
BulletSim: fix terrain mesh generation for problem with regions that have unequal edge heights. Thanks UBit.
2012-11-27 10:03:55 -08:00
Robert Adams
68fe7dff20
BulletSim: reorganize angular movement routine into separate subroutines enabling external calibration routines and unit testing.
2012-11-27 10:03:49 -08:00
Robert Adams
59554758b1
BulletSim: implementation of vertical attraction motor.
2012-11-27 10:03:44 -08:00
Robert Adams
9e0db36c82
BulletSim: add 'infinite' timescale that does not reduce motor target or friction.
2012-11-27 10:03:38 -08:00
Justin Clark-Casey (justincc)
16e4019eca
Fix database service unit test failures by temporarily reverting BasicDataServiceTest extending OpenSimTestCase.
...
Mono 2.4.3 doesn't like this when running nunit, with nunit throwing
AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true.
and similar. Mono 2.10.8.1 does not have this issue.
So will wait until min version of mono bumps before restoring.
2012-11-26 22:25:36 +00:00
Robert Adams
5685b33071
BulletSim: increase vehicle stability by suppressing Bullet's update to angular velocity.
2012-11-26 10:47:34 -08:00
BlueWall
88f2fbc8f1
Merge branch 'master' into connector_plugin
2012-11-26 06:55:03 -05:00
Robert Adams
084e3926ca
BulletSim: use m_angularMotor to do the basic movement. Add the setting of same. Rename the angular forces and add comments to match MoveAngular to the form of MoveLinear.
2012-11-25 20:04:33 -08:00