995cd25f30
Port the mel/dahlia fix
2012-05-15 02:36:11 +02:00
325973d36f
don't send colision events to volume detectors
2012-05-15 01:40:46 +01:00
e7819ce909
Port Avination's collision fixes to core.
2012-05-15 01:02:38 +01:00
71115c32ad
Merge branch 'avination' into careminster
2012-05-14 23:33:16 +01:00
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
ebdbaba615
Merge branch 'ubitwork' into avination
2012-05-15 00:17:52 +02:00
1b81ce303e
Merge branch 'avination' into ubitwork
2012-05-15 00:04:40 +01:00
0fb663272a
make llGetCameraPos and llGetCameraRot apply to avatar that granted permission and not owner
2012-05-14 23:42:45 +01:00
e9e797b681
Fix an omission
2012-05-15 00:15:44 +02:00
e3c376156c
Completely revamp collision handling. Now works as it is supposed to.
2012-05-14 22:45:54 +02:00
52a32878a9
Save the Telehub and its Spawn Points in the OAR
2012-05-14 19:59:45 +01:00
d7fd9b159a
set executable bit for Ionic.Zip.dll for running OpenSimulator under cygwin
2012-05-14 19:36:26 +01:00
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
deeac69312
minor: comment out individual attachment transfer log messages for now
2012-05-14 18:48:40 +01:00
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
42557d7d4c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-14 18:33:20 +01:00
fad557485c
Add more region information to some teleport related logging
2012-05-14 18:06:48 +01:00
847127f83c
Oops - missed the config changes
2012-05-14 00:15:56 -04:00
e78043cb70
Check parcel entry permissions when moving objects
2012-05-14 01:32:22 +02:00
59826c15ce
Allow non-gods to deed no-mod objects
2012-05-14 01:21:10 +02:00
171480f235
Merge branch 'master' of /home/opensim/src/OpenSim
2012-05-13 17:40:03 -04:00
b80db81cdd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-13 17:39:05 -04:00
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
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
9870d7e4e7
ubitODE fix force in case of mlinear motor offset present
2012-05-13 01:28:20 +01:00
fe029cf4e8
Merge branch 'avination' into careminster
2012-05-13 01:25:03 +01:00
e5653ebeb7
Merge branch 'avination' into careminster
2012-05-13 01:24:10 +01:00
e2dc04586a
Merge branch 'master' into careminster
2012-05-13 01:24:01 +01:00
9b7023a159
display a sleep time of zero if forced spare time to zero, when sim fps is lower than desired, for better display coerence.
2012-05-12 17:58:36 +01:00
7461fe4554
TEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc
2012-05-12 15:27:37 +01:00
cf8b7c8aff
Merge branch 'avination' into ubitwork
2012-05-12 14:10:15 +01:00
4d98a291a2
ubitODE let vehicles responde faster to changes of some parameters like motors decay times
2012-05-12 14:00:08 +01:00
792e8db456
ubitODE reduced again a bit the max allowed correction velocity on colisions, to reduce a bit bouncing inerent to colisions.
2012-05-12 13:44:47 +01:00
46095c963c
ubitODE: trial workaround for avatar colisions
2012-05-12 12:17:28 +01:00
9d66792c2a
Fix mono compiler warning.
...
Last jenkins failure looked like a glitch.
2012-05-12 03:04:47 +01:00
8b958e7e74
Revert "Save the Telehub and its Spawn Points in the OAR"
...
This reverts commit b0b7b45b94
2012-05-12 02:36:56 +01:00
8dd5f08b6e
revert terminal vel reduction. It helped but not efective
2012-05-11 15:53:31 +01:00
b0b7b45b94
Save the Telehub and its Spawn Points in the OAR
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-10 22:56:37 -04:00
480216f50f
Print out more information on connecting bots
2012-05-11 02:38:29 +01:00
e618194143
Mantis 6015 new LSL function llGetAgentList.
...
Details in the lsl wiki
2012-05-11 02:25:52 +01:00
f231ac39de
Increase minimum period between bot actions to 3 seconds, so that teleport doesn't fall under the minimum 2 second limits that clients take to process it
2012-05-11 02:23:18 +01:00
9c392f6a68
Stagger multiple bot logins by 5 seconds to make this part of the test more 'realistic'
...
TODO: Need to make this value configurable by a command line parameter to pCampbot
2012-05-11 02:05:32 +01:00
0ddf3c5289
Do bot startup on another thread so console is responsive during this process
2012-05-11 01:56:00 +01:00
93b615c51d
Do each bot shutdown on its own threads to prevent one slow shutdown holding up all the rest.
...
This does increase the aggressiveness of shutdown
Also prevents the bot list being locked for a long period, which was preventing commands such as "show bots" from working during shutdown
2012-05-11 01:37:03 +01:00
dc39ec82fa
Change bot.IsConnected to be ConnectionState with Disconnected, Connecting, Connnected and Disconnecting states
2012-05-11 00:53:21 +01:00
ab4e6a02a5
If a bot is not connected, show region name "(none)" instead of throwing an exception in the "show bots" command of pCampbot
2012-05-11 00:37:20 +01:00
903cff9264
Add ConsoleTable framework class for future uniform formatting of console output tables.
...
Still subject to change - if you use this be prepared to change your output code if/when the methods change.
Make new "attachments show" command use this.
2012-05-10 23:47:39 +01:00
abc029d1f4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-10 23:43:38 +01:00
bce3e7cb06
Add "attachments" show console command that will show the server's record of which attachments an in-scene avatar has.
...
For debugging purposes.
2012-05-10 22:48:03 +01:00
3c37bc2851
reduce avatars terminal velocity to less than 30m/s or colisions with basic boxs fail badly. (ode lib problem. chode just may support a bit higher velocity due to the use of tilt).
2012-05-10 22:44:12 +01:00
Melanie