aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | More keys for automated ini processingBlueWall2012-07-081-0/+19
| | |
| * | Add more keys for OpenSim.ini.defaults automationBlueWall2012-07-081-4/+18
| | |
| * | Add more automation keys to OpenSim.ini.exampleBlueWall2012-07-081-6/+34
| | |
| * | BulletSim: update the binaries to the current sourcesRobert Adams2012-07-064-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-051-6/+26
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: Add more information to OSFunctionThreatLevel and clarify some text ↵Justin Clark-Casey (justincc)2012-07-051-6/+9
| | | | | | | | | | | | in using PARCEL_OWNER, PARCEL_GROUP_MEMBER, ESTATE_MANAGER, ESTATE_OWNER permission categories
| * | Adds a list of viewers that are allowed or banned from the region.Michelle Argus2012-07-021-0/+17
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | Merge branch 'master' into careminsterMelanie2012-06-261-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | If starting scripts on initial sim start, provide INFO level log feedback ↵Justin Clark-Casey (justincc)2012-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | each time 50 scripts have been started. This is to provide an indication of what's happening now that the default isn't to report every single script start. Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
* | | Merge branch 'master' into careminsterMelanie2012-06-215-8/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Change default logging level for XEngine to WARN instead of DEBUG.Justin Clark-Casey (justincc)2012-06-201-0/+5
| | | | | | | | | | | | | | | | | | | | | This is to reduce log spam from script loading, which is especially spammy for avatar movements with scripted attachments. All important messages are at warn or above. If you still want/need to see these messages, set <level value="DEBUG"/> in the <logger name="OpenSim.Region.ScriptEngine.XEngine"> section of OpenSim.exe.config. This affects no other package logs, which still output at the root configured level (currently DEBUG by default).
| * | Remove STARTUP COMPLETE message from the startuplogo.txt file and into main ↵Justin Clark-Casey (justincc)2012-06-201-1/+0
| | | | | | | | | | | | logging
| * | Oops! putting back the entry for map urlsBlueWall2012-06-161-0/+3
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-06-161-1/+3
| |\ \
| | * | Implement max_external_urls_per_simulator setting in [LL-Functions] to allow ↵Justin Clark-Casey (justincc)2012-06-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration of how many urls can be set up by llRequestURL() Defaults remains as 100. This setting is per simulator instead of per region due to how the url script module is structured.
| * | | Adjust Robust*.ini.examples V3 webprofile entriesBlueWall2012-06-162-8/+16
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-06-141-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Add the updated OpenSimDefaults.ini for the prior timer_Interval patch.BlueWall2012-06-121-0/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-06-111-1/+1
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-12-18 17:58:03 +0000