aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | * Updates HttpServer again to re-add the code that closes the stream and ↵teravus2013-03-142-0/+0
| | | | | | | | | | | | connection when It's done sending. Be on the lookout for an old linux/mono bug where the client doesn't get the last bit of the stream before it is disconnected!. Code on opensim-libs. All tests pass.. HttpServer's internal tests pass.. but just a bad feeling. More people should test :)
* | | Merge branch 'master' into careminsterMelanie2013-03-132-0/+12
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * | Add DisableInterRegionTeleportCancellation option in [EntityTransfer] ↵Justin Clark-Casey (justincc)2013-03-122-0/+12
| |/ | | | | | | | | | | | | | | | | section of OpenSim.ini. False by default. This option allows the simulator to specify that the cancel button on inter-region teleports should never appear. This exists because sometimes cancellation will result in a stuck avatar requiring relog. It may be hard to prevent this due to the protocol design (the LL grid has the same issue) In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
* | Merge branch 'master' into careminsterMelanie2013-03-111-2/+1
|\ \ | |/
| * Update comment about setting physics=BulletSimN as the C# BulletRobert Adams2013-03-101-2/+1
| | | | | | | | | | version has been wrapped into one BulletSim and the physics engine selection is now done as specified in OpenSimDefaults.ini.
* | Merge branch 'master' into careminsterMelanie2013-03-081-8/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * One more comment inconsistency fixed.Diva Canto2013-03-071-1/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-03-073-0/+0
| |\
| * | Fixed inconsistency in comments. Thanks Ai Austin.Diva Canto2013-03-071-8/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2013-03-056-0/+29
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * | * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9teravus2013-03-043-0/+0
| |/ | | | | | | * Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter.. which adds up the Length property all of the blocks.
| * GridUserService was missing from [Gatekeeper]Diva Canto2013-03-041-0/+1
| |
| * Added existance and default value for [XEngine]MinTimerInterval to ↵Robert Adams2013-03-021-0/+4
| | | | | | | | OpenSimDefaults.ini
| * Move AllowedClients and BannedClients section to new [AccessControl] section ↵Justin Clark-Casey (justincc)2013-03-021-2/+6
| | | | | | | | | | | | | | in OpenSim.ini from [Startup] This change also corrects the setting names - they were actually wrong (though the text in {} was correct). If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
| * Revert "Removed more vars from [Startup]. I think these were already moved ↵Justin Clark-Casey (justincc)2013-03-021-0/+20
| | | | | | | | | | | | elsewhere, because I can't find any reference to them in the code." This reverts commit efa722786509bd8e02e23f11da974b4282dbd185.
* | Merge branch 'master' into careminsterMelanie2013-03-012-112/+93
|\ \ | |/
| * Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-012-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 Canto2013-03-011-20/+0
| | | | | | | | elsewhere, because I can't find any reference to them in the code.
* | Merge branch 'master' into careminsterMelanie2013-02-285-33/+60
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Robust.HG.ini.example updated to get an [Hypergrid] section too.Diva Canto2013-02-281-14/+15
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-273-6/+15
| |\
| | * Do not have the Freeswitch connector on by default in Robust ini example files.Justin Clark-Casey (justincc)2013-02-272-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 Canto2013-02-273-17/+41
| | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | | Merge branch 'master' into careminsterMelanie2013-02-271-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 optionJustin Clark-Casey (justincc)2013-02-271-7/+8
| | |
| * | Add documentation on default or Warp3D image module choice to ↵Justin Clark-Casey (justincc)2013-02-271-0/+6
| |/ | | | | | | | | | | | | OpenSim.ini.example. As before, default is MapImageModule. Thanks to Ai Austin for pointing out this omission.
* | Merge branch 'master' into careminsterMelanie2013-02-263-52/+54
|\ \ | |/
| * 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
generated by cgit v1.1 at 2024-12-23 23:18:34 +0000