aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* add missing Xengine MinTimerInterval to opensim.ini.exampleUbitUmarov2015-11-271-0/+3
|
* Mantis #7765: Add new ClampNegativeZ option. Defaults to false to restore ↵Melanie Thielker2015-11-261-0/+3
| | | | | | prior functionality. Avination code wasn't designed for deep building.
* remove Ode.Net - missing files. ( old ode may be broken now)UbitUmarov2015-11-201-0/+7
|
* remove the hard to maintain Ode.Net wrapper only in use by old odeUbitUmarov2015-11-202-7/+0
|
* change ScriptStopStrategy to the default value co-op (mantis 7740UbitUmarov2015-11-201-1/+1
|
* add LegacySitOffsets option to configuration fileUbitUmarov2015-11-171-0/+7
|
* Merge branch 'master' into avinationmerge0.9.0Melanie Thielker2015-11-161-5/+5
|\ | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs
| * Fixed typosDiva Canto2015-11-121-5/+5
| |
| * configuration options relative to last tow commitsUbitUmarov2015-11-131-0/+18
| |
* | Merge branch 'master' into avinationmergeUbitUmarov2015-11-124-23/+20
|\ \ | |/
| * Corrections to ini example files for standalones v2Ai Austin2015-11-124-23/+20
| | | | | | | | | | | | | | | | | | | | | | Remove "currently unused" indicators for some parameters and add missing "DestinationGuide" parameter in [GridServiceInfo] in StandaloneCommon.ini.example as they do work for a standalone. Regularize example URLs for externally provided web page and economy helper information for uniformity. Correct mistake in reference to grid wide DestinationGuide in override capability in OpenSim.ini.example. Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * Fix an issue introduced in 70a46fe0907c822a5244e36c338bf559ffbec965. I ↵Diva Canto2015-10-211-0/+1
| | | | | | | | accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it.
| * Clean up of simulation version, the number that rules the compatibility of ↵Diva Canto2015-10-183-45/+0
| | | | | | | | | | | | | | | | teleports: - It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure - Its definition moved to the global VersionInfo class As of now it's still 0.3.
* | Add some values to the SimulatorFeatures cap's OpenSimExtras section:Melanie Thielker2015-11-121-1/+9
| | | | | | | | | | | | | | | | SimulatorFPS: The actual optimal FPS of the simulator, un-fudged SimulatorFPSFactor: The fudge factor that is applied to the stats sent to the viewer SimulatorFPSWarnPercent: The percentage below which a lag meter should go to amber SimulatorFPSCritPercent: The percentage below which a lag meter should go to red To display the real values, a viewer would divide the reported FPS by the SimulatorFPSFactor and use that to calculate the percentage of SimulatorFPS. E.g. reported is 55fps, SimulatorFPSFactor is 5.0 and SimulatorFPS is 11.
* | fix: set Normalized55FPS default to TRUEUbitUmarov2015-11-091-1/+1
| |
* | replace StatisticsFPSfactor that needed to be changed with FrameTime to a ↵UbitUmarov2015-11-091-9/+9
| | | | | | | | simpler true or false Normalized55FPS that is now TRUE by default. Incorrectly this commit also contains changes that should had their own commits: changes to heartbeat time control ant to gathering and calculation of related statistics.
* | add StatisticsFPSfactor configuration option (fudge factor) with default of ↵UbitUmarov2015-11-081-13/+31
| | | | | | | | 1.0 (inactive), corresponding to current decision. rename MinFrameTime as FrameTime, change its value and ODE step time. Changed several related coments. (someone may need to translate them to proper english)
* | Fix an issue introduced in 70a46fe0907c822a5244e36c338bf559ffbec965. I ↵Diva Canto2015-10-211-0/+1
| | | | | | | | accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it.
* | we do not have prims with size 2^128...UbitUmarov2015-10-211-6/+5
| |
* | also on OpenSimDefaults.iniUbitUmarov2015-10-211-15/+5
| |
* | update ODE windows DLL libraries to a modified version 0.13.1 r1902. Linux ↵UbitUmarov2015-10-202-0/+0
| | | | | | | | will be updated later if all goes well
* | Fixed merge conflictsDiva Canto2015-10-183-45/+0
| | | | | | | | | | | | | | | | | | | | Clean up of simulation version, the number that rules the compatibility of teleports: - It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure - Its definition moved to the global VersionInfo class As of now it's still 0.3. Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
* | change opensim.ini.example to reflect the changes to npc creation optionsUbitUmarov2015-10-081-5/+4
| |
* | add several options for NPC creation so abusive use can be reduced ↵UbitUmarov2015-09-301-0/+15
| | | | | | | | (restrictive by default) UNTESTED
* | remove file OpenSimDefaults.ini.example no longer in use in masterUbitUmarov2015-09-141-1328/+0
| |
* | remove coment asking to check ODEPhysicsSettings section. That was because ↵UbitUmarov2015-09-141-1/+0
| | | | | | | | of diferent setting for av_density for ubODE no longer needed
* | add missing dll config file for linuxUbitUmarov2015-09-141-0/+7
| |
* | add entries the the ini.example files for ubODEUbitUmarov2015-09-122-5/+12
| |
* | more on compile..UbitUmarov2015-09-081-7/+0
| |
* | Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-086-71/+53
|\ \ | |/ | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
| * Deleted access control spec from [LoginService] section of standalone ↵Diva Canto2015-09-061-17/+0
| | | | | | | | config. It's in OpenSim.ini now under [AccessControl]. Backwards compatibility preserved.
| * Clean up viewer-based access control specifications.Diva Canto2015-09-064-54/+53
| |
| * First commit where physics work as region module.Diva Canto2015-08-311-0/+0
| | | | | | | | | | Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader. Removed call to PhysicsPluginManager.
* | bad merge?UbitUmarov2015-09-0111-6/+1349
|\ \ | |/ |/|
| * 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
| * \ 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
| * \ \ 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
| * \ \ \ 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
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-089-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * \ \ \ \ \ 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
| * \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-073-10/+58
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-014-1/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-141-0/+15
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-111-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-078-7/+123
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-011-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-011-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-296-4/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-251-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs bin/OpenSimDefaults.ini
generated by cgit v1.1 at 2024-12-21 08:06:34 +0000