Commit Graph

22036 Commits (d92d5ca1fd2f84841881f5822316b4ba225e679d)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 038528dc80 Make PacketPool class stats pull stats instead of push stats so they can be lifted up into LLUDPServer and be distiguished by scene name 2012-11-15 02:02:59 +00:00
Justin Clark-Casey (justincc) 2c36106675 Add IncomingPacketsProcessedCount stat for diagnostics.
Also puts some packet processing counts in a container named after the scene so that stats can be collected from more than one scene.
2012-11-15 01:14:18 +00:00
Melanie 06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto 35fd4474b2 Added AssemblyInfos in the OpenSim.Server namespace dlls. 2012-11-14 11:20:55 -08:00
Diva Canto aeeaa3a0a9 Added AssemblyInfos to every dll in the OpenSim.Region namespace. 2012-11-14 11:09:43 -08:00
Diva Canto 27b12cebbb A few more AssemblyInfos in a few more dlls. 2012-11-14 08:10:15 -08:00
Diva Canto fcaddd901c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-14 07:50:58 -08:00
Diva Canto c88e6fb445 Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset service) 2012-11-14 07:50:19 -08:00
Justin Clark-Casey (justincc) 94da908813 More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possible.
Not doing SQLiteInventoryStore since this is no longer used and should disappear in the future.
2012-11-14 04:45:59 +00:00
Justin Clark-Casey (justincc) 2ccb53b42d If no ISimulationDataStore or IEstateDataStore implementations could be loaded then halt with informative message rather than a later NRE.
Halt already occurs if the relevant config sections are not present.
So it also makes sense to halt if the implementations themselves cannot be loaded.
2012-11-14 04:17:39 +00:00
Diva Canto 790b595aa0 Added a few more AssemblyInfos. (Plus added the one in OptionalModules, which had been forgotten.) 2012-11-13 19:50:19 -08:00
Diva Canto f3e90cbffc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-13 19:27:02 -08:00
Diva Canto e4cb7af98a Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file. 2012-11-13 19:26:43 -08:00
Justin Clark-Casey (justincc) 7861090a17 Replace old Prebuild.exe accidentally added back in f977291 with one built without <copy> nant target generation and on mono 2.4.3 2012-11-14 02:44:10 +00:00
Justin Clark-Casey (justincc) f977291a44 Replace previously updated Prebuild.exe with one built directly with mono 2.4.3 2012-11-14 02:40:37 +00:00
Justin Clark-Casey (justincc) 564fe35d4d Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-14 02:30:12 +00:00
Justin Clark-Casey (justincc) 90c6d2e50c Stop Prebuild from generating <copy> statements which unnecessarily copy files into bin/Debug or bin/Release
nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug
However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39).
Which makes nant time-consumingly copy these files when the aren't actually used.
Tested removal of <copy> on both nant 0.91 and nant 0.92
Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.
2012-11-14 02:25:07 +00:00
Diva Canto 1f9d39c15d Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. 2012-11-13 09:54:52 -08:00
Diva Canto 18c5d33f0a All optional modules' directives moved out of addin.xml 2012-11-13 09:48:56 -08:00
Melanie 556d70feef Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2012-11-13 17:37:39 +00:00
Diva Canto 89a1388857 Deleted .addin.xml. Added AssemblyInfo.cs 2012-11-13 09:04:32 -08:00
Diva Canto 922425a205 Last 27 modules' directives (service connectors out). 2012-11-13 08:49:52 -08:00
Diva Canto 457395d9c1 Another 11 modules' directions moved out of .addin.xml 2012-11-13 08:36:44 -08:00
Diva Canto 608444c9f7 Another 21 modules' directives moved out of .addin.xml 2012-11-13 08:27:51 -08:00
Melanie af01a2320a Merge branch 'master' into careminster 2012-11-13 10:49:24 +00:00
Diva Canto d73aa8c1a6 Moved the WindModule and its own plugins out of .addin.xml 2012-11-12 21:27:23 -08:00
Diva Canto 99ccd4ea44 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-12 21:15:35 -08:00
Diva Canto 31177d9259 Another 10 modules' directives moved from .addin.xml 2012-11-12 21:14:58 -08:00
Justin Clark-Casey (justincc) 2fd36653b9 minor: Add some explanative method doc to SceneHelpers.SetupSceneModules() 2012-11-13 04:34:03 +00:00
Justin Clark-Casey (justincc) f605a62427 Disable code to get server-side to move given items to a destination folder on TaskInventoryAccepted.
This is because the fixes to inventory versioning (so that they better match viewer expections)
now appear to allow the viewer to execute #RLV moves, as happens on the LL grid.
Doing it again server-side now wrongly creates another child #RLV folder underneath the root one.
As per http://opensimulator.org/mantis/view.php?id=6311
2012-11-13 04:15:21 +00:00
Melanie 29bfd9e46c Merge branch 'master' into careminster 2012-11-13 02:28:40 +00:00
Diva Canto 48577af325 More module cleanup: removed the CoreModules.Framework modules directives out of .addin.xml. 2012-11-12 18:23:20 -08:00
Melanie 9a5679876e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
2012-11-13 02:10:09 +00:00
Diva Canto 335ff4359c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-12 18:08:27 -08:00
Diva Canto 86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00
Melanie 3398999149 Merge branch 'master' into careminster 2012-11-13 01:57:11 +00:00
Melanie 40d5148bbc Update ScriptModuleComms name space to CoreModules 2012-11-13 01:56:32 +00:00
Melanie 2e0ce70e63 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/ModuleLoader.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-12 23:27:47 +00:00
Melanie 4edaa4e41a Completely remove the IRegionModule interface 2012-11-12 22:56:59 +00:00
Melanie faca755995 Stop closing old style modules 2012-11-12 22:51:24 +00:00
Melanie 8c130bcaf5 Remove the old style module loader and all references to it 2012-11-12 22:50:28 +00:00
Melanie e41374dd01 Remove IRegionModule support from the test setup helper 2012-11-12 22:25:35 +00:00
Melanie 0d15a6a01f Remove any mention of IRegionModule from region names and comments to aid
grepping for remaining uses
2012-11-12 19:18:20 +00:00
Melanie d9b149b375 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-11-12 15:46:45 +00:00
Diva Canto 152d5dc2a7 Fix mantis #6425 2012-11-11 21:13:14 -08:00
Diva Canto db418bff2b Fix issues with the DynamicTextureModule and corresponding unit tests. 2012-11-11 19:39:21 -08:00
Diva Canto 113a9704f2 One more module converted: WebStatsModule. 2012-11-11 17:02:22 -08:00
Diva Canto 64fad2f80e Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule. 2012-11-11 16:44:59 -08:00
Diva Canto 4e8c8b2cd8 One more module converted: MRMModule. 2012-11-11 16:18:47 -08:00
Diva Canto abef034d1b One more module converted: IRCStackModule. 2012-11-11 16:10:47 -08:00