aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-111-10/+0
|\
| * remove entry OpenGridProtocol in OpenSimDefaults.ini - module was deletedPixelTomsen2012-11-111-10/+0
| | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* | Merge branch 'master' into careminsterMelanie2012-11-111-3/+0
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * One more module: EventQueueGetModule. Also making it non-optional for this dll.Diva Canto2012-11-101-3/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-084-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
| * BulletSim: update the DLLs and SOsRobert Adams2012-11-064-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-044-0/+0
|\ \ | |/
| * BulletSim: update the DLLs and SOsRobert Adams2012-11-034-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-034-73/+120
|\ \ | |/
| * HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ↵Diva Canto2012-11-023-72/+107
| | | | | | | | THESE.
| * Add [AssetService] AllowRemoteDeleteAllTypes (default false).Justin Clark-Casey (justincc)2012-11-021-1/+13
| | | | | | | | | | | | This allows a closed grid to delete asset types other than maptile remotely. Only operational if AllowRemoteDelete = true also. Defaults to false - do not enable if anybody other than you can make asset service requests.
* | Merge branch 'master' into careminsterMelanie2012-11-011-0/+0
|\ \ | |/
| * Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit ↵Justin Clark-Casey (justincc)2012-11-011-0/+0
| | | | | | | | | | | | | | | | version from libopenmetaverse commit 3731ee4 This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries. However, the reverse is also true. If OpenSimulator stops working for you then please complain! Long term alternative is probably to build a fat binary with both architectures.
* | Merge branch 'master' into careminsterMelanie2012-10-301-0/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactoring to use assembly:classname style of configurationSignpostMarv2012-10-291-2/+2
| |
| * Renaming module back to SoundModule as the hypothetical plan was to make ↵SignpostMarv2012-10-291-3/+2
| | | | | | | | another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless.
| * tweaking configuration logic so that the INonSharedRegionModule will load by ↵SignpostMarv2012-10-291-0/+8
| | | | | | | | default
* | Merge branch 'master' into careminsterMelanie2012-10-265-6/+6
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * Changed duplicate Asset ID's to unique ID's in CollisionSoundsAssetSet.xmlOren Hurvitz2012-10-251-6/+6
| |
| * BulletSim: update binaries with small change that insures that manual ↵Robert Adams2012-10-234-0/+0
| | | | | | | | position/rotation setting results in an update event.
* | Merge branch 'master' into careminsterMelanie2012-10-205-0/+5
|\ \ | |/
| * Add experimental [Groups] MessageOnlineUsersOnly option for Flotsam XmlRpc ↵Justin Clark-Casey (justincc)2012-10-201-0/+5
| | | | | | | | | | | | | | | | | | | | groups. This retrieves and caches information from the PresenceService to only send messages to online users. This is reported to much improve performance for large groups where most users are offline. Cache is 20 seconds to balance requests against users not receiving messages until cache updates. This is an alternative to an approach where login/logout notification is sent directly from simulator to groups service. However, I'm not convinced that this PresenceService approach is actually better. Needs more thought.
| * Bulletsim: update DLLs and SOs. Brings C++ routine in sync with C# sources ↵Robert Adams2012-10-194-0/+0
| | | | | | | | and fixes problem where BulletSim would crash on startup on 32 bit Linux.
* | 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
generated by cgit v1.1 at 2024-09-12 21:07:15 +0000