UbitUmarov
0de7219485
collision sounds: simplify send code a bit and limit sending rate to 5 per sec per part ???
2012-05-16 23:36:37 +01:00
Melanie
597f99bca7
Merge branch 'master' into careminster
2012-05-16 12:40:45 +01:00
UbitUmarov
ea47b03625
Added a invalidCollisionSoundUUID so that scripts can stop all collision sounds with llCollisionSound("",...). UUID.Zero means defaults should be used. In case part has several scripts with confliting llCollisionSound result depende on exec order. Specially on reset the efect of "" depends on reset order, it should override the others. This is intermediate improve(?) since collisions sounds seem to need a deaper revision.
2012-05-16 12:27:49 +01:00
Justin Clark-Casey (justincc)
23ae24b406
Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG().
...
Remove buggy Xml2ToSOG().
2012-05-16 00:10:42 +01:00
Justin Clark-Casey (justincc)
e644e34545
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-15 23:47:42 +01:00
Justin Clark-Casey (justincc)
1b5ce8c10e
Fix issue where loading OARs could sometimes result in link numbers being reordered.
...
This was because the parts in scene objects were sometimes not serialized in link order.
This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this
had not been done in the SerialiserModule methods that OAR loading used.
Add regression test for same.
Addresses http://opensimulator.org/mantis/view.php?id=5948 , http://opensimulator.org/mantis/view.php?id=5749
2012-05-15 23:43:59 +01:00
Justin Clark-Casey (justincc)
02f3b116c6
Allow use of regular expressions in "show object name", "show part name" and "delete object name" console commands if --regex switch is used.
...
Deleteing objects by name, creator uuid or owner uuid now requires confirmation to avoid accidental deletion.
2012-05-15 23:42:49 +01:00
Melanie
81ce169dfe
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-05-15 21:24:27 +01:00
Melanie
a36c487c79
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-05-15 21:19:06 +01:00
ubit
ac718fb805
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-15 18:02:49 +02:00
UbitUmarov
81d7844f51
use part VolumeDetectActive and not rootPart.VolumeDetectActive to be coerent with other places in case of future changes. Should be equivalent if all is well.
2012-05-15 17:01:00 +01:00
UbitUmarov
accab1e086
sop colisions don't play sounds on volume detectors
2012-05-15 16:56:43 +01:00
ubit
9ee6afb887
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-15 17:05:14 +02:00
UbitUmarov
ca14534b91
sop: - added UpdatePhysicsSubscribedEvents() to update physics ator collision events subcription where needed. Made it consider also VolumeDtc and phantom cases. - added extra calls to it on physics ator proprieties changes. - Fixed land collisions reports. - Handle the case of physics sending a last zero colisions reports to trigger collision_end. - Made the physics collisions report rate be 20 per second. (needs review/testing)
2012-05-15 15:54:02 +01:00
UbitUmarov
9d67523235
ubitODE: if stopped having collisions do report zero colisions once, so collision_end event can be triggered. Changed reports rate to the requested rate and not full ode rate.
2012-05-15 15:45:01 +01:00
UbitUmarov
338be76e0a
ubitODE: fix not reporting land collisions on same cases.
2012-05-15 13:41:13 +01:00
Melanie
ef94c31ef8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-05-15 03:17:42 +01:00
dahlia
1ce576b115
Add another null check to Melanie's last commit. Seems to eliminate sqlite errors in log but no idea if it's working properly
2012-05-14 19:34:18 -07:00
Melanie
65e1d7b2d7
Guard against null root part on SQLite. This really needs to be fixed so SQLite
...
loads roots before children like MySQL does.
2012-05-15 03:16:12 +01:00
Melanie
069bcd45e5
Try to fix sqlite breakage
2012-05-15 02:27:21 +01:00
Melanie
995cd25f30
Port the mel/dahlia fix
2012-05-15 02:36:11 +02:00
UbitUmarov
325973d36f
don't send colision events to volume detectors
2012-05-15 01:40:46 +01:00
Melanie
e7819ce909
Port Avination's collision fixes to core.
2012-05-15 01:02:38 +01:00
ubit
2b8231b8b7
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-15 01:09:29 +02:00
ubit
493108be11
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-15 01:08:59 +02:00
UbitUmarov
1b81ce303e
Merge branch 'avination' into ubitwork
2012-05-15 00:04:40 +01:00
UbitUmarov
0fb663272a
make llGetCameraPos and llGetCameraRot apply to avatar that granted permission and not owner
2012-05-14 23:42:45 +01:00
Melanie
71115c32ad
Merge branch 'avination' into careminster
2012-05-14 23:33:16 +01:00
Melanie
6126b6da72
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-05-14 23:32:49 +01:00
Melanie
ebdbaba615
Merge branch 'ubitwork' into avination
2012-05-15 00:17:52 +02:00
Melanie
e9e797b681
Fix an omission
2012-05-15 00:15:44 +02:00
Melanie
e3c376156c
Completely revamp collision handling. Now works as it is supposed to.
2012-05-14 22:45:54 +02:00
Oren Hurvitz
52a32878a9
Save the Telehub and its Spawn Points in the OAR
2012-05-14 19:59:45 +01:00
Justin Clark-Casey (justincc)
d7fd9b159a
set executable bit for Ionic.Zip.dll for running OpenSimulator under cygwin
2012-05-14 19:36:26 +01:00
Justin Clark-Casey (justincc)
af6c85308a
minor: add explanative comment to 'missing baked texture' logging commonly seen on inter-simulator teleports where avatar baked textures are not available from the asset service.
2012-05-14 18:57:42 +01:00
Justin Clark-Casey (justincc)
deeac69312
minor: comment out individual attachment transfer log messages for now
2012-05-14 18:48:40 +01:00
Justin Clark-Casey (justincc)
c2aa3b90d9
Set the agent in transit teleport flag at the first available opportunity (i.e. when IsInTransit() was being checked) to close down a race condition.
...
On EntityTransferModule.DoTeleport() there was an IsInTransit() check to prevent multiple simultaneous teleport attempts.
However, the SetInTransit() was only performed later on, which left a window in which multiple threads could pass the IsInTransit() check.
This has been seen in the field and the results aren't pretty.
This commit effectively combines the IsInTransit() and SetInTransit() checks so there is no such window.
More failure cases are made to to call ResetInTransit() to adjust to this move.
2012-05-14 18:36:26 +01:00
Justin Clark-Casey (justincc)
42557d7d4c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-14 18:33:20 +01:00
Justin Clark-Casey (justincc)
fad557485c
Add more region information to some teleport related logging
2012-05-14 18:06:48 +01:00
BlueWall
847127f83c
Oops - missed the config changes
2012-05-14 00:15:56 -04:00
Melanie
e78043cb70
Check parcel entry permissions when moving objects
2012-05-14 01:32:22 +02:00
Melanie
59826c15ce
Allow non-gods to deed no-mod objects
2012-05-14 01:21:10 +02:00
BlueWall
171480f235
Merge branch 'master' of /home/opensim/src/OpenSim
2012-05-13 17:40:03 -04:00
BlueWall
b80db81cdd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-13 17:39:05 -04:00
Chris Koeritz
30a272ba31
Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-13 17:34:20 -04:00
BlueWall
7c229c8b81
Add configurable SpawnPointRouting
...
Will use one of three selected methods to route avatar landing
points when using Telehubs. The setting is in [Startup] using
SpawnPointRouting = closest/random/sequence
closest: The default setting. Routes avatar to the nearest SpawnPoint
to the location.
random: Picks random SpawnPoints to land the avatar.
sequence: Follows a sequence to place the avatar on the next available
SpawnPoint location
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-05-13 17:20:54 -04:00
ubit
81ec1ab169
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-13 02:29:49 +02:00
UbitUmarov
9870d7e4e7
ubitODE fix force in case of mlinear motor offset present
2012-05-13 01:28:20 +01:00
Melanie
fe029cf4e8
Merge branch 'avination' into careminster
2012-05-13 01:25:03 +01:00
Melanie
e5653ebeb7
Merge branch 'avination' into careminster
2012-05-13 01:24:10 +01:00