c2e89334b8
Merge branch 'master' into careminster
2012-11-23 01:44:35 +00:00
7133b6bb4f
Fix recent windows build break.
...
Add missing OpenSim.Framework.Servers reference
2012-11-23 01:43:11 +00:00
3c1a58c67a
Merge branch 'master' into careminster
2012-11-22 13:37:27 +00:00
45d1e6ab09
Make "show info" command available across all servers
...
This helpfully lists version information, startup location and console log level
2012-11-22 04:45:53 +00:00
c4c6121752
Merge branch 'master' into careminster
2012-11-22 03:17:33 +00:00
bac8ac32da
Add regression test for a good request made to the asset service post handler.
...
Adds new OpenSim.Server.Handlers.Tests.dll to test suite
2012-11-21 23:42:34 +00:00
e4659a83f1
Merge branch 'master' into careminster
2012-11-17 02:03:24 +00:00
e25c51330a
Add basic XInventoryServicesTests.TestAddItem() regression test.
2012-11-17 00:12:25 +00:00
5895c4cc6f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-11-15 03:46:10 +00:00
0c4efdc6a8
Fix build break from 1aa0271 by adding System.Core to prebuild.xml
2012-11-15 03:32:03 +00:00
6ce93b22d1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-12 19:05:06 +01:00
1e86c58822
Remove now unnecessary OpenSim.Framework.Console reference from Monitoring.
...
Properly resolve circular reference which no longer appeared in Mono build as there were no using statements for it.
2012-10-12 01:58:46 +01:00
387ce8ef35
Fix build break by moving OpenSim.Framework.Console back below HttpServer in the build order.
...
Luckily, it turns out Framework.Monitoring doesn't need to reference Console directly.
2012-10-12 00:10:51 +01:00
1f2472d0fc
Extend "show stats" command to "show stats [list|all|<category name>]"
...
This allows different categories of stats to be shown, with options to list categories or show all stats.
Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism.
This commit also adds percentage stats for packets and blocks reused from the packet pool.
2012-10-11 23:28:53 +01:00
f7df68d922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 02:48:28 +01:00
d87813a194
Finally fix build break by allowing UserManagementModule (which constructs a packet directly) to reference OpenSim.Region.ClientStack.LindenUDP.
...
This time I actually properly did a clean build
2012-10-05 02:02:19 +01:00
001ec0e2e6
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-27 17:29:44 +01:00
a1a0a90720
more upload changes (plus untouch prebuild.xml)
2012-09-24 22:57:33 +01:00
7ae0b5e605
touch prebuild.xml
2012-09-24 21:28:03 +01:00
2d02405186
Change the poll service to use a thread pool for replies to make sure the
...
event queues aren't blocked by other traffic.
2012-09-23 23:16:25 +02:00
f79de2232e
fix build
2012-09-17 13:52:27 +01:00
bc85c1d084
add suport funtions for mesh upload costs
2012-09-17 13:32:58 +01:00
66bf1376b5
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
2012-09-16 04:21:18 +01:00
db774d4292
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
1ec84ac8b1
Add basic asset connector tests to check behaviour for normal, local and temporary assets.
...
Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load
Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
2012-09-15 02:12:26 +01:00
81fda6f947
Revert "Fix prebuild.xml format for reference"
...
This reverts commit 96f889b20e
2012-09-11 23:43:37 -04:00
96f889b20e
Fix prebuild.xml format for reference
...
Mono.Data.SQL entry was bad
2012-09-11 22:56:29 -04:00
0d5023b46b
fix prebuild.xml
2012-09-11 12:34:44 +01:00
a6753c14a5
Revamp the v3 inventory sending. Uses threads and some nifty mechanics to
...
leverage the Poll Service without blocking it's workers.
2012-09-11 10:39:43 +02:00
e2e8b09059
Merge branch 'master' into careminster
2012-09-02 22:15:55 +01:00
a0eda6eb16
Fix Windows build
...
Add reference to fix Windows build: no windows here to test, please report any issues back to IRC #opensim-dev ASAP
2012-08-31 13:09:54 -04:00
1b15144208
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-08-31 01:32:18 +01:00
adce58b33a
Renaming existing 'torture' tests to 'performance' tests instead, since this better matches what they really do.
...
nant target name changes to test-perf instead of torture, to match test-stress
still not run by default
2012-08-29 23:19:21 +01:00
ec726413dd
Add VectorRenderModuleStressTests that contains a long running test that generates thousands of vector textures concurrently.
...
Intended for use if there are future issues with mono crashes whilst generate dynamic textures.
This test is triggered via a new test-stress nant target.
Not run by default.
2012-08-29 23:04:00 +01:00
f8603a215d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-23 01:41:47 +01:00
bcbd450fe4
Add --force flag to "kick user" console command to allow bypassing of recent race condition checks.
...
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
2012-08-20 20:24:54 +01:00
df2f9b1885
*** TESTTTTT ** downgrade from .net 4.0 to .net3.5
2012-08-06 11:04:29 +01:00
0c00abcce1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-08-03 16:46:11 +01:00
86b005de1d
Add simple draw test for the VectorRenderModule
2012-08-02 22:14:09 +01:00
45b72bf01c
Fix some merge issues and a functional issue in the scene manager
2012-07-28 01:06:28 +01:00
771d79e83e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
2012-07-28 00:39:36 +01:00
5aec0ff207
Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework
2012-07-25 23:27:00 +01:00
35efa88c26
Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.
...
This better reflects the long-term purpose of that project and matches Monitoring modules.
2012-07-25 23:11:50 +01:00
a1e99642c1
Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
...
This aims to capture the amount of memory that OpenSim turns over whilst operating a region.
This memory is not lost - apart from leaks it is reclaimed by the garbage collector.
However, the more memory that gets turned over the more work the GC has to do to reclaim it.
2012-07-25 22:29:40 +01:00
7dfd581913
Fix merge issues in prebuild
2012-07-23 19:17:27 +01:00
fb8e92c90b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Helpers.cs
prebuild.xml
2012-07-23 18:54:12 +01:00
b537bbc410
Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled before BulletSim is
2012-07-20 15:44:53 -07:00
24dfb5bcb3
Remove an added but unnecessary dependency in prebuild.xml
2012-07-20 14:07:35 -07:00
e9c437ed0e
Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a simple, high performance logger for high frequency logging (physics sub-operations, for instance).
2012-07-20 14:02:26 -07:00
d632fd7124
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-07-12 08:55:16 +01:00
Melanie