Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵ | Diva Canto | 2013-03-01 | 2 | -92/+93 | |
| | | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon. | |||||
| * | Removed more vars from [Startup]. I think these were already moved ↵ | Diva Canto | 2013-03-01 | 1 | -20/+0 | |
| | | | | | | | | elsewhere, because I can't find any reference to them in the code. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 5 | -33/+60 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs | |||||
| * | Robust.HG.ini.example updated to get an [Hypergrid] section too. | Diva Canto | 2013-02-28 | 1 | -14/+15 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-27 | 3 | -6/+15 | |
| |\ | ||||||
| | * | Do not have the Freeswitch connector on by default in Robust ini example files. | Justin Clark-Casey (justincc) | 2013-02-27 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | This is not widely used (may even be currently broken), only allows very poor quality voice (not the fault of FreeSwitch) and requires a complicated Freeswitch setup. Having it on but not configured results in spurious warnings in the logs | |||||
| * | | Moved the HG default variables out of [Startup] and into their own section ↵ | Diva Canto | 2013-02-27 | 3 | -17/+41 | |
| | | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 1 | -4/+11 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||||
| * | | Improve description of GenerateMapTiles config option | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -7/+8 | |
| | | | ||||||
| * | | Add documentation on default or Warp3D image module choice to ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -0/+6 | |
| |/ | | | | | | | | | | | | | OpenSim.ini.example. As before, default is MapImageModule. Thanks to Ai Austin for pointing out this omission. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-26 | 3 | -52/+54 | |
|\ \ | |/ | ||||||
| * | Move map related settings from [Startup] to a new [Map] section in OpenSim.ini | Justin Clark-Casey (justincc) | 2013-02-25 | 2 | -52/+53 | |
| | | | | | | | | | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings. | |||||
| * | Missing var in [LoginService] for HG Robust. | Diva Canto | 2013-02-25 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-23 | 3 | -3/+11 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| * | More clarification on the [Groups] section | Diva Canto | 2013-02-23 | 1 | -0/+1 | |
| | | ||||||
| * | Further clarification on the same spot. | Diva Canto | 2013-02-23 | 1 | -0/+1 | |
| | | ||||||
| * | Improved documentation of Groups section. | Diva Canto | 2013-02-23 | 1 | -2/+6 | |
| | | ||||||
| * | Err.. wrong dll name for groups in Robust.HG.ini.example | Diva Canto | 2013-02-21 | 2 | -1/+3 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 8 | -69/+154 | |
|\ \ | |/ | ||||||
| * | Minor formatting cleanup. No changes. | Diva Canto | 2013-02-21 | 1 | -12/+12 | |
| | | ||||||
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵ | Diva Canto | 2013-02-21 | 3 | -30/+74 | |
| | | | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency. | |||||
| * | Add information about MinLoginLevel to example ini files | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -1/+11 | |
| | | ||||||
| * | Previous build failed. Checking in a dummy change to see if the fail persists. | Diva Canto | 2013-02-19 | 1 | -3/+3 | |
| | | ||||||
| * | First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵ | Diva Canto | 2013-02-19 | 3 | -15/+41 | |
| | | | | | | | | rest to Addons.Groups.dll. | |||||
| * | Offline IM: moved the Data and MySQL bits to the corresponding places in ↵ | Diva Canto | 2013-02-19 | 3 | -5/+3 | |
| | | | | | | | | core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that. | |||||
| * | Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll | Diva Canto | 2013-02-18 | 3 | -15/+22 | |
| | | ||||||
| * | BulletSim: add calls for creating all the different Bullet constraint types. | Robert Adams | 2013-02-17 | 4 | -0/+0 | |
| | | | | | | | | | | Updated the DLLs and SOs and code for BulletXNA to create the types. All the detailed control calls are not all in place yet. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-13 | 4 | -0/+0 | |
|\ \ | |/ | ||||||
| * | BulletSim: fix density since the simulator/viewer track density in a | Robert Adams | 2013-02-12 | 4 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | funny unit that is 100 times real density (default 1000). Fix avatar drifting slowly when stationary flying. Fix for physical prims getting corrected for being under terrain when it was just its geometric center that was below terrain. Add PreUpdatePropertyAction allowing plugable modifiction of phys parameters returned from Bullet. Fix an exception setting GravityMultiplier on initialization. Update DLLs and SOs for good measure (no functional change). | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-12 | 1 | -0/+0 | |
|\ \ | |/ | ||||||
| * | Replaced Ionic.Zip.dll with a new one that fixes a bug in it. DotNetZip ↵ | Diva Canto | 2013-02-12 | 1 | -0/+0 | |
| | | | | | | | | (from which Ionic.Zip.dll is derived) is now a fork in opensim-libs, forked from 1.9.1.8 and added that simple bug fix. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 4 | -0/+0 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||||
| * | BulletSim: add parameter to set global contact breaking threshold. Update ↵ | Robert Adams | 2013-02-08 | 4 | -0/+0 | |
| | | | | | | | | DLLs and SOs for setting same. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 2 | -0/+4 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||||
| * | Adds size limits to JsonStore. Adds a separate configuration | Mic Bowman | 2013-02-08 | 1 | -0/+4 | |
| | | | | | | | | variable to enable binding to dynamic attributes. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 2 | -2901/+2901 | |
|\ \ | |/ | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll | |||||
| * | * Adds Websocket support to baseHttpServer and IHttpServer.cs . This ↵ | teravus | 2013-02-07 | 6 | -29/+6 | |
| |\ | | | | | | | | | | allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs | |||||
| * | | This is the final commit that enables the Websocket handler | teravus | 2013-02-07 | 2 | -0/+0 | |
| | | | ||||||
| * | | We're not really done here.. but we're getting there. Socket Read is ↵ | teravus | 2013-02-05 | 3 | -2901/+2901 | |
| | | | | | | | | | | | | working.. Still have to do Header.ToBytes and compose a websocket frame with a payload. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 1 | -0/+4 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.example | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -0/+4 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 5 | -14/+2 | |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||||
| * | | BulletSim: make removing zero width triangles from meshes optional | Robert Adams | 2013-02-05 | 2 | -0/+0 | |
| | | | | | | | | | | | | and, for the moment, default to 'off'. | |||||
| * | | BulletSim: remove degenerate triangles from meshes. This fixes the | Robert Adams | 2013-02-05 | 1 | -14/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | invisible barriers in sculptie doorways (Mantis 6529). Bump up level-of-detail for physical meshes to 32 (the max). This fixes the invisible barriers that showed up in prim cut arches. NOTE: the default LOD values are removed from OpenSimDefaults.ini. If you don't change your OpenSimDefaults.ini, you will continue to see the arch problem. | |||||
| * | | BulletSim: rework some parameter setting implementation moving functionality ↵ | Robert Adams | 2013-02-05 | 4 | -0/+0 | |
| | | | | | | | | | | | | that was in BSScene to BSParam. Remove unused parameters that were passed to the unmanaged code. Update DLLs and SOs for the new param block. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-04 | 2 | -4/+4 | |
|\ \ \ | |/ / | ||||||
| * | | Remove [XMLRPC] section I added by accident to the top of ↵ | Justin Clark-Casey (justincc) | 2013-02-04 | 1 | -15/+0 | |
| |/ | | | | | | | OpenSimDefaults.ini in previous commit 95883282 | |||||
| * | Stop exceptions being thrown if GenerateMapTiles = false but no static map ↵ | Justin Clark-Casey (justincc) | 2013-02-02 | 2 | -3/+18 | |
| | | | | | | | | tile has been set. Do more informative warn instead. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 1 | -0/+1 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | Add config option to Regions.ini for new maptile feature | BlueWall | 2013-01-30 | 1 | -0/+1 | |
| | |