aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-252-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 Canto2013-02-251-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-233-3/+11
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * More clarification on the [Groups] sectionDiva Canto2013-02-231-0/+1
| |
| * Further clarification on the same spot.Diva Canto2013-02-231-0/+1
| |
| * Improved documentation of Groups section.Diva Canto2013-02-231-2/+6
| |
| * Err.. wrong dll name for groups in Robust.HG.ini.exampleDiva Canto2013-02-212-1/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-02-228-69/+154
|\ \ | |/
| * Minor formatting cleanup. No changes.Diva Canto2013-02-211-12/+12
| |
| * Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-213-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 filesJustin Clark-Casey (justincc)2013-02-202-1/+11
| |
| * Previous build failed. Checking in a dummy change to see if the fail persists.Diva Canto2013-02-191-3/+3
| |
| * First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵Diva Canto2013-02-193-15/+41
| | | | | | | | rest to Addons.Groups.dll.
| * Offline IM: moved the Data and MySQL bits to the corresponding places in ↵Diva Canto2013-02-193-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.dllDiva Canto2013-02-183-15/+22
| |
| * BulletSim: add calls for creating all the different Bullet constraint types.Robert Adams2013-02-174-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 careminsterMelanie2013-02-134-0/+0
|\ \ | |/
| * BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-124-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 careminsterMelanie2013-02-121-0/+0
|\ \ | |/
| * Replaced Ionic.Zip.dll with a new one that fixes a bug in it. DotNetZip ↵Diva Canto2013-02-121-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 careminsterMelanie2013-02-104-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 Adams2013-02-084-0/+0
| | | | | | | | DLLs and SOs for setting same.
* | Merge branch 'master' into careminsterMelanie2013-02-082-0/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * Adds size limits to JsonStore. Adds a separate configurationMic Bowman2013-02-081-0/+4
| | | | | | | | variable to enable binding to dynamic attributes.
* | Merge branch 'master' into careminsterMelanie2013-02-072-2901/+2901
|\ \ | |/ | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * * Adds Websocket support to baseHttpServer and IHttpServer.cs . This ↵teravus2013-02-076-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 handlerteravus2013-02-072-0/+0
| | |
| * | We're not really done here.. but we're getting there. Socket Read is ↵teravus2013-02-053-2901/+2901
| | | | | | | | | | | | working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
* | | Merge branch 'master' into careminsterMelanie2013-02-061-0/+4
|\ \ \ | | |/ | |/|
| * | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.exampleJustin Clark-Casey (justincc)2013-02-061-0/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-065-14/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-052-0/+0
| | | | | | | | | | | | and, for the moment, default to 'off'.
| * | BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-051-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 Adams2013-02-054-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 careminsterMelanie2013-02-042-4/+4
|\ \ \ | |/ /
| * | Remove [XMLRPC] section I added by accident to the top of ↵Justin Clark-Casey (justincc)2013-02-041-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-022-3/+18
| | | | | | | | tile has been set. Do more informative warn instead.
* | Merge branch 'master' into careminsterMelanie2013-01-311-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add config option to Regions.ini for new maptile featureBlueWall2013-01-301-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-01-314-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * BulletSim: do not zero an avatar's standing velocity if it is standingRobert Adams2013-01-284-0/+0
| | | | | | | | | | | | | | on a moving object. Rearrange pre/post action subscription code to put more in locks. Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings). Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure.
| * BulletSim: update Bullet with profiling disabled. This seems to fix the ↵Robert Adams2013-01-284-0/+0
| | | | | | | | memory leak problem.
* | Merge branch 'master' into careminsterMelanie2013-01-255-1/+377
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * Add JSONification of WebStats module. Adds a '?json' query parameterRobert Adams2013-01-243-1/+377
| | | | | | | | | | | | to the fetch URL to return the data in JSON format. Also adds a simple 'sim.html' that uses JavaScript to display the JSON data. Not pretty but an example.
| * * Repairs the Object updates, Collision updates, and Child Prim methods ↵teravus2013-01-242-0/+0
| | | | | | | | | | | | making the bulletXNA engine work again. * The only thing that had an issue was when creating a new RigidBody, BulletXNA didn't know the type SimMotionState and the upcast type is unknown in the constructor. Therefore, I had to update the IMotionState with a new method 'SetBody'. All of the duplicated type information has been removed and BulletXNA is not relying on any non-standard types external to the library.
* | Merge branch 'master' into careminsterMelanie2013-01-244-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-232-13/+31
| |\
| * | BulletSim: pass up and report the real collision penetration.Robert Adams2013-01-234-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-242-13/+31
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-243-0/+25
| |\ \ | | |/
generated by cgit v1.1 at 2024-12-27 22:44:53 +0000