d6f563794e
Don't allow a prim to be sat upon if its part of an attachment
2012-07-09 21:43:44 +01:00
2eaa6d5ace
Do not allow a script to attach a prim if its being sat upon.
...
This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar.
This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar.
Recording HashSet is null if there are no sitting avatars in order to save memory.
2012-07-09 21:24:32 +01:00
45a6d67db8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-09 18:23:09 +02:00
3a1d46ad44
retry fixing ode getconfiguration()
2012-07-09 17:21:54 +01:00
e44c735fab
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-09 18:02:27 +02:00
a709768085
fix ode getconfiguration
2012-07-09 17:01:52 +01:00
6dab81aa7b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-09 17:53:26 +02:00
0ac161c9a8
log ODE lib configuration
2012-07-09 16:51:56 +01:00
e858c19a9a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-09 14:29:32 +02:00
fb8e8dcbce
fix ODE dispose plus minor clean. On regions restart ode.dispose seems
...
to be called with scene still calling simulation, that should be changed,
for now added a check for a valid world in ode simulation
2012-07-09 13:25:17 +01:00
1a2ab7bc69
More keys for automated ini processing
2012-07-08 22:50:56 -04:00
1077d7b6f5
Reinstate parallel fetching of residents and remove a left over return from debugging
2012-07-08 21:53:23 +02:00
a96ac73302
Add more keys for OpenSim.ini.defaults automation
2012-07-08 13:45:17 -04:00
57094bd017
Add more automation keys to OpenSim.ini.example
2012-07-08 13:03:37 -04:00
eeca3db642
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-08 15:03:13 +02:00
b74d4711bb
Merge branch 'avination' into ubitwork
2012-07-08 13:09:32 +01:00
1e4c656497
Revamp map block sending to eliminate overload of the grid server connection
...
and the sim's http client
2012-07-08 10:44:53 +02:00
73c5a6e666
Instead of sending 20 records in 2 packets, send just one as we intended in the first place.
2012-07-08 07:42:40 +02:00
d3b778ebbe
Address map lag issue seen with non-avination viewers
2012-07-08 06:06:33 +02:00
470019b52a
Change semantics of FromXML on vehicle data to make the serializer a bit cleaner
2012-07-07 19:59:55 +02:00
6d5693a866
Merge branch 'ubitwork' into avination
2012-07-07 19:18:20 +02:00
6090140077
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-07 08:43:56 +02:00
09c4c11063
Merge branch 'avination' into ubitwork
2012-07-07 07:43:29 +01:00
afa02aa104
fix vehicle to XML string
2012-07-07 07:41:11 +01:00
5b6d31f268
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-07 04:54:58 +02:00
d0f7fb1d35
Merge branch 'avination' into ubitwork
2012-07-07 03:49:31 +01:00
6a1ccbfef3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-07 04:20:39 +02:00
d50b852d53
ODE turn off material dependent friction while vehicle linear motor is Effective. Increase a bit world damping of velocities
2012-07-07 03:16:41 +01:00
de01c0df26
Merge branch 'ubitwork' into avination
2012-07-07 03:17:32 +02:00
3024bdd097
Fix storing vehicle data
2012-07-07 02:29:21 +02:00
6535f23e4b
Add saving vehicle physics data to the database
2012-07-07 02:05:01 +02:00
112cddc9ca
minor: rearrange INITIALIZATION COMPLETE log message so that it's clear init is only complete for a particular region at a time
2012-07-07 00:53:17 +01:00
16d5b79d57
minor: remove some recent mono compiler warnings
2012-07-07 00:36:01 +01:00
1201307c73
Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xml
...
This was causing 2 copies of the module to be created for each scene.
Probably no bad consequences other than a small waste of memory (both for the module and for the warp3D renderer it loaded)
2012-07-07 00:26:25 +01:00
a85741ac37
minor: Make WORLD MAP category log lines consistent
2012-07-07 00:14:16 +01:00
3bd134474b
minor: Get RegionReady module to shout initialization complete status to draw the eye
2012-07-07 00:09:33 +01:00
b19ead5f9e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-07 00:05:16 +01:00
7ff4eec79c
Remove redundant SetScene() function in Scene.AddSceneObject()
...
This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks.
There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
2012-07-07 00:02:45 +01:00
7aff238eee
Merge branch 'bulletsim2'
...
Cleanup preceeding major work. No major functional changes.
Collisions reported to simulator more efficiently.
BulletSim binaries updated using a more recent version of Bullet (v2.80-r2527).
2012-07-06 15:59:09 -07:00
af9d8de515
BulletSim: update the binaries to the current sources
2012-07-06 15:56:35 -07:00
f1f390cfdf
Remove now duplicate interregion object check that should have been removed a few commits ago in 43a2da9
2012-07-06 23:22:40 +01:00
74014a3854
minor: Remove some wrong comments in attachments regression tests
2012-07-06 23:13:00 +01:00
e4a6611865
Clean up collision reporting code so they are properly passed to
...
the simulator in batches.
More comments.
2012-07-06 15:09:19 -07:00
056c9a59b2
Add assert to attachment regression tests to check that number of objects in the scene graph
2012-07-06 23:07:50 +01:00
ae1f2114f5
Mantis 6077 trim NPC chat on channel zero.
...
This patch trims leading and trailing spaces from NPC chat and
suppresses the sending of empty chat strings on open chat channel 0.
2012-07-06 22:49:18 +01:00
1b1f841c6a
Mantis 6063 osNpcTouch.
...
Allow NPCS to touch obects.
2012-07-06 22:37:19 +01:00
43a2da9edb
Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from Scene.AddObject()
...
Only IncomingCreateObject() needs these checks. General object adding does not need to perform crossing perm checks
2012-07-06 22:33:16 +01:00
f6e5791ecd
refactor: extract method UpdateUserInventoryWithAttachment() from AttachObject() for better code comprehension
2012-07-06 22:07:19 +01:00
26d89777d8
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00
d4640f8569
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-06 18:15:58 +02:00
Justin Clark-Casey (justincc)