Justin Clark-Casey (justincc)
76bd2e2d72
Consistently give responsibility for thread sleeping to behaviours rather than controlling from the main action loop
...
This is to avoid excessive and inconsistent delays between behaviours that currently need to embed sleeps in other actions (e.g. physics) and other behaviours.
Might need a more sophisticated approach in the long term.
2013-09-03 19:41:12 +01:00
Justin Clark-Casey (justincc)
3dbe7313d1
Add Close() method to IBehaviour to allow behaviours to cleanup when removed or bot it disconnected.
...
In this case, it is used to turn off jump when physics testing behaviour is removed.
2013-09-03 19:33:17 +01:00
Justin Clark-Casey (justincc)
1a2627031d
Add pCampbot "remove behaviour" console command for removing bot behaviours during operation.
...
Doesn't currently work very well as stopping physics, for instance, can leave bot travelling in old direction
2013-09-03 19:05:54 +01:00
Justin Clark-Casey (justincc)
9bd6271570
Add ability to adjust pCampbot bot behaviours whilst running with "add behaviour <behaviour-name> <bot-number>" console commad
2013-09-03 18:51:55 +01:00
Justin Clark-Casey (justincc)
01cb8033a4
And fix break in "show bot" from commit 9c65207
2013-09-03 17:55:20 +01:00
Justin Clark-Casey (justincc)
a89c56dcf1
Fix build break from last commit 9c65207
. Mono 2.4 lacks string.join(string, List<string>), or some auto casting is missing
2013-09-03 17:53:29 +01:00
Justin Clark-Casey (justincc)
9c65207936
Show behaviours of pCampbot bots in "show bots" and "show bot" console commands
2013-09-03 17:07:57 +01:00
Justin Clark-Casey (justincc)
431156f6c4
minor simplification of some unix date functions in Util. No functional change.
2013-09-03 00:17:50 +01:00
Justin Clark-Casey (justincc)
5f15ee95dc
Fix logic errors in "show grid users online" console command which didn't actually filter out users shown continuously online for more than 5 days
...
Remove confusion in command output.
2013-09-03 00:16:43 +01:00
Justin Clark-Casey (justincc)
fc9f50d940
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-09-03 00:06:50 +01:00
Justin Clark-Casey (justincc)
4035badd20
Add experimental "show grid users online" console command to show grid users online from a standalone/robust instance.
...
This is not guaranteed to be accurate since users may be left "online" in certain situations.
For example, if a simulator crashes and they never login/logout again.
To counter this somewhat, only users continuously online for less than 5 days are shown.
2013-09-03 00:04:12 +01:00
BlueWall
9643915093
Remove test that gives issue on Windows, just let the try/catch do the work.
2013-09-02 16:28:40 -04:00
Justin Clark-Casey (justincc)
857f24a5e2
Fix bug where users teleporting to non-neighbour regions could continue to hear chat from their source region for some time after teleport completion.
...
This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat.
This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running.
This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
2013-09-02 19:15:10 +01:00
Justin Clark-Casey (justincc)
5ce5ce6edb
Comment out warning about agent updating without valid session ID for now.
...
This causes extreme console spam if a simulator running latest master and one running 0.7.5 have adjacent regions occupied by avatars.
2013-09-02 17:45:38 +01:00
Justin Clark-Casey (justincc)
4cbadc3c49
Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins.
...
This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators.
This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified
then existing configured defaults will still work.
Immediate use is for conference where we need to be able to specify different defaults
However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
2013-09-02 17:27:45 +01:00
Melanie
008c98a974
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-09-01 22:49:31 +01:00
BlueWall
56f565b601
Profiles: Clean up some log entries caused when visiting HG avatar is using legacy profiles
2013-08-29 16:54:13 -04:00
BlueWall
a8c0e16e47
Initialization: move key expansion out to operate on all sources and not just environment variables
2013-08-29 14:35:56 -04:00
Robert Adams
aa521fb385
Do not add a port zero to end of the hypergrid gateway host name.
...
If the port is specified it is added but a ":0" is not added if the port is zero.
This enables the hypergrid address short form "hypergridGateway:regionName"
which is handled by the parser but failed because of this zero port addition.
2013-08-28 16:38:07 -07:00
Robert Adams
0882cf0fc3
BulletSim: add some protections for processing when shutting down.
...
Attempt to fix Mantis 6740 (http://opensimulator.org/mantis/view.php?id=6740 ).
2013-08-27 09:55:50 -07:00
Justin Clark-Casey (justincc)
0dd9a68eb7
Revert "Make HG logins fall back to fallback regions if the desired region fails."
...
This is very similar to my earlier revert in bcb8605f84
and fails for the same reasons.
Reverting this change because it causes a problem if access is denied to the user.
This reverts commit c7a8afbb8d
.
2013-08-26 21:07:49 +01:00
Justin Clark-Casey (justincc)
1b2830b929
Revert "Added some more debug messages."
...
Fallback doesn't work at this level as the change of destination isn't communicated to the source region/viewer
Reverting because this introduces a bug when access does fail.
More detail in revert of main commit.
This reverts commit ec32c1d4b6
.
2013-08-26 21:05:55 +01:00
Justin Clark-Casey (justincc)
60e4ce20b8
Fix exception thrown after a region has been restarted through scheduling.
...
This exception was very likely harmless since it occurred after the restart had taken place, but still misleading.
Thanks to SCGreyWolf for the code change suggestion in http://opensimulator.org/mantis/view.php?id=6747 , though I did this in a slightly different way.
2013-08-25 20:17:04 +01:00
Justin Clark-Casey (justincc)
85824d2cd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-25 20:12:59 +01:00
Melanie
f7378829c3
Fix the root cause of keyframe motion region crossing offset - UpdateSceneObject
...
was being called twice on each crossing.
2013-08-25 06:26:56 +02:00
teravus
e0399ccaec
* This fixes the border crossing offsets by storing the final keyframe location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper.
2013-08-24 18:55:21 -05:00
Diva Canto
ec32c1d4b6
Added some more debug messages.
2013-08-24 09:59:05 -07:00
Diva Canto
f0c0376660
Potential fix for access control bug on login introduced with SeeIntoRegion commit.
2013-08-24 08:42:41 -07:00
teravus
01c3be2746
* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.
...
* Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
2013-08-24 05:55:53 -05:00
teravus
58359788a9
Revert "* This increases accuracy when border crossing (the reason is.. the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop."
...
This reverts commit 55400ff7be
.
2013-08-24 05:54:08 -05:00
Diva Canto
5cd7bc2848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-24 03:42:39 -07:00
Diva Canto
c7a8afbb8d
Make HG logins fall back to fallback regions if the desired region fails.
2013-08-24 03:41:56 -07:00
Diva Canto
6a24515269
Whitespace fubar.
2013-08-24 03:40:44 -07:00
Robert Adams
c34e6f25b1
Fix a printing of exception error in InventoryArchiveModule that only
...
printed the error message and not the call stack.
2013-08-23 13:53:47 -07:00
Justin Clark-Casey (justincc)
1a623bb266
Rename pCampbot.ini -> pCampBot.ini (and example file) to be consistent with other capitalizations of pCampBot
2013-08-23 20:58:46 +01:00
teravus
55400ff7be
* This increases accuracy when border crossing (the reason is.. the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop.
2013-08-23 00:28:36 -05:00
Justin Clark-Casey (justincc)
0fbfef9649
minor: shortern warning messages in EntityTransferModule when UpdateAgent() fails
2013-08-23 01:21:03 +01:00
Justin Clark-Casey (justincc)
050617ae0e
Make pCampbot "show bot" command take the bot number instead of the full bot name
...
Shorter and can do this because bot names are uniform
2013-08-23 01:13:19 +01:00
Justin Clark-Casey (justincc)
04f4dd3dc7
remove redundant return at end of HandleDeregisterRegion()
2013-08-23 01:04:03 +01:00
Justin Clark-Casey (justincc)
2be786709b
Make it possible for the "deregister region id" command to accept more than one id
2013-08-23 01:03:27 +01:00
Justin Clark-Casey (justincc)
61c20bd06a
Remove old and unused ScenePresence.RestoreInCurrentScene()
2013-08-23 00:53:42 +01:00
Justin Clark-Casey (justincc)
065c5839b5
Refactor: merge SceneGraph.AddScenePresence() into CreateAndAddChildScenePresence() since the former was only ever called from the latter
...
This allows us to remove dead code relating to adding root agents directly to the scenegraph, which never happens.
2013-08-23 00:49:13 +01:00
Justin Clark-Casey (justincc)
a9f9b0da9d
minor: Correct typo on "debug stats record start" message
2013-08-23 00:13:31 +01:00
Justin Clark-Casey (justincc)
a0c99a7dcc
minor: remove mono compiler warning from LLClientView
2013-08-23 00:03:47 +01:00
Justin Clark-Casey (justincc)
13556cf129
Fix a further bug in pCampbot connect where ignoring already connected bots was wrongly counted as a connect
...
Also, only sleep when we actually perform a connection
2013-08-22 23:49:19 +01:00
Justin Clark-Casey (justincc)
70f89ae65b
Make it possible to adjust the pCampbot login delay via the [BotManager] LoginDelay parameter of pCampbot.ini
2013-08-22 23:43:33 +01:00
Justin Clark-Casey (justincc)
51c7fb1969
Add "set bots" command to make it possible to set SEND_AGENT_UPDATES on all bots whilst pCampbot is running
2013-08-22 23:11:05 +01:00
Justin Clark-Casey (justincc)
beb9d966f9
Stop "handle sit user name" command from trying to sit avatars on objects which have sit positions but are attachments
2013-08-22 22:49:23 +01:00
Justin Clark-Casey (justincc)
416bbe9583
Stop error messages being misleadingly generated when on client connection activity timeout, a root connection triggers a CloseAgent to a neighbour region which has already closed the agent due to inactivity.
...
Also separates out log messages to distinguish between close not finding an agent and wrong auth token, and downgrades former to debug and latter to warn
2013-08-22 22:46:40 +01:00
Justin Clark-Casey (justincc)
66a7dc3a0d
In pCampbot, don't try and reconnect bots that are already connected on console "connect" command
2013-08-22 20:12:14 +01:00