aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* and another one...sacha2010-08-074-0/+9058
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-076-27547/+27552
|\
| * Added Check4096 config var under [GridService], at the request of many. ↵Diva Canto2010-08-062-0/+5
| | | | | | | | | | | | Changed the iteration that Marck had on the Hyperlinker. ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
| * These files want to be committed -- white space weirdness.Diva Canto2010-08-064-27547/+27547
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-0610-24305/+27552
|\ \ | |/
| * Merge branch 'moap'Justin Clark-Casey (justincc)2010-08-0610-24305/+27552
| |\
| | * Update OpenMetaverse libraries to r3287 + r3294 (removal of ↵Justin Clark-Casey (justincc)2010-07-279-24305/+27547
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenMetaverse.Http.dll dependency) + r3378 (treat MediaPermission as a bitfield) As far as I can determine, r3287 + r3294 patch was the previous update to the OpenMetaverse libraries This change just adds r3378 to overcome problems storing media textures with certain permission combinations in inventory This is a limited change in order to isolate moap from any other possible libomv update issues An update to the forthcoming libomv 0.8.3 is expected in due course to replace this This commit also deletes OpenMetaverse.Utilities.* as it's unused (on the advice of jhurliman).
| | * provide config option for media on a primJustin Clark-Casey (justincc)2010-07-261-0/+5
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Kitto Flora2010-08-042-0/+3
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-041-0/+0
| |\ \ \
| | * | | Revert "re-Add the XML configuration loader dll. It's gone AWOL in a ↵Melanie2010-08-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup, but" This reverts commit 9c7e35860e290e6bb77da7749d4d3b82a5c75418.
| * | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-041-0/+0
| |\ \ \ \ | | |/ / /
| | * | | re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, butMelanie2010-08-041-0/+0
| | |/ / | | | | | | | | | | | | | | | | still needed for web-loading region configs and for loading legacy XML region files
| * | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-042-0/+3
| |\ \ \ | | |/ /
| | * | Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, ↵Diva Canto2010-08-032-0/+3
| | |/ | | | | | | | | | | | | | | | 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 !!!###!!!
* | | Fixes fresh hollowed prim collision shape.Kitto Flora2010-08-042-41/+0
|/ /
* | Add config option securePermissionsLoading which will stop the region from ↵Tom2010-08-011-0/+3
| | | | | | | | loading if the specified permissions modules fail to load.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-291-0/+3
|\ \ | |/
| * Adding sample configuration to previous patchMelanie2010-07-221-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-201-1/+1
|\ \ | |/
| * Fixes mantis #4872. Port for GridInfo was wrong in Robust.HG.ini.exampleDiva Canto2010-07-151-1/+1
| |
* | XGitminster: Update config options; commitFrameInterval -> CommitInterval ↵Tom Grimshaw2010-07-171-2/+5
| | | | | | | | and a new option DisableNonEssentialCommits
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-141-12/+0
|\ \ | |/
| * Cleaned up a couple of things from OpenSim.ini.example: [Friends] section ↵Diva Canto2010-07-141-12/+0
| | | | | | | | has been in other inis for a while, not needed here; and [Network] remoteDataPort is obsolete.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-082-1/+7
|\ \ | |/
| * Fixes mantis #4842Diva Canto2010-07-052-1/+7
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-042-0/+3
|\ \ | |/
| * Compiled Robust.32BitLaunch.exe to .Net 3.5Diva Canto2010-07-031-0/+0
| |
| * Add MapTileURL to robust to supply the url needed by snowglobeMelanie2010-07-021-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-303-0/+9
|\ \ | |/
| * Fixes mantis #4815 and #4812Diva Canto2010-06-282-0/+9
| |
| * Fixed Robust.32BitLaunch.exeDiva Canto2010-06-271-0/+0
| |
* | Add extra Gitminster config options to ini.exampleTom Grimshaw2010-06-261-0/+7
| |
* | Remove libs from main treeMelanie Thielker2010-06-268-9055/+0
| |
* | remove conflicting pdb debug filesMelanie Thielker2010-06-263-0/+0
| |
* | Remove the prepending slash from the default git repo nameTom Grimshaw2010-06-251-1/+1
| |
* | Whoops, enabled = true not enabled = 1Tom Grimshaw2010-06-251-1/+1
| |
* | Add [Git] section to OpenSim.ini.example for GitminsterTom Grimshaw2010-06-251-0/+3
| |
* | Add some libraries for XGitminsterTom Grimshaw2010-06-2511-0/+9055
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-241-4/+13
|\ \ | |/
| * add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch ↵Justin Clark-Casey (justincc)2010-06-231-4/+13
| | | | | | | | | | | | to OpenSim.ini.exmaple Also tidies up and comments some existing entries
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-193-11/+5
|\ \ | |/
| * minor: try and make the explanations for the AllowScriptCrossing and ↵Justin Clark-Casey (justincc)2010-06-181-2/+4
| | | | | | | | TrustBinaries settings in OpenSim.ini.example clearer
| * eliminate SimianGrid [Groups] section from GridCommon.ini.example as per NebadonJustin Clark-Casey (justincc)2010-06-181-8/+0
| | | | | | | | this is only used by SimianGrid and is now in SimianGrid.ini
| * Change Opensim.Servers.exe comment at top of Robust.HG.ini to Robust.exeJustin Clark-Casey2010-06-181-1/+1
| | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=4772 Thanks to aiaustin for pointing this out
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-161-4/+4
|\ \ | |/
| * Typo corrected in Robust.HG.ini.exampleDiva Canto2010-06-141-4/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-144-4/+4
|\ \ | |/
| * Added Old Guids=true to all MySql connection strings.Diva Canto2010-06-124-4/+4
| |
| * Add the AllowLightShareFunctions exampleMelanie2010-06-111-0/+3
| |