BlueWall
5d860d09a3
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-17 08:00:16 -04:00
BlueWall
2af11fea37
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
2012-05-17 00:49:33 -04:00
BlueWall
295bb3227d
Force the default Telehub router if no matches are found in the config.
2012-05-17 00:47:19 -04:00
BlueWall
bd39f5f803
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-16 23:20:37 -04:00
BlueWall
0aa7baf49a
Fix boo-boo in OpenSim.ini.example affecting telehub sequential routing
...
Configuration value should be "sequence" instead of "sequential"
2012-05-16 23:17:42 -04:00
Justin Clark-Casey (justincc)
c45b5a3d1c
minor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:27:05 +01:00
Justin Clark-Casey (justincc)
d19fb6fb0c
Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:12:31 +01:00
BlueWall
8f0405bacc
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-16 21:08:01 -04:00
Justin Clark-Casey (justincc)
f0c9cb8dc0
Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression test logging accidentally left in
2012-05-17 01:34:04 +01:00
Justin Clark-Casey (justincc)
6b6a00a3d5
minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator because checking EstateOwner == user
...
Due to an earlier check we already know that user != UUID.Zero so if EstateOwner == UUID.Zero, EstateOwner == user can never be true
2012-05-17 01:30:50 +01:00
Justin Clark-Casey (justincc)
bdcf2d1348
Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()
2012-05-17 01:27:59 +01:00
Justin Clark-Casey (justincc)
e444cb9da4
Remove redundant "Teleport failed:" from reason when QueryAccess fails for the destination simulator. This part of the string is already provided by the viewer.
...
Also adds more reason logging for diagnostics when teleports are refused/fail.
2012-05-17 00:33:04 +01:00
BlueWall
3e00395b37
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-16 15:42:07 -04: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
BlueWall
e9d1af46fa
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-14 22:39:03 -04:00
BlueWall
baff20f7c5
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-14 22:33:00 -04: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
BlueWall
8e6276865b
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-14 20:31:46 -04:00
Melanie
e7819ce909
Port Avination's collision fixes to core.
2012-05-15 01:02:38 +01: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
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
6f54714eb0
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-13 17:22:09 -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
BlueWall
8ff97699e2
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
2012-05-13 17:11:44 -04:00
BlueWall
a4d75e37cf
Formatting fix
2012-05-13 13:20:35 -04:00
BlueWall
d3a88263cb
Fix indexer to spawnpoints
2012-05-13 13:19:42 -04: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
BlueWall
2b5e05fad8
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-11 09:46:51 -04: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
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