Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 10 | -24305/+27552 |
|\ | |||||
| * | Merge branch 'moap' | Justin Clark-Casey (justincc) | 2010-08-06 | 10 | -24305/+27552 |
| |\ | |||||
| | * | Update OpenMetaverse libraries to r3287 + r3294 (removal of ↵ | Justin Clark-Casey (justincc) | 2010-07-27 | 9 | -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 prim | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2010-08-04 | 2 | -0/+3 |
|\ \ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-04 | 1 | -0/+0 |
| |\ \ \ | |||||
| | * | | | Revert "re-Add the XML configuration loader dll. It's gone AWOL in a ↵ | Melanie | 2010-08-04 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup, but" This reverts commit 9c7e35860e290e6bb77da7749d4d3b82a5c75418. | ||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-04 | 1 | -0/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, but | Melanie | 2010-08-04 | 1 | -0/+0 |
| | |/ / | | | | | | | | | | | | | | | | | still needed for web-loading region configs and for loading legacy XML region files | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-04 | 2 | -0/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, ↵ | Diva Canto | 2010-08-03 | 2 | -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 Flora | 2010-08-04 | 2 | -41/+0 |
|/ / | |||||
* | | Add config option securePermissionsLoading which will stop the region from ↵ | Tom | 2010-08-01 | 1 | -0/+3 |
| | | | | | | | | loading if the specified permissions modules fail to load. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-29 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Adding sample configuration to previous patch | Melanie | 2010-07-22 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fixes mantis #4872. Port for GridInfo was wrong in Robust.HG.ini.example | Diva Canto | 2010-07-15 | 1 | -1/+1 |
| | | |||||
* | | XGitminster: Update config options; commitFrameInterval -> CommitInterval ↵ | Tom Grimshaw | 2010-07-17 | 1 | -2/+5 |
| | | | | | | | | and a new option DisableNonEssentialCommits | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-14 | 1 | -12/+0 |
|\ \ | |/ | |||||
| * | Cleaned up a couple of things from OpenSim.ini.example: [Friends] section ↵ | Diva Canto | 2010-07-14 | 1 | -12/+0 |
| | | | | | | | | has been in other inis for a while, not needed here; and [Network] remoteDataPort is obsolete. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-08 | 2 | -1/+7 |
|\ \ | |/ | |||||
| * | Fixes mantis #4842 | Diva Canto | 2010-07-05 | 2 | -1/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-04 | 2 | -0/+3 |
|\ \ | |/ | |||||
| * | Compiled Robust.32BitLaunch.exe to .Net 3.5 | Diva Canto | 2010-07-03 | 1 | -0/+0 |
| | | |||||
| * | Add MapTileURL to robust to supply the url needed by snowglobe | Melanie | 2010-07-02 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 3 | -0/+9 |
|\ \ | |/ | |||||
| * | Fixes mantis #4815 and #4812 | Diva Canto | 2010-06-28 | 2 | -0/+9 |
| | | |||||
| * | Fixed Robust.32BitLaunch.exe | Diva Canto | 2010-06-27 | 1 | -0/+0 |
| | | |||||
* | | Add extra Gitminster config options to ini.example | Tom Grimshaw | 2010-06-26 | 1 | -0/+7 |
| | | |||||
* | | Remove libs from main tree | Melanie Thielker | 2010-06-26 | 8 | -9055/+0 |
| | | |||||
* | | remove conflicting pdb debug files | Melanie Thielker | 2010-06-26 | 3 | -0/+0 |
| | | |||||
* | | Remove the prepending slash from the default git repo name | Tom Grimshaw | 2010-06-25 | 1 | -1/+1 |
| | | |||||
* | | Whoops, enabled = true not enabled = 1 | Tom Grimshaw | 2010-06-25 | 1 | -1/+1 |
| | | |||||
* | | Add [Git] section to OpenSim.ini.example for Gitminster | Tom Grimshaw | 2010-06-25 | 1 | -0/+3 |
| | | |||||
* | | Add some libraries for XGitminster | Tom Grimshaw | 2010-06-25 | 11 | -0/+9055 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-24 | 1 | -4/+13 |
|\ \ | |/ | |||||
| * | add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch ↵ | Justin Clark-Casey (justincc) | 2010-06-23 | 1 | -4/+13 |
| | | | | | | | | | | | | to OpenSim.ini.exmaple Also tidies up and comments some existing entries | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-19 | 3 | -11/+5 |
|\ \ | |/ | |||||
| * | minor: try and make the explanations for the AllowScriptCrossing and ↵ | Justin Clark-Casey (justincc) | 2010-06-18 | 1 | -2/+4 |
| | | | | | | | | TrustBinaries settings in OpenSim.ini.example clearer | ||||
| * | eliminate SimianGrid [Groups] section from GridCommon.ini.example as per Nebadon | Justin Clark-Casey (justincc) | 2010-06-18 | 1 | -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.exe | Justin Clark-Casey | 2010-06-18 | 1 | -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-refactor | Melanie | 2010-06-16 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Typo corrected in Robust.HG.ini.example | Diva Canto | 2010-06-14 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-14 | 4 | -4/+4 |
|\ \ | |/ | |||||
| * | Added Old Guids=true to all MySql connection strings. | Diva Canto | 2010-06-12 | 4 | -4/+4 |
| | | |||||
| * | Add the AllowLightShareFunctions example | Melanie | 2010-06-11 | 1 | -0/+3 |
| | | |||||
* | | Remove a company name referecne from the example | Melanie | 2010-06-11 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-08 | 1 | -14/+13 |
|\ \ | |/ | |||||
| * | Improve instructions for [Groups] setup in OpenSim.ini.example | Justin Clark-Casey (justincc) | 2010-06-08 | 1 | -15/+13 |
| | | |||||
| * | Changes osFunction permissions again. Allow_ with a list of UUIDs now again | Melanie Thielker | 2010-05-30 | 1 | -0/+6 |
| | | | | | | | | | | | | 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. |