ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 09:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,058 Commits 5 Branches 96 Tags
f30d519bcc1e68deee0d5b3671766ceb39a37018
Commit Graph

914 Commits

Author SHA1 Message Date
Melanie
f30d519bcc Merge branch 'master' into careminster 2012-12-09 21:27:32 +00:00
BlueWall
063f37cf73 One more time... 
needed one more "../" in the path (copy paste): Thanks BrucePatton for catching that one
 2012-12-07 20:03:15 -05:00
BlueWall
a6e5a2f4df Prebuild fix 
Had moved the class to a different namespace but failed to add the reference
 2012-12-07 19:41:07 -05:00
BlueWall
0b455d2882 Merge branch 'master' into connector_plugin 2012-12-07 15:36:43 -05:00
Melanie
2cb824d3fc Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-12-07 03:49:04 +00:00
Justin Clark-Casey (justincc)
7fdc251774 Add path references for Mono.Addins where they were missing for DataSnapshot and UserStatistics. 
Should address http://opensimulator.org/mantis/view.php?id=6444
Appears that nant doesn't need these paths but building directly in monodevelop does.
 2012-12-04 22:24:51 +00:00
BlueWall
c754003944 Merge branch 'master' into connector_plugin 
Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs
 2012-11-25 17:03:14 -05:00
Melanie
fd7a83f439 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
 2012-11-25 14:13:50 +00:00
Justin Clark-Casey (justincc)
22d4c52ffc Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests 2012-11-24 03:15:24 +00:00
Justin Clark-Casey (justincc)
82690e1384 Fix bug where loading an OAR with a deeded parcel would always set the parcel owner ID to the estate owner even if the group UUID was present. 
Aims to address http://opensimulator.org/mantis/view.php?id=6355
As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records
(i.e. no membership data etc)
This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
 2012-11-24 02:43:31 +00:00
Melanie
c2e89334b8 Merge branch 'master' into careminster 2012-11-23 01:44:35 +00:00
justincc
7133b6bb4f Fix recent windows build break. 
Add missing OpenSim.Framework.Servers reference
 2012-11-23 01:43:11 +00:00
Melanie
3c1a58c67a Merge branch 'master' into careminster 2012-11-22 13:37:27 +00:00
Justin Clark-Casey (justincc)
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
Melanie
c4c6121752 Merge branch 'master' into careminster 2012-11-22 03:17:33 +00:00
Justin Clark-Casey (justincc)
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
Melanie
e4659a83f1 Merge branch 'master' into careminster 2012-11-17 02:03:24 +00:00
Justin Clark-Casey (justincc)
e25c51330a Add basic XInventoryServicesTests.TestAddItem() regression test. 2012-11-17 00:12:25 +00:00
Melanie
5895c4cc6f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-11-15 03:46:10 +00:00
Justin Clark-Casey (justincc)
0c4efdc6a8 Fix build break from 1aa0271 by adding System.Core to prebuild.xml 2012-11-15 03:32:03 +00:00
BlueWall
07f1d44174 Merge branch 'master' into connector_plugin 2012-10-20 05:25:58 -04:00
BlueWall
99bb6c9304 Move PluginManager 
Move PluginManager out to OpenSimFramework for general use
 2012-10-19 07:38:36 -04:00
Melanie
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
BlueWall
08f6c8065e Add System.Core to references 2012-10-10 09:32:31 -04:00
BlueWall
252af020b0 Merge branch 'master' into connector_plugin 
Conflicts:
	OpenSim/Server/ServerMain.cs
 2012-10-09 06:44:14 -04:00
Melanie
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
BlueWall
440726250c Added parts to manage repositories and plugin management 
This is working - more testing to follow, then soem documentation
 2012-10-06 11:48:21 -04:00
Justin Clark-Casey (justincc)
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
Melanie
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
UbitUmarov
a1a0a90720 more upload changes (plus untouch prebuild.xml) 2012-09-24 22:57:33 +01:00
UbitUmarov
7ae0b5e605 touch prebuild.xml 2012-09-24 21:28:03 +01:00
Melanie
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
UbitUmarov
f79de2232e fix build 2012-09-17 13:52:27 +01:00
UbitUmarov
bc85c1d084 add suport funtions for mesh upload costs 2012-09-17 13:32:58 +01:00
Melanie
66bf1376b5 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
 2012-09-16 04:21:18 +01:00
Melanie
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
Justin Clark-Casey (justincc)
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
BlueWall
81fda6f947 Revert "Fix prebuild.xml format for reference" 
This reverts commit 96f889b20e.
 2012-09-11 23:43:37 -04:00
BlueWall
96f889b20e Fix prebuild.xml format for reference 
Mono.Data.SQL entry was bad
 2012-09-11 22:56:29 -04:00
UbitUmarov
0d5023b46b fix prebuild.xml 2012-09-11 12:34:44 +01:00
Melanie
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
Melanie
e2e8b09059 Merge branch 'master' into careminster 2012-09-02 22:15:55 +01:00
BlueWall
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
Melanie
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
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