aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2014-01-284-117/+133
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * Adds a configuration option to cannibalize bandwidth from theMic Bowman2014-01-201-0/+10
| | | | | | | | | | | | | | | | udp texture throttle and move it to the task throttle. Since most viewers are using http textures, the udp texture throttle is holding onto bw that could be used for more responsive prims updates. See the documentation for CannibalizeTextureRate in OpenSimDefaults.ini. Option is disabled by default.
| * update OpenMetaverse.StructuredData to git master ↵dahlia2014-01-202-117/+117
| | | | | | | | (bf4e9f654ff99c85e20b53e56faac38e307dd8c2) which fixes JSON OSD serialization to a standards compliant means of encoding floating point NaN and Infinity
| * Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-201-0/+6
| | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
* | Merge branch 'master' into careminsterMelanie2014-01-282-4/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * In library inventory, correct asset id for llSay example scriptJustin Clark-Casey (justincc)2014-01-102-4/+4
| | | | | | | | | | From http://opensimulator.org/mantis/view.php?id=6917 Thanks to FreakyTech for this spot.
* | Merge branch 'master' into careminsterMelanie2013-12-071-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * minor: Change ProfileServiceURL reference in OpenSim.ini.example to be ↵Justin Clark-Casey (justincc)2013-11-281-1/+1
| | | | | | | | consistent
* | Merge branch 'master' into careminsterMelanie2013-11-2321-935/+925
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * Remove old *.exe.config files that related to programs that have long been ↵Justin Clark-Casey (justincc)2013-11-233-89/+0
| | | | | | | | deleted or renamed
| * Stop .NET 4 complaining on Windows when it tries to load in DLLs that ↵Justin Clark-Casey (justincc)2013-11-236-0/+8
| | | | | | | | | | | | | | | | | | haven't been marked as trusted in the operating system. This is done by adding <loadFromRemoteSources enabled="true" /> to the execute *.config files. This tells .NET 4 to trust the DLLs, which is safe in our case since we are not loading DLLs from locations that untrusted users may specify Addresses http://opensimulator.org/mantis/view.php?id=6853 and http://opensimulator.org/mantis/view.php?id=6846 As far as I know, CAS policy checks have never been performed in Mono
| * update libomv to 1538d3088e79ff0a9abea6905b487755b6890a85 in hope that it ↵dahlia2013-11-153-0/+0
| | | | | | | | fixes some bulletsim issues on linux
| * Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions.justincc2013-11-132-0/+0
| | | | | | | | Also fixes some issues in associated solution files
| * minor: Make PID file example in Robust.HG.ini more meaningful as is now the ↵Justin Clark-Casey (justincc)2013-11-081-1/+1
| | | | | | | | case in OpenSim and vanilla ROBUST config files
| * update OpenMetaverse.dll to 7ae74674a09877119cbb4c80cbffea474e20da29dahlia2013-11-061-0/+0
| | | | | | | | - addresses particle flags issue
| * minor: Make PID file examples in OpenSim and Robust config somewhat more ↵Justin Clark-Casey (justincc)2013-11-063-3/+3
| | | | | | | | meaningful than just /tmp/my.pid
| * Update libomv to 7e260ad419ebb1c24a5f1b123e11dd930e05f414. Thanks lkalif :)dahlia2013-11-052-789/+789
| |
| * Updated libomv to 25ee208a 2013-11-05Latif Khalifa2013-11-066-53/+124
| |
* | Merge branch 'master' into careminsterMelanie2013-11-089-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * update libomv to 5b4c1e8694479629f7cacd72dd6bc39a6b327f9c (git master as of ↵dahlia2013-10-304-0/+0
| | | | | | | | time of this commit)
| * BulletSim: restore collision flags when clear collision cache.Robert Adams2013-10-264-0/+0
| | | | | | | | | | THis fixes the extranious addition of objects to the collision cache which created extra CPU overhead.
| * minor: Fix commented out GridInfo service URL to be 8002 in ↵Justin Clark-Casey (justincc)2013-10-251-1/+1
| | | | | | | | Robust.ini.example rather than 9000 (already done in Robust.HG.ini.example)
* | Merge branch 'master' into careminsterMelanie2013-11-0313-6/+4191
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: update SOs and DLLs with version that enables compressedRobert Adams2013-10-194-0/+0
| | | | | | | | | | AABB maps for Bvh meshes. This greatly reduces the memory usage for large meshes and for mesh terrain in particular.
| * BulletSim: update lib32/libBulletSim.dylib to current BulletSim C++ API.Robert Adams2013-10-181-0/+0
| |
| * Readding Mono.Security.dll. This comes from ↵Justin Clark-Casey (justincc)2013-10-171-0/+0
| | | | | | | | | | | | http://pgfoundry.org/frs/download.php/3354/Npgsql2.0.12.0-bin-ms.net3.5sp1.zip This is identical to what was previously there but need to record origin information
| * Removing Mono.Security.dll temporarily so that it can be re-added with ↵Justin Clark-Casey (justincc)2013-10-171-0/+0
| | | | | | | | origin information
| * * Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - ↵Fernando Oliveira2013-10-161-0/+0
| | | | | | | | Mono.Security.dll missing. The root of the issue is that the Postgres driver relies on Mono.Security.dll from the mono project. Unfortunately, when using Mono, including the dll in the distribution causes conflicts. This solution puts Mono.Security.dll in bin/lib/NET/ and, if windows .NET is the runtime, informs the assembly loader to load bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security namespace. On Mono, the included Mono.Security assembly is ignored.
| * As discussed on many previous occasions, switch the default physics engine ↵Justin Clark-Casey (justincc)2013-10-151-6/+5
| | | | | | | | | | | | | | | | in OpenSimulator from OpenDynamicsEngine to BulletSim. The BulletSim plugin is higher performance and has a better implementation of vehicles amongst other things. Many thanks to Robert Adams for making this possible with the enormous amount of work that he has done on this plugin. If you want to continue using ODE, set physics = OpenDynamicsEngine in the [Startup] section of OpenSim.ini
| * This is Npgsql2.0.12.0-bin-ms-net3.5sp1Justin Clark-Casey (justincc)2013-10-141-0/+0
| | | | | | | | | | From http://pgfoundry.org/frs/download.php/3354/Npgsql2.0.12.0-bin-ms.net3.5sp1.zip This is identical to the version added in ff8a7682, removed and readded to check and record version
| * Remove to re-add with version information for future referenceJustin Clark-Casey (justincc)2013-10-141-0/+0
| |
| * fix missing " for variable SRV_IMServerURI in example fileMichael Cerquoni2013-10-121-1/+1
| |
| * Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.Fernando Oliveira2013-10-126-0/+4150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added PostGreSQL support * Added MySQL/MySQLXGroupData.cs * PostgreSQL data access implementation * PostgreSQL dll binarie and RegionStore.migrations * Migrations Scripts from MSSQL to POSTGRES * Postgres SQL Type fixes * Postgres SQL Connection string * Data type issues * more fixes * tests and +tests * UUID x string - FIGHT! * Fixed PG types to internal csharp types * More data type fix (PostgreSQL fields are case sensitive) :( * more field case sensitive fixes * changed the migration files to be case sensitive for fields. * fixed fields case * finished converting, now search for hidden bugs. * some more fixes * bool type fixed * more case fixes; * creatorID case fixed * case fields fixed * fixed default now() for TMStamp fields with don't allow nulls. * fix case sensitve for Region name and Estate name * fixed case for names for search * fix class name Error * Bug fixed on select and migrations * Un-Reverting my change due to Postgres issue with the ILIKE function * Fixed some issued for Diva Distro * Fixes for integration with Diva Distro * Added System.Core to prebuild.xml for PG project * Configured to make DIff for Push to OpenSim Project * Diffs only to PostgreSQL mods.
| * * Added a Basic DOS protection container/base object for the most common ↵teravus2013-10-072-1/+37
| | | | | | | | | | | | | | | | | | HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice. * Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
* | Merge branch 'master' into careminsterMelanie2013-10-0413-199/+247
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * minor: Make OpenSimDefaults.ini consistent (spacing and tabs to spaces)Justin Clark-Casey (justincc)2013-09-271-18/+33
| |
| * minor: Clean up tabbing and spacing issues in OpenSim.ini.exampleJustin Clark-Casey (justincc)2013-09-271-25/+26
| |
| * For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 ↵Justin Clark-Casey (justincc)2013-09-191-1/+9
| | | | | | | | | | | | | | | | teleport protocol even if SIMULATION/0.2 is available. This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details. Default remains "SIMULATION/0.2" Primarily for http://opensimulator.org/mantis/view.php?id=6755
| * minor: Make config-include .ini files more consistentJustin Clark-Casey (justincc)2013-09-187-149/+149
| | | | | | | | | | Chiefly tabs to spaces. No actual setting changes
| * Add [SimulationService] section to GridHypergrid.ini and StandaloneHypergrid.iniJustin Clark-Casey (justincc)2013-09-182-0/+21
| | | | | | | | | | This was already in Grid.ini and Standalone.ini Default settings are same as previously, just introduce a debug ConnectorProtocolVersion parameter
| * minor: replace spaces with tabs for see_into_region settingJustin Clark-Casey (justincc)2013-09-121-2/+2
| |
| * BulletSim: update DLLs and SOs to disable Bullet's internal profiling.Robert Adams2013-09-124-0/+0
| | | | | | | | | | This was accidentily left on. This version should make performance better and fix the memory leak.
| * Allow setting the EntityTransfer-max_distance to 0 to override distance ↵BlueWall2013-09-121-2/+5
| | | | | | | | checks. This is to facilitate current viewer work fixing the distance limitations for teleporting.
| * BulletSim: update DLLs and SOs with ClearCollisionCache inteface callsRobert Adams2013-09-114-0/+0
| | | | | | | | and constraint debugging messages.
| * BulletSim: update DLLs and SOs for spring parameters and constraintRobert Adams2013-09-114-0/+0
| | | | | | | | debugging dump code.
| * BulletSim: update DLLs and SOs with Bullet svn version 2644 (no major fixes) ↵Robert Adams2013-09-114-0/+0
| | | | | | | | and with BulletSim implementing more of the constraint types and parameter settings.
| * chaning the default max_distance to 16383 as we actually start counting at ↵Michael Cerquoni2013-09-101-2/+2
| | | | | | | | zero, thank you dahlia for pointing this out.
| * This extends the default max_distance for teleports to 16384, a big thank ↵Michael Cerquoni2013-09-101-2/+2
| | | | | | | | you to all of the viewer devs who made this possibe!
* | Merge branch 'master' into careminsterMelanie2013-09-073-10/+58
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: add doc about DefaultHGRegion and some of the other GridService ↵Justin Clark-Casey (justincc)2013-09-053-5/+52
| | | | | | | | region settings (though not all as of yet)
generated by cgit v1.1 at 2024-11-06 17:15:43 +0000