f3e90cbffc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-13 19:27:02 -08:00
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
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
f977291a44
Replace previously updated Prebuild.exe with one built directly with mono 2.4.3
2012-11-14 02:40:37 +00:00
564fe35d4d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-14 02:30:12 +00:00
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
1f9d39c15d
Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll.
2012-11-13 09:54:52 -08:00
18c5d33f0a
All optional modules' directives moved out of addin.xml
2012-11-13 09:48:56 -08:00
556d70feef
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2012-11-13 17:37:39 +00:00
89a1388857
Deleted .addin.xml. Added AssemblyInfo.cs
2012-11-13 09:04:32 -08:00
922425a205
Last 27 modules' directives (service connectors out).
2012-11-13 08:49:52 -08:00
457395d9c1
Another 11 modules' directions moved out of .addin.xml
2012-11-13 08:36:44 -08:00
608444c9f7
Another 21 modules' directives moved out of .addin.xml
2012-11-13 08:27:51 -08:00
af01a2320a
Merge branch 'master' into careminster
2012-11-13 10:49:24 +00:00
d73aa8c1a6
Moved the WindModule and its own plugins out of .addin.xml
2012-11-12 21:27:23 -08:00
99ccd4ea44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-12 21:15:35 -08:00
31177d9259
Another 10 modules' directives moved from .addin.xml
2012-11-12 21:14:58 -08:00
2fd36653b9
minor: Add some explanative method doc to SceneHelpers.SetupSceneModules()
2012-11-13 04:34:03 +00:00
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
29bfd9e46c
Merge branch 'master' into careminster
2012-11-13 02:28:40 +00:00
48577af325
More module cleanup: removed the CoreModules.Framework modules directives out of .addin.xml.
2012-11-12 18:23:20 -08:00
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
335ff4359c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-12 18:08:27 -08:00
86903f23dd
Cleanup on region modules: gave short node id's to all of them.
2012-11-12 18:08:02 -08:00
3398999149
Merge branch 'master' into careminster
2012-11-13 01:57:11 +00:00
40d5148bbc
Update ScriptModuleComms name space to CoreModules
2012-11-13 01:56:32 +00:00
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
4edaa4e41a
Completely remove the IRegionModule interface
2012-11-12 22:56:59 +00:00
faca755995
Stop closing old style modules
2012-11-12 22:51:24 +00:00
8c130bcaf5
Remove the old style module loader and all references to it
2012-11-12 22:50:28 +00:00
e41374dd01
Remove IRegionModule support from the test setup helper
2012-11-12 22:25:35 +00:00
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
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
152d5dc2a7
Fix mantis #6425
2012-11-11 21:13:14 -08:00
db418bff2b
Fix issues with the DynamicTextureModule and corresponding unit tests.
2012-11-11 19:39:21 -08:00
113a9704f2
One more module converted: WebStatsModule.
2012-11-11 17:02:22 -08:00
64fad2f80e
Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule.
2012-11-11 16:44:59 -08:00
4e8c8b2cd8
One more module converted: MRMModule.
2012-11-11 16:18:47 -08:00
abef034d1b
One more module converted: IRCStackModule.
2012-11-11 16:10:47 -08:00
ba2318bd61
One more module converted: PermissionsModule.
2012-11-11 15:59:09 -08:00
571f6a0300
One more module converted: XMLRPCModule. Removed it from the special loading at start.
2012-11-11 15:29:25 -08:00
4de8915ddd
One more module converted: VectorRenderModule.
2012-11-11 15:04:02 -08:00
9f45198516
One more module: DynamicTextureModule. Removed it from the special load in the beginning.
2012-11-11 14:54:40 -08:00
6759ed1013
One more module converted: LoadImageURLModule. Also removed it from its hard-coded instantiation (I think I understood what the problem was, and that I've done it right).
2012-11-11 14:46:22 -08:00
963b1e861c
One more module converted: ScriptsHttpRequests.
2012-11-11 14:22:06 -08:00
84be90e5f8
One more module converted: EmailModule.
2012-11-11 14:00:58 -08:00
f560d581bb
document & 80-character width terminal formatting
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
23605cf93d
converting NPC module to ISharedRegionModule
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
c60e1a1ae6
J2KDecoderModule: move the code out of PostInitialise()
2012-11-11 13:49:07 -08:00
d84de8c9b6
Merge branch 'master' into careminster
2012-11-11 21:16:58 +00:00
Diva Canto