ad1b2902f2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-08-11 17:31:25 +01:00
216f5afe54
Stats treaking. Update ToOSDMap for Stat and PercentageStat to return
...
all the various numbers that have been added to the console output.
Break out EventHistogram from CounterStat.
2013-08-10 09:09:52 -07:00
23ca1f859e
minor: Consistently log IOCP for IO completion thread startup log information instead of mixing this with "IO Completion Threads"
2013-08-09 18:27:26 +01:00
bfdcdbb2f3
Increase wait for source region to sent UpdateAgent to 10 seconds instead of 4.
...
This is giving much better results on teleports between simulators over my lan where for some reason there is a pause before the receiving simulator processes UpdateAgent()
At this point, v2 teleports between neighbour and non-neighbour regions on a single simulator and between v2 simulators and between a v1 and v2 simulator
are working okay for me in different scenarios (e.g. simple teleport, teleport back to original quickly and re-teleport, teleport back to neighbour and re-teleport. etc.)
2013-08-09 17:59:58 +01:00
aec7019728
Add missing file from b1c26a56
2013-08-09 17:57:24 +01:00
97bcb59bee
Merge branch 'TeleportWork'
2013-08-09 17:52:29 +01:00
6fcbf219da
Comment back out seed dump code enabled in b1c26a56. Also adds a few teleport comments.
2013-08-09 17:48:35 +01:00
2cdcf62b48
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-09 08:31:30 -07:00
7e01213bf2
Go easy on enforcing session ids in position updates
2013-08-09 08:31:15 -07:00
99bce9d877
Fix an issue with an A->C->B->A teleport where these regions are in a row (A,B,C) where the A root agent is still closed, terminating the connection.
...
This was occuring because teleport to B did not set DoNotCloseAfterTeleport on A as it was a neighbour (where it isn't set to avoid the issue where the source region doesn't send Close() to regions that are still neighbours (hence not resetting DoNotCloseAfterTeleport).
Fix here is to still set DoNotCloseAfterTeleport if scene presence is still registered as in transit from A
2013-08-09 00:24:22 +01:00
b1c26a56b3
Fix an issue where under teleport v2 protocol, teleporting from regions in an line from A->B->C would not close region A when reaching C
...
The root cause was that v2 was only closing neighbour agents if the root connection also needed a close.
However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection.
This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the
This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports).
Also, has not been completely tested yet in scenarios where regions are running on different simulators
2013-08-08 23:29:30 +01:00
6410a25cef
BulletSim: adjust avatar position when the avatar's size is changed.
...
This fixes the problem of avatars bouncing when logged in.
Added a little height to the avatar height fudges to eliminate a problem
of feet being in the ground a bit.
2013-08-08 13:55:17 -07:00
9fc97cbbf7
Make m_originRegionID in ScenePresence public to allow DSG module to work for now. Once the code churn on teleport ends, I can find a better solution
2013-08-08 12:44:03 -07:00
d9bd6e6b5b
Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini.
...
Add 'callback' query parameter to managed stats return to return function
form of JSON data.
2013-08-08 09:45:30 -07:00
c67c55e0fc
Better error reporting when registering LSL function extensions (comms module).
...
For unknown reasons, a dynamic function signature cannot have more than 5
parameters. Error message now tells you this fact so you can curse MS and
then go change your function definitions.
2013-08-08 09:45:16 -07:00
50c163ae6c
Add a JSON web fetch of the statististics managed by StatsManager.
...
Disabled by default. Enable by setting
[Startup]ManagedStatsRemoteFetchURI="Something"
and thereafter "http://ServerHTTPPort/Something/ " will return all the managed
stats (equivilent to "show stats all" console command).
Accepts queries "cat=", "cont=" and "stat=" to specify statistic category,
container and statistic names. The special name "all" is the default and returns
all values in that group.
2013-08-08 09:45:01 -07:00
4e86674a3a
* Added set water height <height> [<x>] [<y>] console command following the set terrain heights console command as an example.
2013-08-07 23:33:23 -05:00
99a4a91488
* This makes in-world terrain editing smoother, even in MegaRegions. This change only affects the editing user's experience. Non-editing users will see nothing different from the current 'slow' result. See comments for the thought process and how the issues surrounding terrain editing, cache, bandwidth, threading, terrain patch reliability and throttling were balanced.
2013-08-07 21:22:04 -05:00
ce1361f2fe
minor: Remove console lines at bottom of FakeParcelIDTests() regression test that were accidentally left in
2013-08-08 01:07:30 +01:00
64216b34a4
Fixed error in BuildFakeParcelID() which was detected by regression tests.
2013-08-08 01:02:04 +01:00
43da879ea2
Added regression tests for the routines related to fake parcel IDs.
2013-08-08 00:59:55 +01:00
e4da8d74d8
Additional regression tests for the location routines in Location.cs
2013-08-08 00:56:13 +01:00
638c3d25b0
Remove never implemented stub modules commands (list, load, unload) from back in 2009.
...
"show modules" is the functional console command that will show currently loaded modules.
Addresses http://opensimulator.org/mantis/view.php?id=6730
2013-08-08 00:48:22 +01:00
005c69511d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-08-07 23:29:42 +01:00
b10710d4a5
minor: add some method doc to ScenePresence fields used for entity transfer, add minor details to some log messages, rename a misleading local variable name.
...
No functional changes.
2013-08-07 23:17:31 +01:00
a33a1ac958
Add post-CreateAgent teleport cancellation/abortion functionality from v1 transfer protocol into v2.
...
This stops OpenSimulator still trying to teleport the user if they hit cancel on the teleport screen or closed the viewer whilst the protocol was trying to create an agent on the remote region.
Ideally, the code may also attempt to tell the destination simulator that the agent should be removed (accounting for issues where the destination was not responding in the first place, etc.)
2013-08-07 18:52:30 +01:00
dbd773e89e
Amend to last commit -- remove the obsolete var from OpenSim.ini.example
2013-08-07 10:04:53 -07:00
6b9a65972c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-07 08:02:36 -07:00
3194ffdab8
Fixed incomplete commit r/23317 -- see_into_region. Put the guard around estate bans also, and delete the obsolete config var.
2013-08-07 08:01:59 -07:00
d6d5d4ebd0
Add file missing from last commit 4c2f6de
2013-08-06 18:32:16 +01:00
4c2f6de8e4
Add the experimental ability to dump stats (result of command "show stats all") to file OpenSimStats.log every 5 seconds.
...
This can currently only be activated with the console command "debug stats record start".
Off by default.
Records to file OpenSimStats.log for simulator and RobustStats.log for ROBUST
2013-08-06 18:29:33 +01:00
ac198068ab
Add "debug threadpool status" console command to show min/max/current worker/iocp threadpool numbers
2013-08-06 00:00:12 +01:00
4581bdd929
Add "debug comms status" command to show current debug comms settings
2013-08-05 23:49:33 +01:00
9bcf072795
Make it possible to switch whether we serialize osd requests per endpoint or not, either via config (SerializeOSDRequests in [Network]) or via the "debug comms set" console command.
...
For debug purposes to assess what impact this has on network response in a heavy test environment.
2013-08-05 23:44:48 +01:00
f9dc5815c4
For LLImageManagerTests, make tests execute under synchronous fire and forget conditions.
...
I generally prefer this approach for regression tests because of the complexity of accounting for different threading conditions.
2013-08-05 23:15:30 +01:00
139dcf1246
minor: move "threads abort" and "force gc" console commands into debug category - these are not things one needs to do in normal operation
2013-08-05 23:06:17 +01:00
76e778fe2c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 23:05:12 +01:00
160659f683
Make it possible to set worker/iocp min/max threadpool limits on the fly with the console command "debug threadpool set"
2013-08-05 23:04:36 +01:00
2d3ac2b1ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 14:21:39 -07:00
946b370966
Child agent updates: remove the dependency on the root agent's camera position. That was a complete overkill that is unnecessary at this point.
2013-08-05 14:21:17 -07:00
24dcf3cf6a
Comment out debug log lines about script modules comms for now.
...
If this is an issue, could change log4net config instead to allow re-enablement
2013-08-05 20:51:40 +01:00
b8612e005a
At OpenSimulator startup, print out default min built-in threadpool threads as well as max.
...
Make it clear that we only try to adjust max, and log at warn level if this fails.
Other minor logging cleanup.
2013-08-05 20:47:47 +01:00
151a8ca0cc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 20:37:27 +01:00
7f0d9ad644
Make test AssetsClient print out more information about any failure to set thread numbers and immediate post config thread numbers
2013-08-05 20:36:46 +01:00
03698121ed
Remove some debugging from simian connectors.
2013-08-05 12:34:53 -07:00
976514d39a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 19:25:51 +01:00
76bd3de2fd
Add checks monitoring framework to provide alerts if certain conditions do not hold.
...
Not yet in use.
2013-08-05 19:22:47 +01:00
05012bb0df
Group notices bug fix: use a new IM for each member of the group, otherwise the fields get messed up because the transfer is async
2013-08-05 08:09:30 -07:00
5b4b349776
Fix the failing TestSendImage. J2K decoding is async.
2013-08-03 21:27:32 -07:00
09cb2a37dd
More on HG inventory and OutboundPermission: disallowing giving inventory to foreigners if OutboundPermission is false
2013-08-03 20:36:30 -07:00
Melanie