Commit Graph

1085 Commits (3ce335c6f865e1b42fbefd44f38f9a2da09ef853)

Author SHA1 Message Date
Kitto Flora 0871d20adb Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-04 21:08:14 +00:00
Kitto Flora cb3b124df9 Fixes fresh hollowed prim collision shape. 2010-08-04 21:08:00 +00:00
Melanie 757929012e Merge branch 'master' into careminster-presence-refactor 2010-08-04 01:11:47 +01:00
Melanie d987e8ef18 Revert "re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, but"
This reverts commit 9c7e35860e.
2010-08-04 01:09:51 +01:00
Melanie 164719119b Merge branch 'master' into careminster-presence-refactor 2010-08-04 01:01:08 +01:00
Melanie 9c7e35860e re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, but
still needed for web-loading region configs and for loading legacy XML
region files
2010-08-04 01:00:06 +01:00
Melanie e12993ed22 Merge branch 'master' into careminster-presence-refactor 2010-08-04 00:33:02 +01:00
Diva Canto 239478f3a9 Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, but it clears up the circular dependency issue between Gatekeeper and UserAgents that had made me resort to in-process remote calls, which, in turn, were hitting bugs down there somewhere in mono.
NOTE: CONFIGURATION CHANGE IN ROBUST.HG.INI.EXAMPLE !!!###!!!
2010-08-03 16:02:52 -07:00
Tom d5f497478a Add config option securePermissionsLoading which will stop the region from loading if the specified permissions modules fail to load. 2010-08-01 10:21:56 -07:00
Melanie 7a9e246ccd Merge branch 'master' into careminster-presence-refactor 2010-07-29 16:20:59 +01:00
Melanie 7b471bb21c Adding sample configuration to previous patch 2010-07-22 03:04:34 +01:00
Melanie 686837d9ed Merge branch 'master' into careminster-presence-refactor 2010-07-20 21:18:27 +01:00
Tom Grimshaw ef6565470f XGitminster: Update config options; commitFrameInterval -> CommitInterval and a new option DisableNonEssentialCommits 2010-07-17 06:54:46 -07:00
Diva Canto b75fc97865 Fixes mantis #4872. Port for GridInfo was wrong in Robust.HG.ini.example 2010-07-15 03:34:03 -07:00
Melanie 0b74662ce2 Merge branch 'master' into careminster-presence-refactor 2010-07-14 19:53:15 +01:00
Diva Canto e17591f4cf Cleaned up a couple of things from OpenSim.ini.example: [Friends] section has been in other inis for a while, not needed here; and [Network] remoteDataPort is obsolete. 2010-07-14 08:52:22 -07:00
Melanie 5f400a50be Merge branch 'master' into careminster-presence-refactor 2010-07-08 17:32:57 +01:00
Diva Canto cd19e6fe32 Fixes mantis #4842 2010-07-05 07:38:15 -07:00
Melanie 8a45191aa9 Merge branch 'master' into careminster-presence-refactor 2010-07-04 11:02:21 +01:00
Diva Canto c117f2144c Compiled Robust.32BitLaunch.exe to .Net 3.5 2010-07-03 10:40:33 -07:00
Melanie e328c23355 Add MapTileURL to robust to supply the url needed by snowglobe 2010-07-02 04:03:35 +01:00
Melanie 46a531d865 Merge branch 'master' into careminster-presence-refactor 2010-06-30 21:35:05 +01:00
Diva Canto 20fc35399b Fixes mantis #4815 and #4812 2010-06-28 14:10:22 -07:00
Diva Canto 7868f1f650 Fixed Robust.32BitLaunch.exe 2010-06-27 13:06:39 -07:00
Tom Grimshaw 5b6485481b Add extra Gitminster config options to ini.example 2010-06-26 11:02:09 -07:00
Melanie Thielker 6c6c7b0927 Remove libs from main tree 2010-06-26 06:25:03 +02:00
Melanie Thielker d3d63fe553 remove conflicting pdb debug files 2010-06-26 06:21:38 +02:00
Tom Grimshaw 8daa149c36 Remove the prepending slash from the default git repo name 2010-06-25 13:03:00 -07:00
Tom Grimshaw 3ef70b55e9 Whoops, enabled = true not enabled = 1 2010-06-25 12:58:13 -07:00
Tom Grimshaw e0d533dc4e Add [Git] section to OpenSim.ini.example for Gitminster 2010-06-25 12:55:02 -07:00
Tom Grimshaw 94ece2789d Add some libraries for XGitminster 2010-06-25 12:21:24 -07:00
Melanie e93853623b Merge branch 'master' into careminster-presence-refactor 2010-06-24 03:30:11 +01:00
Justin Clark-Casey (justincc) 8c56f04f82 add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch to OpenSim.ini.exmaple
Also tidies up and comments some existing entries
2010-06-23 01:21:49 +01:00
Melanie 04b60aa490 Merge branch 'master' into careminster-presence-refactor 2010-06-19 20:32:01 +01:00
Justin Clark-Casey (justincc) 514732595b minor: try and make the explanations for the AllowScriptCrossing and TrustBinaries settings in OpenSim.ini.example clearer 2010-06-18 23:38:40 +01:00
Justin Clark-Casey (justincc) de84da9e7b eliminate SimianGrid [Groups] section from GridCommon.ini.example as per Nebadon
this is only used by SimianGrid and is now in SimianGrid.ini
2010-06-18 23:20:32 +01:00
Justin Clark-Casey ed01e9162d Change Opensim.Servers.exe comment at top of Robust.HG.ini to Robust.exe
This addresses http://opensimulator.org/mantis/view.php?id=4772
Thanks to aiaustin for pointing this out
2010-06-18 23:11:31 +01:00
Melanie 0b75f759b4 Merge branch 'master' into careminster-presence-refactor 2010-06-16 04:10:55 +01:00
Diva Canto 07b8eddb64 Typo corrected in Robust.HG.ini.example 2010-06-14 19:11:49 -07:00
Melanie fdf648bcf3 Merge branch 'master' into careminster-presence-refactor 2010-06-14 02:49:15 +01:00
Diva Canto eff641ab83 Added Old Guids=true to all MySql connection strings. 2010-06-12 17:08:05 -07:00
Melanie 9648f08dc9 Add the AllowLightShareFunctions example 2010-06-11 17:53:49 +01:00
Melanie 8a084cb7e1 Remove a company name referecne from the example 2010-06-11 17:52:29 +01:00
Melanie 20ea823c19 Merge branch 'master' into careminster-presence-refactor 2010-06-08 22:07:01 +01:00
Justin Clark-Casey (justincc) c8b301a644 Improve instructions for [Groups] setup in OpenSim.ini.example 2010-06-08 21:12:01 +01:00
Melanie Thielker 890f3cc54c Changes osFunction permissions again. Allow_ with a list of UUIDs now again
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 15:46:54 +02:00
Melanie Thielker f1a1d7a521 Changes osFunction permissions again. Allow_ with a list of UUIDs now again
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 14:42:58 +01:00
Melanie Thielker 9e3b5a5587 Remove orphaned .dll.config files from tests 2010-05-26 19:29:56 +02:00
Melanie ccbcf421e7 Merge branch 'master' into careminster-presence-refactor 2010-05-21 15:27:17 +01:00
Melanie a2e24377b4 Replace CSJ2K with fixed version (Mantis #3318) 2010-05-21 15:26:04 +01:00