aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | Set CreateDefaultAvatarEntries = true in Robust.HG.ini.example to match ↵Justin Clark-Casey (justincc)2012-06-111-1/+1
| | | | | | | | | | | | | | | | | | Robust.HG.ini Thanks to Ai Austin for the spot.
* | | Merge branch 'avination' into careminsterMelanie2012-06-117-16403/+17896
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | Replace the stock libomv with our home grown 0.9.1 with the texture bug fixed.Melanie2012-06-087-16403/+17896
| | |
* | | Merge branch 'master' into careminsterMelanie2012-06-092-1/+3
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | Create avatar entries necessary to stop new v3 avatars being clouds (pants, ↵Justin Clark-Casey (justincc)2012-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | shape, etc.) by default in grid mode. This only affects avatars created through the "create user" console command or createuser XMLRPC. This matches the default setting for standalone
| * | Add documentation to AllowGodFunctions setting in [LL-Functions]Justin Clark-Casey (justincc)2012-06-091-0/+2
| | |
| * | Add collision sounds to the asset setMelanie2012-06-0759-0/+355
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-06-0759-0/+355
|\ \ \ | | |/ | |/|
| * | Add collision sounds to the asset setMelanie2012-06-0759-0/+355
| | |
* | | Merge branch 'master' into careminsterMelanie2012-06-063-6/+13
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Mantis 4597 AgentPaused packet is ignored.Talun2012-06-051-0/+13
| | | | | | | | | | | | | | | | | | The packet was actually being handled but not acted on. This change extends the default timeout for paused clients to 5 minutes and makes both the paused and non-paused timeout periods configurable.
| * | Remove profile from basic configurationMelanie2012-06-042-6/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-311-11/+19
|\ \ \ | |/ /
| * | Add an optional mechanism for physics modules to collect and return ↵Justin Clark-Casey (justincc)2012-05-311-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arbitrary stats. If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule (http://opensimulator.org/wiki/Monitoring_Module) This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings]. This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing. This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds. The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
* | | Merge branch 'master' into careminsterMelanie2012-05-271-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Environment Module - allows Environment settings for Viewer3 warning: ↵PixelTomsen2012-05-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes database region store migrations for mssql, mysql, sqlite enable/disable this module: Cap_EnvironmentSettings = "localhost" (for enable) Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file) or owerwrite in OpenSim.ini mantis: http://opensimulator.org/mantis/view.php?id=5860 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'master' into careminsterMelanie2012-05-193-6/+10
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * | Enable FetchInventoryDescendents2 and FetchInventory2 caps by default. This ↵Justin Clark-Casey (justincc)2012-05-191-5/+4
| | | | | | | | | | | | | | | | | | | | | appears to be required now for LL 3.3.1 to work properly. Without this, LL 3.3.1 continually pushes LLInventoryModelFetchDescendentsResponder::error 499 to its log. This cap will be ignored by older viewers - UDP inventory will work normally.
| * | Provide Telehub setting to allow use of landmarksBlueWall2012-05-181-0/+5
| | | | | | | | | | | | Setting to allow use of landmarks to override telehub routing. Default is off.
| * | Add millisecond logging to pCampBot for debugging purposesJustin Clark-Casey (justincc)2012-05-181-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-171-2/+2
|\ \ \ | |/ /
| * | Fix boo-boo in OpenSim.ini.example affecting telehub sequential routingBlueWall2012-05-161-2/+2
| | | | | | | | | | | | Configuration value should be "sequence" instead of "sequential"
* | | Merge branch 'master' into careminsterMelanie2012-05-161-0/+0
|\ \ \ | |/ /
| * | Allow use of regular expressions in "show object name", "show part name" and ↵Justin Clark-Casey (justincc)2012-05-151-0/+0
| | | | | | | | | | | | | | | | | | "delete object name" console commands if --regex switch is used. Deleteing objects by name, creator uuid or owner uuid now requires confirmation to avoid accidental deletion.
* | | Merge branch 'master' into careminsterMelanie2012-05-142-3/+16
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | set executable bit for Ionic.Zip.dll for running OpenSimulator under cygwinJustin Clark-Casey (justincc)2012-05-141-0/+0
| | |
| * | Oops - missed the config changesBlueWall2012-05-141-0/+8
| | |
generated by cgit v1.1 at 2024-12-23 19:45:10 +0000