| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
|
| | | |
|
| | |
| |
| |
| | |
However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
|
| | |
| |
| |
| | |
printed out periodically)
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
<category/module>" to display commands in a category.
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
|
| |\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
| | | |
|
| |\ \
| |/ |
|
| | |
| |
| |
| | |
returns and for consistency.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
|
| |\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
whether the process is 32-bit or 64-bit
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| | |
Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound.
This matches the tickcount masking in the thread watchdog.
For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
|
| | |
| |
| |
| | |
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
of OSHttpRequest/OSHttpResponse.
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
|
| |\ \
| |/ |
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
path.
Also simplifies debug levels to just 0 and 1
|
| | |
| |
| |
| | |
non-event queue inbound http requests to a simulator
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
|
| | |
| |
| |
| | |
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| |/ |
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Framework/Watchdog.cs
|
| | |
| |
| |
| |
| |
| | |
today in 8a0a78c.
Also adds these to the watchdogs with very large timeouts (should really be infinite)
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
abort a watchdog managed thread.
This is for diagnostic purposes.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
of the other way around.
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
|
| |\ \
| |/ |
|
| | |
| |
| |
| | |
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| | |
BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
|
| | | |
|
| |\ \
| |/ |
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
|
| | |
| |
| |
| |
| |
| | |
allow attachments to be temporarily turned off.
This is for debugging purposes. Defaults to Attachments Enabled
|
| |\ \
| |/ |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
