aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-281-0/+0
|\
| * Update the Http server with a few additional properties. Adapt the testMelanie2012-09-271-0/+0
| | | | | | | | server code to match.
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-165-33/+40
|\ \ | |/
| * Merge branch 'master' into careminsterMelanie2012-08-165-12/+17
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * BulletSim: update DLLs and SOsRobert Adams2012-08-154-0/+0
| | |
| | * BulletSim: add physics logging parameters to OpenSimDefaults.ini. Remove ↵Robert Adams2012-08-151-12/+17
| | | | | | | | | | | | trailing semis from some the of the value definitions.
| * | Merge branch 'careminster' into avinationMelanie2012-08-145-21/+23
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| | * \ Merge branch 'master' into careminsterMelanie2012-08-115-1/+1
| | |\ \ | | | |/
| | | * Merge branch 'bulletsim7'Robert Adams2012-08-101-1/+1
| | | |\
| | | | * BulletSim: add avatar code to keep avatars from ending up trapped under the ↵Robert Adams2012-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | terrain
| | | * | BulletSim: actually update the DLLs and SOsRobert Adams2012-08-104-0/+0
| | | |/
| | * | Merge branch 'master' into careminsterMelanie2012-08-094-0/+0
| | |\ \ | | | |/
| | | * BulletSim: Added avatar capsule scaling for size of avatar.Robert Adams2012-08-074-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes computation of avatar mass. Added parameter MaxPersistantManifoldPoolSize. Fixed a parameter setting bug which caused crashes of there were more than 400 or so physical objects. I tested up to 5000. Updated BulletSim DLLs and SOs.
| | * | Merge branch 'master' into careminsterMelanie2012-08-074-0/+0
| | |\ \ | | | |/
| | | * BulletSim: update SOs and DLLs to run on more Linux versions. Correct ↵Robert Adams2012-08-064-0/+0
| | | | | | | | | | | | | | | | multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
| | * | Merge branch 'master' into careminsterMelanie2012-08-045-20/+22
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | | * BulletSim: update DLLs and SOsRobert Adams2012-08-034-0/+0
| | | |
| | | * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵Justin Clark-Casey (justincc)2012-08-031-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket. All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
| | | * Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵Justin Clark-Casey (justincc)2012-08-031-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Startup] to [Appearance] config section. Add description and default of false (as before) to OpenSimDefaults.ini If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds. For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent. However, this switch will not help with other appearance failure situations (e.g. failure to bake assets). This setting is experimental but will not have any significant impact on the simulator if turned to true.
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-047-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so
| * | | update ode.dll for windows so both 32b and 64b are now version 0.12 (32bUbitUmarov2012-08-042-0/+0
| |/ / | | | | | | | | | is just a rebuild)
| * | Merge branch 'master' into careminsterMelanie2012-08-035-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * BulletSim: Debugging log statements added. Reduced size of updata buffer ↵Robert Adams2012-08-025-1/+1
| | | | | | | | | | | | trying to find a corrupted memory problem. Update DLL and SO.
* | | merge crap gerge branch 'ubitwork' of ↵ubit2012-08-024-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into ubitwork Conflicts: bin/Regions/Regions.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so
| * | Merge branch 'master' into careminsterMelanie2012-08-014-0/+0
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| | * BulletSim: fix problem where resizing a primary shape (cube or sphere) would ↵Robert Adams2012-07-314-0/+0
| | | | | | | | | | | | not rebuild the physics mesh. Update the DLLs and SOs to latest version.
| * | Merge branch 'master' into careminsterMelanie2012-08-014-0/+0
| |\ \ | | |/
| | * BulletSim: update the DLLs and SOs. This fixes the exception on shutdownRobert Adams2012-07-314-0/+0
| | |
| * | Add master's new binariesMelanie2012-07-284-0/+0
| | |
| * | Merge branch 'master' into careminsterMelanie2012-07-286-1/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| | * Update OpenMetaverse libraries at commit 6212cbd, this time built on Windowsjustincc2012-07-275-0/+0
| | | | | | | | | | | | This is to try and resolve a strange Initialization exception for the AppearanceManager type that only occurs on Windows 64 bit (not Windows 32 bit or Linux!)
| | * Replace libopenmetaverse commit 6212cbd with the same libraries but this ↵Justin Clark-Casey (justincc)2012-07-274-0/+0
| | | | | | | | | | | | | | | | | | time built with xbuild rather than nant. This may fix Windows and some mono version builds.
| | * Update libopenmetaverse to commit 6212cbd (Wed Jul 25 20:11:47 2012)Justin Clark-Casey (justincc)2012-07-274-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Built from https://github.com/openmetaversefoundation/libopenmetaverse/commits/master This update incorporates a fix by Melanie in libomv where textures would sometimes rotate slightly when other properties were changed. Hence addresses http://opensimulator.org/mantis/view.php?id=6100 This update also incorporates libomv bot code updates that significantly reduce the warning spam for pCampbot. The change rate of libomv is low and many changes refer to bot or code not used by OpenSimulator, so I think it is sufficiently stable to use evne though it's not a release.
| | * BulletSim: refactor all the linkset logic out of the prim classRobert Adams2012-07-261-2/+2
| | | | | | | | | | | | | | | | | | and into its own class. The BulletSim data structures track individual prims as linksets of 1 so most of the prim code is not different between a linked and unlinked object.
| | * BulletSim: update BulletSim DLLs and SOsRobert Adams2012-07-254-0/+0
| | |
| | * BulletSim: add parameters for setting linkset constraint factorsRobert Adams2012-07-251-0/+6
| | |
| * | Merge branch 'master' into careminsterMelanie2012-07-254-0/+0
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| | * BulletSim: update BulletSim.dlls and so'sRobert Adams2012-07-234-0/+0
| | |
| * | Merge branch 'master' into careminsterMelanie2012-07-235-4/+8
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| | * Update BulletSim DLLs and SOsRobert Adams2012-07-202-0/+0
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-204-0/+0
| | |\
| | | * BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵Robert Adams2012-07-204-0/+0
| | | | | | | | | | | | | | | | attempting to fix a mono compile error.
| | * | Move RegionConfig.ini.example into bin/Regions/Regions.ini.example - all ↵Justin Clark-Casey (justincc)2012-07-201-4/+8
| | |/ | | | | | | | | | | | | | | | | | | other example files are in the same directory as their real files. Only files ending in .ini and .xml are actually loaded. Also improves the help at the top of Regions.ini.example to mention that OpenSimulator would generate Regions.ini anyway on first startup.
* | | i local libs commitubit2012-08-0211-44/+7
|/ /
* | Merge branch 'master' into careminsterMelanie2012-07-131-7/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Change very recent AllowedViewerList and BannedViewerList config setting ↵Justin Clark-Casey (justincc)2012-07-121-7/+7
| | | | | | | | | | | | | | names in OpenSim.ini.example to AllowedClients and BannedClients to match long-existing settings in [LoginService] Also changes separator from comma to bar to match existing [LoginService] config features. Divergence of config names for identical facilities in different places makes for an unnecessarily confusing user experience.
* | Merge branch 'avination' into careminsterMelanie2012-07-112-0/+0
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | changed ODE lib for win32 to version 0.12UbitUmarov2012-07-101-0/+0
| | |
| * | change linux 32bit libode.so to ode version 0.12ubit2012-07-101-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-115-10/+71
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
generated by cgit v1.1 at 2024-12-16 19:18:17 +0000