aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-171-1/+5
|\ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Add optional pool for the UDPPacketBuffer objects that handle all incoming ↵Justin Clark-Casey (justincc)2012-10-161-1/+5
| | | | | | | | | | | | | | | | UDP data. Even when an avatar is standing still, it's sending in a constant stream of AgentUpdate packets that the client creates new UDPPacketBuffer objects to handle. This option pools those objects. This reduces memory churn. Currently off by default. Works but the scope can be expanded.
* | Merge branch 'master' into careminsterMelanie2012-10-127-2/+58
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: update the DLLs and SOsRobert Adams2012-10-114-0/+0
| |
| * Updated Robust.HG.ini.example. Thanks Austin Tate.Diva Canto2012-10-111-1/+32
| |
| * av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - ↵teravus2012-10-091-0/+3
| | | | | | | | No Avatar Avatar Collisions. This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment.
| * Add config option to plant avatar where they are reducing avatar avatar ↵teravus2012-10-091-0/+6
| | | | | | | | 'pushability' av_planted see OpenSimDefaults.ini. Use when you have unruly visitors that rudely push each other around. Still allows a small amount of movement based on the avatar movement PID controller settings. You can increase the spring tension in the PID controller and really prevent any movement if you would like.
| * Update the exampleMelanie2012-10-081-1/+17
| |
* | Merge branch 'master' into careminsterMelanie2012-10-071-0/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * Make the asset retrieval concurrency a config switch. The current valueMic Bowman2012-10-041-0/+4
| | | | | | | | | | of 30 is still hanging badly on some mono versions. The switch defaults to 30 to preserve current behavior.
* | Merge branch 'master' into careminsterMelanie2012-10-034-0/+0
|\ \ | |/
| * BulletSim: fix crash on load that showed up on 32bit Linux.Robert Adams2012-10-024-0/+0
| |
* | Merge branch 'avination' into careminsterMelanie2012-09-291-0/+0
|\ \
| * | Update the Http server with a few additional properties. Adapt the testMelanie2012-09-271-0/+0
| | | | | | | | | | | | server code to match.
* | | Merge branch 'master' into careminsterMelanie2012-09-296-56/+24
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | BulletSim: update SOs and DLLsRobert Adams2012-09-284-0/+0
| | |
| * | BulletSim: btGhostObjects working to make 'volume detect' work.Robert Adams2012-09-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrangement and cleanup of shape collection code. Much more readable. Enabling and use of collision filters and masks. Addition of ID to body creation BulletSimAPI calls so always set in shape for collision reporting. Change default of ShouldSplitSimulationIslands and ShouldRandomizeSolverOrder from 'false' to 'true'. When 'false', this suppresses NO_CONTACT_RESPONSE which makes volume detect fail.
| * | Comment out unused RestPlugins text in OpenSimDefaults.iniJustin Clark-Casey (justincc)2012-09-281-24/+25
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-272-0/+8
| |\ \
| | * | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-272-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | This controls how many undo steps the simulator will store for each prim. Default is now 20 rather than 5 as it briefly was. The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
| * | | Removed the bits about the TOSModule. That module doesn't go into core. ↵Diva Canto2012-09-272-33/+0
| |/ / | | | | | | | | | WARNING: migration on GridUser withdrawn too, but left the migration number there.
* | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-273-0/+34
|\ \ \ | |/ /
| * | Use GridUser properly for foreign users.Diva Canto2012-09-262-1/+3
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-251-35/+65
| |\ \
| | * | Format OpenSim.ini.exampleBlueWall2012-09-251-35/+65
| | | | | | | | | | | | | | | | Make lines fint in 80x24 terminal for easier reading
| * | | TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-252-0/+32
| |/ /
* | | Format OpenSim.ini.exampleBlueWall2012-09-271-35/+65
| | | | | | | | | | | | Make lines fint in 80x24 terminal for easier reading
* | | Merge branch 'master' into careminsterMelanie2012-09-2480-16/+12422
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | HG 2.0: User Agent Service now can also control where the local users can ↵Diva Canto2012-09-222-1/+36
| | | | | | | | | | | | go. Domain-name and user-level based. \o/
| * | More HG 2.0: access control at the Gatekeeper. \o/Diva Canto2012-09-212-1/+22
| | |
| * | HG 2.0: added asset import/export policies at the sim too.Diva Canto2012-09-213-2/+22
| | |
| * | Improvement over last commit: refactor the asset permissions code, so that ↵Diva Canto2012-09-202-8/+12
| | | | | | | | | | | | it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-206-2/+1
| |\ \
| | * | Make ResendAppearanceUpdates = true by default in [Appearance] in ↵Justin Clark-Casey (justincc)2012-09-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSimDefaults.ini. This resends appearance uuids to avatars in the scene once a minute. I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet. The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached. This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
| | * | Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this ↵Justin Clark-Casey (justincc)2012-09-205-0/+0
| | | | | | | | | | | | | | | | time using lkalif's linux libraries built against a much earlier libc (2.7)
| * | | More HG2.0: Added permission policies in HGAsset Service based on asset ↵Diva Canto2012-09-202-0/+21
| |/ / | | | | | | | | | types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
| * | Downgrade libopenjpeg back to 1.3 from 1.5.Justin Clark-Casey (justincc)2012-09-195-0/+0
| | | | | | | | | | | | | | | This is because libopenjpeg 1.5 appears to require a minimum of glibc 2.14, whereas at least one fairly recent distro (openSUSE 11.4 from 2011-03-10) only has glibc Further investigation pending.
| * | Add openmetaverse_data from libopenmetaverse to allow testing of texture ↵Justin Clark-Casey (justincc)2012-09-1860-0/+12308
| | | | | | | | | | | | baking via bot rather than just throwing out errors
| * | Update libopenmetaverse components to commit f5cecaajustincc2012-09-1815-5/+3
| | | | | | | | | | | | | | | | | | | | | Among other things this allows pCampbot to work under Windows since libopenmateverse now ships the same log4net.dll (publicly signed) as OpenSimulator This also updates the libopenmetaverse embedded libopenjpeg from 1.3 to 1.5. DLL naming and mapping for non-Windows libopenjpeg changes to remove version number to make future udpates easier and bring it into line with names of other shipped DLLs. libopenjpeg updates have been made for OSX, Windows (32 and 64 bit) and Linux (32 and 64 bit). Please report any issues.
| * | Cleanup from prev. commitBlueWall2012-09-181-2/+2
| | | | | | | | | | | | Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
| * | Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-182-6/+6
| | | | | | | | | | | | | | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes.
* | | Merge branch 'master' into careminsterMelanie2012-09-168-14/+8
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-155-7/+0
| |\ \
| | * | BulletSim: update DLLs and SOs and remove some debugging code.Robert Adams2012-09-154-0/+0
| | | |
| | * | For FlotsamAssetCache, always update access times of cached scene assets ↵Justin Clark-Casey (justincc)2012-09-151-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before looking for files to expire. This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed. The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced. This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.
| * | | More on HG2.0: added the possibility of controlling the appearance that ↵Diva Canto2012-09-151-0/+1
| |/ / | | | | | | | | | avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
| * | Fix indentation and issues where tabs were used instead of spaces in commit ↵Justin Clark-Casey (justincc)2012-09-122-7/+7
| | | | | | | | | | | | 783ee949
* | | Merge branch 'master' into careminsterMelanie2012-09-096-0/+9
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | implementing per-region configuration of limits on the number of prims one ↵SignpostMarv2012-09-092-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com>
| * | BulletSim: update the DLLs and SOsRobert Adams2012-09-074-0/+0
| | |
generated by cgit v1.1 at 2024-11-05 23:36:14 +0000