Commit Graph

2414 Commits (07b78a68fca73f1b504fc2e78b7be5326a401f6b)

Author SHA1 Message Date
Melanie Thielker 367b7d7e5e Merge branch 'master' of opensimulator.org:/var/git/opensim 2016-01-31 03:08:24 +01:00
Melanie Thielker bb6866b474 Replace the new ODE lib with one built against GLIBC 2.12. It's not our
place to force people to upgrade their distro
2016-01-31 03:07:34 +01:00
UbitUmarov 170acd7d67 change parcel_owner_is_god configuration option from default from true to false, leaving only region_owner true by default 2016-01-30 15:42:59 +00:00
UbitUmarov 8981cba137 update OpenSimDefaults.ini 2016-01-26 20:52:09 +00:00
UbitUmarov 6427930a7e ODE lib: update the lib for linux 32bit and 64bit, this time without debug info. Thnx again Dan. (keep older close in case this fails 2015-12-26 02:29:53 +00:00
UbitUmarov 74c48d495b ODE lib: update the lib for linux 32bit. Thnx Dan. (keep older close in case this fails 2015-12-26 01:55:13 +00:00
UbitUmarov 073877dcae ODE lib: update the lib for linux 64bit. Thnx Dan. (keep older close in case this fails 2015-12-25 19:33:38 +00:00
UbitUmarov 14250c3d84 ODE lib change: fix capsule - mesh faces double side collisions. Do double side collisions if at least two dimensions of the mesh are 1.5x the capsule height, otherwise do single side as before. SL and bullet do double Side always. Double side can cause instabilities in some cases. i only windows dev enviroment for the moment. to build for your enviroment: git clone git://opensimulator.org/git/opensim-libs. This maybe be very broken, let us know 2015-12-25 17:43:20 +00:00
UbitUmarov e095f51b05 update the xmlrpcGroups http keep alive option, and coment 2015-12-19 15:29:51 +00:00
UbitUmarov a5a31114b2 add the option to not display parcel ban lines 2015-12-16 22:22:26 +00:00
UbitUmarov a42db4d01e add pants and shirt to opensim library and fix some bodyparts uuids 2015-12-04 19:05:45 +00:00
UbitUmarov 61fbd7dceb add opensim BodyParts library 2015-12-04 18:34:31 +00:00
Diva Canto 3be555e3f3 Replaced ICSharpCode.SharpZipLib.dll for the same reason 2015-11-30 20:02:29 -08:00
Diva Canto 0d79805f65 Replaced the mono addins dlls with freshly compiled ones, because the existing ones may somehow been mutually inconsistent. 2015-11-30 19:49:10 -08:00
UbitUmarov 37d7576d67 add missing Xengine MinTimerInterval to opensim.ini.example 2015-11-27 19:25:56 +00:00
Melanie Thielker 9afe2b018f Mantis #7765: Add new ClampNegativeZ option. Defaults to false to restore prior functionality.
Avination code wasn't designed for deep building.
2015-11-26 17:29:50 +01:00
UbitUmarov 8cc08b899c remove Ode.Net - missing files. ( old ode may be broken now) 2015-11-20 18:29:21 +00:00
UbitUmarov 25983c1ba9 remove the hard to maintain Ode.Net wrapper only in use by old ode 2015-11-20 18:25:56 +00:00
UbitUmarov ad6080bb0b change ScriptStopStrategy to the default value co-op (mantis 7740 2015-11-20 15:48:17 +00:00
UbitUmarov 059a09a684 add LegacySitOffsets option to configuration file 2015-11-17 18:34:22 +00:00
Melanie Thielker f93ce485b1 Merge branch 'master' into avinationmerge
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
2015-11-16 15:28:51 +01:00
Diva Canto 554d4bad8d Fixed typos 2015-11-12 18:40:10 -08:00
UbitUmarov a2a71f0951 configuration options relative to last tow commits 2015-11-13 02:18:12 +00:00
UbitUmarov f037f8335e Merge branch 'master' into avinationmerge 2015-11-12 23:04:04 +00:00
Melanie Thielker 8c7f475740 Add some values to the SimulatorFeatures cap's OpenSimExtras section:
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.
2015-11-12 21:13:44 +01:00
Ai Austin c4d225ed50 Corrections to ini example files for standalones v2
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>
2015-11-12 12:44:53 -05:00
UbitUmarov 55b524aa74 fix: set Normalized55FPS default to TRUE 2015-11-09 15:37:57 +00:00
UbitUmarov d17633f6c0 replace StatisticsFPSfactor that needed to be changed with FrameTime to a 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. 2015-11-09 15:06:41 +00:00
UbitUmarov 3dc16b74af add StatisticsFPSfactor configuration option (fudge factor) with default of 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) 2015-11-08 04:38:58 +00:00
Diva Canto 25552dda7d Fix an issue introduced in 70a46fe090. I accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it. 2015-10-21 16:50:31 -07:00
Diva Canto 41b28550ad Fix an issue introduced in 70a46fe090. I accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it. 2015-10-21 16:47:56 -07:00
UbitUmarov d44bb7d009 we do not have prims with size 2^128... 2015-10-21 01:39:32 +01:00
UbitUmarov f6252e9037 also on OpenSimDefaults.ini 2015-10-21 01:13:41 +01:00
UbitUmarov 2718018cb8 update ODE windows DLL libraries to a modified version 0.13.1 r1902. Linux will be updated later if all goes well 2015-10-20 02:12:51 +01:00
Diva Canto 7ab633461e Fixed merge conflicts
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
2015-10-18 16:24:33 -07:00
Diva Canto 70a46fe090 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.
2015-10-18 16:06:31 -07:00
UbitUmarov 40dc2541ff change opensim.ini.example to reflect the changes to npc creation options 2015-10-08 02:45:24 +01:00
UbitUmarov feb78b2910 add several options for NPC creation so abusive use can be reduced (restrictive by default) UNTESTED 2015-09-30 02:45:11 +01:00
UbitUmarov 3bad55e1ef remove file OpenSimDefaults.ini.example no longer in use in master 2015-09-14 23:52:35 +01:00
UbitUmarov 67984ca273 remove coment asking to check ODEPhysicsSettings section. That was because of diferent setting for av_density for ubODE no longer needed 2015-09-14 23:47:05 +01:00
UbitUmarov c2b05da4af add missing dll config file for linux 2015-09-14 18:48:54 +01:00
UbitUmarov caf298cda3 add entries the the ini.example files for ubODE 2015-09-12 21:46:40 +01:00
UbitUmarov 3780e98d36 more on compile.. 2015-09-08 18:54:40 +01:00
Robert Adams e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905.
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
2015-09-08 04:54:16 -07:00
Diva Canto 3a72e755b9 Deleted access control spec from [LoginService] section of standalone config. It's in OpenSim.ini now under [AccessControl]. Backwards compatibility preserved. 2015-09-06 10:02:16 -07:00
Diva Canto 82ea4179da Clean up viewer-based access control specifications. 2015-09-06 10:00:20 -07:00
UbitUmarov 371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Diva Canto 11194209df First commit where physics work as region module.
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
2015-08-31 14:09:15 -07:00
Ai Austin e64f7abd6c Restore FlotsamAssetCache as default and pre-enabled asset cache module
Keep FlotsamAssetCache as default and pre-enabled asset cache module in
StandaloneCommon.ini./example to have common behaviour between grids and
standalones.  Asset cache is needed to better support temporary assets
and texture drawing functions.
2015-08-26 16:33:32 +02:00
Diva Canto 0540e25081 Still about Ai's patch: it turns out OpenSim doesn't work well without an asset cache because of temporary assets. So setting the default asset cache to Cenome, which is the in-memory cache. 2015-08-25 21:32:38 -07:00