Commit Graph

20657 Commits (053e7279ca5d9be8f2ae2f79d0a2c74ab056f147)

Author SHA1 Message Date
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
Melanie e2dc04586a Merge branch 'master' into careminster 2012-05-13 01:24:01 +01:00
ubit 56b9d1ff46 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-05-12 21:09:27 +02:00
UbitUmarov 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
ubit 5108f4edf5 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-05-12 16:33:19 +02:00
UbitUmarov 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
UbitUmarov cf8b7c8aff Merge branch 'avination' into ubitwork 2012-05-12 14:10:15 +01:00
ubit d099b4dff9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-05-12 15:02:16 +02:00
UbitUmarov 4d98a291a2 ubitODE let vehicles responde faster to changes of some parameters like motors decay times 2012-05-12 14:00:08 +01:00
UbitUmarov 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
ubit 67ee100f2f Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-05-12 13:19:57 +02:00
UbitUmarov 46095c963c ubitODE: trial workaround for avatar colisions 2012-05-12 12:17:28 +01:00
Justin Clark-Casey (justincc) 9d66792c2a Fix mono compiler warning.
Last jenkins failure looked like a glitch.
2012-05-12 03:04:47 +01:00
Justin Clark-Casey (justincc) 8b958e7e74 Revert "Save the Telehub and its Spawn Points in the OAR"
This reverts commit b0b7b45b94.

Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc.
I wouldn't normally revert but thinks get tricky when it comes to data formats.
Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string
We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
2012-05-12 02:36:56 +01:00
UbitUmarov 8dd5f08b6e revert terminal vel reduction. It helped but not efective 2012-05-11 15:53:31 +01:00
Oren Hurvitz 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
Justin Clark-Casey (justincc) 480216f50f Print out more information on connecting bots 2012-05-11 02:38:29 +01:00
Talun e618194143 Mantis 6015 new LSL function llGetAgentList.
Details in the lsl wiki
2012-05-11 02:25:52 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 0ddf3c5289 Do bot startup on another thread so console is responsive during this process 2012-05-11 01:56:00 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) dc39ec82fa Change bot.IsConnected to be ConnectionState with Disconnected, Connecting, Connnected and Disconnecting states 2012-05-11 00:53:21 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) abc029d1f4 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-05-10 23:43:38 +01:00
ubit 08b51a94ac Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-05-10 23:49:38 +02:00
Justin Clark-Casey (justincc) 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
UbitUmarov 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
Dan Lake 117c183fde Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-05-10 14:43:02 -07:00
Dan Lake f374b63ac8 Add even for terrain tainting and synchronize terrain module with physics scene before physics simulation step rather than after 2012-05-10 14:42:46 -07:00
Melanie 8558a36506 Merge branch 'master' into careminster 2012-05-10 20:33:27 +01:00
ubit e00c1ec264 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-05-10 19:24:15 +02:00
Mic Bowman de44734fe9 Saving estate state is really slow (relatively) and it gets
completely rewritten every time a region starts up. This
makes the data write only when the data was not already
read from the database.

There is a still a major race condition whenever two regions
share the same estate data, but at least it won't be triggered
on startup.
2012-05-10 09:08:40 -07:00
ubit 9d184c103a direct upload of odedynamics.cs for testing ( ubitode ) 2012-05-10 18:01:35 +02:00
UbitUmarov d0c0d37d24 ubitode: changes to vehicles servos 2012-05-10 16:17:02 +01:00
Melanie a90822f4b8 Merge branch 'master' into careminster 2012-05-10 00:42:10 +01:00
Justin Clark-Casey (justincc) d8a78374aa Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the actual class names.
This is usually because the file name was singular (*Service*) but the class name was plural (*Services*).
This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector.
This does not affect existing configuration since the files are being renamed rather than the classes.
2012-05-09 23:25:01 +01:00
Justin Clark-Casey (justincc) 6987aef38d Improve logging on the prim inventory script asset request path for future use.
This adds name and description of the request handler to http request logging when DebugLevel >= 1
2012-05-09 23:12:30 +01:00
Justin Clark-Casey (justincc) e813f41478 Escape and unescape xml element names if necessary in ServerUtils.BuildXmlData() and ParseElement()
If AvatarService appearance data is retrieved over the network, then ServerUtils was attempting to transfer names such as "Wearable 0:0" directly to xml element names, resulting in an exception.
Space is not valid in xml element names.  Neither is : in this case since the intention is not to namespace.  Using names directly as keys is not a good idea.
To get around this problem this patch escapes and unescapes the element names as appropriate.
This has no impact on existing xml (since it had to be valid in the first place) but allows AvatarService data to be used over the network.
Setting appearance (from simulator to AvatarService) did not suffer this problem since the values are passed in the query string which is already properly escaped.
2012-05-09 21:11:14 +01:00
Melanie 50321fb7bf Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-09 00:43:33 +01:00
Talun 61e99bcdcb Mantis 6015 new LSL function llGetAgentList.
Details in the lsl wiki
2012-05-09 00:14:24 +01:00
Justin Clark-Casey (justincc) e5dbb652d5 Remove physics actor related race conditions in SetVehicleFlags() and SetPhysicsAxisRotation()
sop.PhysActor can currently become null at any time.
2012-05-09 00:11:10 +01:00
Dan Lake 3bc5620d74 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-05-08 16:06:02 -07:00
Dan Lake 20952c75c5 Trigger event when scene presences are updated 2012-05-08 16:05:34 -07:00
Talun c21c9e13ef Mantis 1456 same region teleport of a sitting avatar.
Region to region was fixed some time ago in EntityTransferModule.
This applies the same fix for same region teleports.
2012-05-09 00:02:13 +01:00