Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-09 | 2 | -2/+13 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-08 | 2 | -9/+9 |
| |\ | |||||
| | * | move CacheSculptMaps ini flag to OpenSimDefaults.ini | dahlia | 2010-10-07 | 2 | -9/+9 |
| | | | | | | | | | | | | comment it and change defailt to true to reflect code | ||||
| * | | Clarify the format comment at the top of OpenSim.ini.example | Melanie | 2010-10-08 | 1 | -1/+4 |
| |/ | |||||
| * | add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map ↵ | dahlia | 2010-10-07 | 1 | -0/+8 |
| | | | | | | | | caching for meshing | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 7 | -52/+50 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 1 | -4/+3 |
| | | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 6 | -48/+47 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 11 | -27968/+27897 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-04 | 1 | -0/+3 |
| |\ | |||||
| | * | Made the home agent handler check for xff if behind a proxy. | Diva Canto | 2010-10-03 | 1 | -0/+3 |
| | | | |||||
| * | | Added Meshmerizer rendering plugin for libomv | Latif Khalifa | 2010-10-04 | 1 | -0/+0 |
| | | | |||||
| * | | Removed linden renderer | Latif Khalifa | 2010-10-04 | 1 | -0/+0 |
| | | | |||||
| * | | Use libomv 0.8.4.3445 | Latif Khalifa | 2010-10-04 | 7 | -27968/+27887 |
| |/ | |||||
| * | Made the Gatekeeper proxy-able. | Diva Canto | 2010-10-03 | 2 | -0/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -0/+0 |
|\ \ | |/ | |||||
| * | Add the matching PrimMesher.dll | Melanie | 2010-10-04 | 1 | -0/+0 |
| | | |||||
| * | Replaced OpenMetaverse dlls with ones compiled in Windows. | Diva Canto | 2010-10-03 | 7 | -18612/+17739 |
| | | |||||
| * | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 8 | -16751/+18045 |
| | | |||||
* | | Update libOMV | Melanie | 2010-10-04 | 7 | -18612/+17739 |
| | | |||||
* | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 8 | -16751/+18045 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 3 | -0/+0 |
|\ \ | |/ | |||||
| * | Upgraded Mono.Addins.dll to 0.5, coming from here: ↵ | Diva Canto | 2010-10-03 | 3 | -0/+0 |
| | | | | | | | | http://monoaddins.codeplex.com/ | ||||
| * | Add the Warp3D dll | Melanie | 2010-10-03 | 1 | -0/+0 |
| | | |||||
* | | Add the Warp3D dll | Melanie | 2010-10-03 | 1 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-02 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | adding -logconfig to Robust.exe | BlueWall | 2010-10-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Adding -logconfig to Robust.exe. will still process the -logfile option, as before. No options given, the value "Robust.log" will be written in the ./bin directory | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-26 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Another typo fix | Melanie | 2010-09-26 | 1 | -1/+1 |
| | | |||||
| * | adding configurable j2kDecodeCache path | BlueWall | 2010-09-26 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | allowing the decoded sculpt map cache path to be defined in the configuration files. Use DecodedSculpMapPath in the [Startup] section to set the path. The default is still ./bin/j2kDecodeCache | ||||
| * | Some cleanup to OpenSimDefaults.ini | BlueWall | 2010-09-26 | 1 | -0/+9 |
| | | | | | | | | Fixing a couple of errors | ||||
| * | Changes to preceding patch to make it conform to inifile formats. BLANK LINE | Melanie | 2010-09-26 | 2 | -4/+4 |
| | | | | | | | | | | before each comment/option group, and DOUBLE SEMICOLONS before pure text comments in OpenSim.ini.exemaple | ||||
| * | Add configurable path to script engine assemblies | BlueWall | 2010-09-26 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | Adding ability to place script engine assemblies outside the codebase directories. Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies" Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge Master | Melanie | 2010-09-26 | 2 | -0/+10 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 4 | -0/+0 |
|\ \ | |/ | |||||
| * | * Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a ↵ | Teravus Ovares (Dan Olivares) | 2010-09-23 | 4 | -0/+0 |
| | | | | | | | | slightly modified version of CSharpSqlite built in silverlight mode so that it doesn't have the locking issues that it normally would under .NET and a custom ADO.NET wrapper based on Mono.Data.Sqlite. I'm not entirely sure if these will be kept here like this in debug mode with the pdb's Maybe to start.. but after some testing we'll put them in release mode. | ||||
| * | Add LandServices to make landmarks work right in grids | Melanie | 2010-09-17 | 2 | -0/+2 |
| | | |||||
* | | Add LandServices to make landmarks work right in grids | Melanie | 2010-09-17 | 2 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-16 | 6 | -35/+694 |
|\ \ | |/ | |||||
| * | Add the modules include line back that i dropped by mistake | Melanie | 2010-09-15 | 1 | -0/+3 |
| | | |||||
| * | Mark up OpenSim.ini.example for use with an automatic configuration tool. | Melanie | 2010-09-15 | 2 | -37/+688 |
| | | | | | | | | | | Remove seldom changed options from OpenSim.ini.example. Remove non-overridable settings like [Architecture] from OpenSimDefaults.ini | ||||
| * | Make AuthorizationService optional and disabled by default. It depends on | Melanie | 2010-09-15 | 4 | -2/+6 |
| | | | | | | | | | | external PHP and the default configuration makes it throw for not having a URL to this PHP | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 3 | -0/+1342 |
|\ \ | |/ | |||||
| * | Revert "Move OpenSimDefaults,ini into config-include in order to put it with ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | all the other default files" This reverts commit c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1. Reverted by agreement. | ||||
| * | Revert "Repopulate OpenSim.ini.example with OpenSimDefaults.ini until ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1301/+1 |
| | | | | | | | | | | | | | | | | somebody does the work of deciding what users commonly change and what they don't" This reverts commit fc48eb7b549cc639e143bb0f1369d74223630aff. Reverted by agreement. | ||||
| * | Move OpenSimDefaults,ini into config-include in order to put it with all the ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -0/+0 |
| | | | | | | | | other default files | ||||
| * | Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1301 |
| | | | | | | | | the work of deciding what users commonly change and what they don't | ||||
| * | add the missing ini example | Melanie | 2010-09-14 | 1 | -0/+1 |
| | | |||||
| * | Renamed OpenSimDefaults.ini.example to OpenSimDefaults.ini | John Hurliman | 2010-09-13 | 1 | -0/+0 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-13 | 2 | -0/+2 |
| |\ |