Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | |||||
| | * | Adding missing ConnectionString lines to [DatabaseService] sections for ↵ | John Hurliman | 2010-09-13 | 2 | -0/+2 |
| | | | | | | | | | | | | SQLite configs | ||||
| * | | Output an error and quit if the master file is missing. Also rename | Melanie | 2010-09-13 | 1 | -0/+0 |
| |/ | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example | ||||
* | | Output an error and quit if the master file is missing. Also rename | Melanie | 2010-09-13 | 1 | -0/+0 |
| | | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 10 | -42/+67 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 8 | -27/+52 |
| | | | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings | ||||
| * | Update Prebuild.exe with Prebuild r323 + an existing OpenSim specific nant ↵ | Justin Clark-Casey (justincc) | 2010-09-11 | 1 | -0/+0 |
| | | | | | | | | | | | | | | hack to correctly clean up chosen OpenSim exes and dlls in bin/ on a "nant clean" Source code is included for reference. This can go away again once Prebuild is updated with a more general mechanism for cleaning up files. The Prebuild source code here can be built with nant, or regnerated for other tools using the prebuild at {root}/bin/Prebuild.exe | ||||
| * | Merge branch 'prebuild-update' | Justin Clark-Casey (justincc) | 2010-09-10 | 1 | -0/+0 |
| |\ | |||||
| | * | Build system upgrade: | BlueWall | 2010-09-04 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrading Prebuild.exe to correctly construct build solutions for crossplatform tools such as xbuild, monodevelop and nant. NOTE: Module prebuild files will need modification to work, as the prebuild must correctly define the reference path for all assemblies shipped in the OpenSimulator ./bin directory. These include assemblies such as XMLRPC.dll, OpenMetaverse.dll, Nini.dll, etc. . The entries should follow the form: <Reference name="Nini" path="../../../bin/"/> See the distributed prebuild.xml for further examples. Crossplatform tools: xbuild and monodevelop use the vs2008 OpenSim.sln and the .csproj files in each namespace. Changes to the Prebuild.exe are against svn 322 and are included in a patch attached to the mantis. And the dnpb source are available@ svn co https://dnpb.svn.sourceforge.net/svnroot/dnpb dnpb The patches are pending application by the dnpb team. After which, the un-modified upstream Prebuild.exe will work as expected. | ||||
| * | | Renamed the Helo server connector to a consistent name. Added this in ↵ | Diva Canto | 2010-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | | connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule. | ||||
| * | | Rolling back the recent libomv update but keeping the ExpiringCache cleanups ↵ | John Hurliman | 2010-09-07 | 3 | -0/+0 |
| | | | | | | | | | | | | (as much as is possible). There was a report of non-finite avatar positions after the update | ||||
| * | | * Cache null account responses in the SimianUserAccountServiceConnector to ↵ | John Hurliman | 2010-09-07 | 3 | -0/+0 |
| | | | | | | | | | | | | | | | | | | avoid repeated requests for missing avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache | ||||
| * | | Corrected SimianGrid.ini and HyperSimianGrid.ini configs to specify services ↵ | John Hurliman | 2010-09-07 | 2 | -14/+14 |
| | | | | | | | | | | | | in the way the ROBUST loader expects them (hopefully!) | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 3 | -6/+91 |
|\ \ \ | |/ / | |||||
| * | | Make User Agent Service and Login Service separable. | Diva Canto | 2010-09-04 | 1 | -0/+4 |
| |/ | |||||
| * | Added XFF header processing. Untested, for lack of proxy. | Diva Canto | 2010-09-03 | 1 | -0/+3 |
| | | |||||
| * | In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod ↵ | Justin Clark-Casey (justincc) | 2010-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | rather than an older XML one This is a patch from http://opensimulator.org/mantis/view.php?id=4973. Thanks randomhuman | ||||
| * | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors ↵ | John Hurliman | 2010-09-03 | 2 | -5/+83 |
| | | | | | | | | | | | | to handle initialization as graceful as possible with the current broken way region module initialization is done * Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 2 | -2/+1 |
|\ \ | |/ | |||||
| * | Deleted Check4096 from Robust.ini.example | Diva Canto | 2010-08-26 | 1 | -2/+1 |
| | | |||||
| * | Rename Newtonsoft.Json.dll to properly reflect its actual assembly name | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Typo | Diva Canto | 2010-08-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Correct a minor typo | Melanie | 2010-08-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 3 | -79/+89 |
|\ \ | |/ | |||||
| * | OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section ↵ | Ai Austin | 2010-08-20 | 1 | -27/+32 |
| | | | | | | | | away from end and correction of typo "fro" (fixes Mantis 4833) | ||||
| * | Make some small corrections to ini.example file changes. These are not ↵ | Justin Clark-Casey (justincc) | 2010-08-20 | 2 | -20/+12 |
| | | | | | | | | functional changes. | ||||
| * | Robust.ini.example and Robust.HG.ini.example default: corrected comment ↵ | Ai Austin | 2010-08-20 | 2 | -40/+53 |
| | | | | | | | | about realm for UserAccountService to state default is useraccount, and include default realm commented out in every case | ||||
| * | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie | 2010-08-20 | 1 | -0/+6 |
| | | | | | | | | to make it more configurable. | ||||
* | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie Thielker | 2010-08-20 | 1 | -0/+6 |
| | | | | | | | | to make it more configurable. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-19 | 45 | -0/+338 |
|\ \ | |/ | |||||
| * | One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. | Diva Canto | 2010-08-18 | 2 | -327/+327 |
| | | | | | | | | (Files .xml and .txt also want to be committed) | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-18 | 1 | -0/+0 |
| |\ | |||||
| * | | Add textures no longer shipped with newer viewers to OpenSim's standard ↵ | Justin Clark-Casey (justincc) | 2010-08-18 | 45 | -0/+338 |
| | | | | | | | | | | | | | | | | | | | | | asset library These are appropriately licensed and include plant, tree and miscellaneous textures (face target crosshairs, etc). Many thanks to Nebadon for sourcing and packaging these. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 1 | -0/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | * Updated to OpenMetaverse.StructuredData.dll that includes implicit ↵ | John Hurliman | 2010-08-17 | 1 | -0/+0 |
| | | | | | | | | | | | | typecasts going in the other direction | ||||
| * | | Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecasts | John Hurliman | 2010-08-17 | 1 | -0/+0 |
| |/ | |||||
* | | Add ini.example section for the MOTD module. | meta7 | 2010-08-11 | 1 | -0/+4 |
| | |