aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\
| * | Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini ↵Justin Clark-Casey (justincc)2013-01-232-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and OpenSim.ini.example. Default remains abort. This setting controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) co-op should be more stable but this option is experimental. If moving from co-op to abort, existing script DLLs will need to be recompiled. This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/ One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
* | | Merge branch 'master' into careminsterMelanie2013-01-233-0/+25
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * | This updates prebuild to remove BulletSimN, implements the BulletSim API in ↵teravus2013-01-203-0/+14
| | | | | | | | | | | | BulletSPlugin using the BulletXNA Bullet physics engine. It also updates the BulletXNA library to be compatible with the changes. OpenSimDefaults has been updated to describe how to switch engines and terrain implementations.
| * | IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in ↵PixelTomsen2013-01-191-0/+11
| |/ | | | | | | | | | | | | | | OpenSimDefaults.ini / section [IRC] http://opensimulator.org/mantis/view.php?id=6470 idea: https://github.com/ssm2017/IrcBridgeAlert
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-8/+0
|\ \ | |/
| * BulletSim: by default, turn on continuious collision detection (CCD)Robert Adams2013-01-151-8/+0
| | | | | | | | | | and enable friction computation caching. Remove dangerous BulletSim settings from OpenSimDefaults.ini.
* | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-164-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * BulletSim: move center of gravity of linkset to its geometric center.Robert Adams2013-01-114-0/+0
| | | | | | | | | | | | | | Necessitated allowing simulator and physical position of a body to get out of sync since Bullet assumes that <0,0,0> is the center of mass. Update DLLs and SOs for the UpdateChildTransform so positions of individual prim in a linkset can be implemented.
* | Merge branch 'master' into careminsterMelanie2013-01-104-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * BulletSim: update DLLs and SOs with better debugging output.Robert Adams2013-01-064-0/+0
| | | | | | | | | | Add definition of hand crafted avatar mesh. Not used yet. Comments and cleanup.
* | Merge branch 'master' into careminsterMelanie2013-01-064-0/+0
|\ \ | |/
| * BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnosticRobert Adams2013-01-044-0/+0
| | | | | | | | | | functions. If values set from console, the functions are called. Looking for why the collision pools fill up with unnecessary stuff.
* | Merge branch 'master' into careminsterMelanie2013-01-025-2/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-014-0/+0
| |\
| | * BulletSim: eliminate the use of the unmanaged HeightMapInfo structure.Robert Adams2012-12-314-0/+0
| | | | | | | | | | | | | | | Remove all related calls from the unmanaged and BSAPITemplate interfaces. Update DLLs and SOs to include the version without HeightMapInfo structures.
| | * BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.Robert Adams2012-12-314-0/+0
| | | | | | | | | | | | Update BulletSim DLLs and SOs with simplier step function interface.
| * | Clarify that AllowLightShareFunctions setting is false, which is the default ↵Justin Clark-Casey (justincc)2013-01-011-2/+3
| |/ | | | | | | in OpenSimDefaults.ini and the code.
* | Merge branch 'master' into careminsterMelanie2012-12-301-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * BulletSim: update values in OpenSimDefaults.ini to reflect the values really ↵Robert Adams2012-12-281-2/+2
| | | | | | | | used by the code.
* | Merge branch 'master' into careminsterMelanie2012-12-263-2/+3
|\ \ | |/
| * * Update Example to include BulletSimN option and description.teravus2012-12-231-2/+3
| |
| * * Initial commit of BulletSimN (BulletSNPlugin). Purely C# implementation ↵teravus2012-12-232-0/+0
| | | | | | | | of BulletSim. This is designed to be /as close as possible/ to the BulletSim plugin while still being entirely in the managed space to make keeping it up to date easy as possible (no thinking work). This implementation is /slower/ then the c++ version just because it's fully managed, so it's not appropriate for huge sims, but it will run small ones OK. At the moment, it supports all known features of BulletSim. Think of it like.. POS but everything works. To use this plugin, set the physics plugin to BulletSimN.
* | Merge branch 'master' into careminsterMelanie2012-12-167-26/+35
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Independently control logging for per region module loading. I just got sick ↵Robert Adams2012-12-131-0/+6
| | | | | | | | of, when debugging, the zillions of log lines verifying that each module is being added to each region.
| * Add WaitForEventCompletionOnScriptStop [XEngine] config param to ↵Justin Clark-Casey (justincc)2012-12-131-0/+4
| | | | | | | | | | | | | | OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread Default is 1000, as has previously been the case. This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
| * Update mono addinsBlueWall2012-12-133-0/+0
| | | | | | | | Push a small fix for the mono addins
| * Move setting to correct locations in iniBlueWall2012-12-122-26/+25
| |
| * Replace Mono.Addins librariesBlueWall2012-12-113-0/+0
| | | | | | | | Mono.Addins.Setup uses Ionic.Zip for compression. Libraries Compiled on Win32
| * Replaced Mono.Addins dlls with ones compiled in Windows 64-bit.Diva Canto2012-12-093-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-12-096-0/+30
|\ \ | |/
| * Add back openjpeg dll for WindowsBlueWall2012-12-082-0/+0
| | | | | | | | May generate some error output during startup on Robust - ignore for now, will fix soon.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-12-071-0/+5
| |\
| | * Added missing config var in grided sims.Diva Canto2012-12-071-0/+5
| | |
| * | Merge branch 'master' into connector_pluginBlueWall2012-12-075-1/+1
| |\ \ | | |/
| * | Merge branch 'master' into connector_pluginBlueWall2012-11-265-21/+12
| |\ \
| * \ \ Merge branch 'master' into connector_pluginBlueWall2012-11-2513-110/+164
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
| * \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-206-2/+42
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-191-0/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-092-1/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/ServerMain.cs
| * | | | | | | Added parts to manage repositories and plugin managementBlueWall2012-10-062-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is working - more testing to follow, then soem documentation
| * | | | | | | Remove duplicate filesBlueWall2012-10-032-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are keeping these in bin/lib(32/64) now
| * | | | | | | Update Mono.AddinsBlueWall2012-10-033-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Mono.Addins to latest - 3177b22e958c82bf2c5655ac3d4ef7ad25cc2588
| * | | | | | | Merge branch 'master' of /home/opensim/var/repo/opensim into modular_configBlueWall2012-10-034-0/+0
| |\ \ \ \ \ \ \
| * | | | | | | | Add modular configuration for Robust connectorsBlueWall2012-10-032-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can provide modular ini for connectors... look for our configuration in the following places... 1) in the default ini/-inifile 2) in the named file (ConfigName) located in the configured directory (see Robust[.HG].ini [Start] section for ConfigDirectory) 3) in the repository named in the connector (ConfigURL) In this case, the file will be written into the configured directory with the specified See example connector/service @ https://github.com/BlueWall/SlipStream for testing.
* | | | | | | | | Merge branch 'master' into careminsterMelanie2012-12-075-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | | | BulletSim: update DLLs and SOs with vehicle collision event checkRobert Adams2012-12-064-0/+0
| | | | | | | | |
| * | | | | | | | fix openjpeg on 64 bit OSX we were pointing to a file taht did notnebadon2012-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exist.
* | | | | | | | | Merge branch 'master' into careminsterMelanie2012-12-044-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
generated by cgit v1.1 at 2024-12-23 15:03:08 +0000