Commit Graph

2684 Commits (0341b4627924279701be3b8a1a487421ac9ef848)

Author SHA1 Message Date
UbitUmarov 11f6d28a06 fix merge 2017-05-07 04:21:33 +01:00
UbitUmarov 8e30016841 revert to older CSJ2K.dll since new seems have issues on linux with existent textures/sculpts 2017-05-05 22:24:05 +01:00
UbitUmarov 832ca518d7 fix merge 2017-05-03 03:52:55 +01:00
UbitUmarov 1bfe9354e3 coment out optional fields that should be edited and uncomented if needed 2017-05-02 15:45:54 +01:00
UbitUmarov 55f7986b44 fix some comments 2017-05-02 13:14:26 +01:00
UbitUmarov 6c2f8176ae change opensim.ini.example setting of ExternalHostNameForLSL to a defualt 2017-05-02 11:39:29 +01:00
Diva Canto 3b01c209b2 Update libOMV 2017-04-25 16:24:07 -07:00
UbitUmarov a680d8b8d7 fix merge 2017-04-25 17:59:53 +01:00
UbitUmarov 3b33a90e37 update ode binaries for windows 2017-04-21 13:49:25 +01:00
Michael Cerquoni b498d554e1 update ode binaries for linux; add a minimal velocity for bounce 2017-04-19 21:50:32 -04:00
UbitUmarov 84c9125016 update ode binaries for windows; add a minimal velocity for bounce 2017-04-20 02:25:22 +01:00
Michael Cerquoni 52e03ee5bd update ubODE for Linux x86 and x86_64 to include lasted ODE 0.13.2 2017-04-19 13:24:38 -04:00
UbitUmarov 49884b94a7 update ODE binaries for windows. Other platforms need to compile from opensim-libs repo, folder ODE-OpenSim-0.13.2, read file OPENSIM-README.txt. Remove code to reduce bounce on non physical placement, new unmanaged should handle that 2017-04-18 00:50:55 +01:00
UbitUmarov 22e9647748 update ode binaries for windows 2017-04-14 03:45:03 +01:00
UbitUmarov 040037d713 update ode.dll for windows. Other platforms need fo be compiled from opensim-libs repo, folder ODE-OpenSim.0.13.2. This adds OsTerrain, a replacevment for Heightfield that ubOde can use. Its already rotated as needed and has a diferent Sphere collider, rest is still almost identical. Keep previus ode version in case this goes wrong. 2017-04-12 06:50:34 +01:00
UbitUmarov c58f2167bb fix osTeleportObject OSFunctionThreatLevel setting on osslEnable.ini 2017-04-05 13:55:51 +01:00
UbitUmarov 2805cb9dec give osTeleportObject proper OSFunctionThreatLevel setting on osslEnable.ini 2017-04-05 01:15:44 +01:00
Melanie Thielker 75915bd0f3 Add the ability to post to and act uponconfiguration in etcd
Etcd is a distributed, highly available name-value store that is
the basis of many clustered applications. However, it can also be
run on a standalone machine. Using etcd allows live monitoring
and possibly changing configuration while the sim is running.
2017-03-31 14:38:41 +01:00
Melanie Thielker 4e465002a2 Make the file based log file format sane for the casual user
Developer-oriented format is left commented so interested users and devs
can reactivate it.
2017-03-31 14:38:41 +01:00
UbitUmarov d96bcd8264 add a bit clarification about grid private port protection 2017-01-09 18:22:39 +00:00
UbitUmarov 45695ef2e3 Merge branch 'master' into httptests 2017-01-08 02:00:24 +00:00
UbitUmarov 8662606f7b add the new GOD ossl option to osslEnable.ini 2017-01-07 23:38:55 +00:00
UbitUmarov 2d0860ac51 rename OSSL enable option GOD as ACTIVE_GOD so its use is more clear 2017-01-07 22:51:56 +00:00
UbitUmarov e2167716aa change OSSL enable option GOD to use IsGod, so it means a active god, as my original idea 2017-01-07 21:44:01 +00:00
UbitUmarov add27a503e Merge branch 'master' into httptests 2017-01-07 16:55:03 +00:00
UbitUmarov 0b912b2acc Remove parcel_owner_is_god option. It is conceptually wrong and with
limited use. Relevant parcel owners can just be made estate managers with better regions management logic
2017-01-06 15:00:55 +00:00
UbitUmarov 6172446e2a Merge branch 'master' into httptests 2017-01-06 01:09:42 +00:00
Melanie Thielker ad8915f154 Restructure god level and permissions
Create a class GodController which controls all aspects of god level,
viewer modes and user levels at ScenePresence level.
2017-01-06 00:55:14 +00:00
UbitUmarov 82a26671b8 Merge branch 'master' into httptests 2017-01-03 11:24:16 +00:00
Melanie Thielker f03a6bbc61 Create a generic way for passing constructor args to plugins
The old syntax didn't allow for any parameters except for services
listed in the ServiceList. Now, services loaded by other services can
also be made to use different ini sections or have additional paramters.
Syntax is: [<ExtraParam>@]...<DllName>[:<ClassName>]
2017-01-02 17:47:20 +00:00
Diva Canto 7abb0477ed Replaced OpenMetaverse libs/xmls with new ones. Also added a file in openmetaverse_data that was added recently to libomv and was missing. 2016-12-31 08:58:06 -08:00
UbitUmarov 5fc3605955 some cleanup, use more using(), more checks so http request mem stream is closed 2016-12-30 07:15:28 +00:00
UbitUmarov 1107d0ccb9 Merge branch 'master' into httptests 2016-12-30 02:20:52 +00:00
UbitUmarov 2836f16ae1 fix typos 2016-12-30 02:14:16 +00:00
UbitUmarov 2a01173715 Merge branch 'master' into httptests 2016-12-30 01:52:02 +00:00
Melanie Thielker e0b5135010 Add a MaxRetries option to the inventory connector.
If clustered services are used, another try would go to another server
and may succeed.
2016-12-29 16:29:44 +00:00
Melanie Thielker 07b48fd58c Add negative caching to flotsam cache. Prevents scripts from hammering the asset server 2016-12-29 15:47:46 +00:00
UbitUmarov 1ffcc59818 gc is also a unwanted cache, so use it. With this, memcache with short expires is no longer needed 2016-12-29 03:10:10 +00:00
UbitUmarov bf1f4d1384 fix typos (thanks you know who) 2016-12-25 16:51:54 +00:00
UbitUmarov 52e7fc31f7 fix typos (thanks you know who) 2016-12-25 16:48:27 +00:00
UbitUmarov 1b95ada105 Merge branch 'master' into httptests 2016-12-25 05:51:08 +00:00
UbitUmarov 293b65ac82 FloatSamCache: dont use slideexpire on current libovm expirecache. Change example settings to use memory cache with short expire time. ( 20% to 40% mem cache hit rates observed 2016-12-25 05:46:16 +00:00
Melanie Thielker 8d0b592e5d Add en explanation to osslEnable.ini for GRID_GOD 2016-12-23 20:41:10 +00:00
UbitUmarov 0887be3c12 replace the (hidden) GRID_GOD by a more usefull GOD so includes all types. This needs to be changed to current effective godlevel check (sp.GodLevel) when that is fixed. Automatic god powers need be (optionaly) removed 2016-12-23 03:42:50 +00:00
UbitUmarov 86cc02f33e Merge branch 'master' into httptests 2016-12-23 02:53:58 +00:00
Melanie Thielker 0ae2b5ac81 Allow the use of modular configs with Robust as we already can with OpenSim 2016-12-22 18:23:04 +00:00
Melanie Thielker 5b403c448e Update the ini examples to add options missing from one to the other.
Group hypergrid related options within each section to ease
transition from non-HG to HG
2016-12-22 15:37:48 +00:00
UbitUmarov 7367f03d6e remove a odd raycastv3 config option 2016-12-21 20:39:38 +00:00
UbitUmarov 4bdf89d59b update httpserver muting some socket errors that are normal 2016-12-19 09:07:17 +00:00
UbitUmarov 82fc8e1a36 Merge branch 'master' into httptests 2016-12-18 05:03:27 +00:00
UbitUmarov 30cd36ff98 leave stupid broken permissions alone 2016-12-18 03:56:53 +00:00
UbitUmarov c93551d8f4 allow a creator that is also onwer to change export flag. Add missing setting to ini files 2016-12-17 22:38:31 +00:00
UbitUmarov 48efbeb8d3 set pbs shape acording to mesh number of (material) faces 2016-12-15 15:14:12 +00:00
UbitUmarov 94a36396b1 respective .ini settings 2016-12-15 00:09:21 +00:00
UbitUmarov 1d6a7d2225 correct the new npc entries in osslEnable.ini 2016-12-14 22:34:27 +00:00
UbitUmarov e2062951d7 update osslEnable.ini 2016-12-14 16:33:52 +00:00
UbitUmarov 18a292ad02 Merge branch 'master' into httptests 2016-12-14 13:35:53 +00:00
UbitUmarov 1ffc81c869 also reduce check threat level of osNpcSetProfileAbout to Low; update osslEnable.ini 2016-12-14 01:31:16 +00:00
Melanie Thielker 4d1536f1ec Allow OpenSim to respond to Unix signals. This may need work to be
properly ignoed on Windows.
Windows devs, please test and check for platform flags if this causes
issues in Windows
2016-12-12 00:07:36 +00:00
UbitUmarov 6627da693e suport client certificate validation per listenner, with a supplied static callback 2016-12-09 04:07:06 +00:00
UbitUmarov 95ff859484 change a few ssl config comments 2016-12-07 20:33:38 +00:00
UbitUmarov 3a81642d97 add SSL certs validation options for regions to allow simple encriptation without any peer autentification using simple homemade (or even shared) certs. 2016-12-07 13:30:07 +00:00
UbitUmarov 049dd374e9 add SSL certs validation options for robust to allow simple certificates, possible only for encriptation without any peer autentification. disable validation by default for the small grids case 2016-12-07 12:23:40 +00:00
UbitUmarov 9df95afd86 update httpserver 2016-12-02 13:54:11 +00:00
UbitUmarov b981ac42bc Merge branch 'master' into httptests 2016-12-02 13:51:30 +00:00
UbitUmarov f2cad38b3d fix the FileCleanupTimer coment 2016-11-30 07:59:01 +00:00
UbitUmarov e19eb65c18 disable floatSam FileCleanupTimer option on ini.example since it is currently a broken resources expensive option. Users should do it by hand when its impact on region is acceptable 2016-11-30 07:52:50 +00:00
UbitUmarov 6b017f94ea update httpserver dll fixing a memory leak 2016-11-27 15:23:08 +00:00
UbitUmarov 877d3092b4 Merge branch 'master' into httptests 2016-11-27 15:14:34 +00:00
UbitUmarov 75ad210b6b it is nice to save a file to atually change it... 2016-11-23 20:44:55 +00:00
UbitUmarov d9789596d4 take parcel_owner_is_god option from ini.example since it is not a recomended option for general use 2016-11-23 20:41:10 +00:00
AliciaRaven 94e48838d5 Include new Region.ini option for DefaultLandingPoint for teleports with no coords specified.
This is useful when using a Telehub would be to restrictive as it would block landmarks and map teleports. This location is only ever used when no coordinates are provided. If config value not set, the previous default of 128,128 is used.
2016-11-22 15:31:45 +00:00
AliciaRaven 05f7002445 Include config option to disable stats thread showing read/write stats in console.
Keeping default as true to retain current behaviour.
Also checked to prevent counters being added to so there wont be any integer overflows over time
2016-11-20 14:20:54 +00:00
UbitUmarov ec8393571f Merge branch 'master' into httptests 2016-11-16 13:07:23 +00:00
UbitUmarov b6329fb784 mantis 8055: fix default value of npc options 2016-11-12 14:07:40 +00:00
UbitUmarov c5d85b5465 reduce diferencs btw OpenSimDefaults.ini and OpenSim.ini.example 2016-11-11 16:04:20 +00:00
UbitUmarov 6218913345 add some configuration options missing in OpenSimDeafults.ini but present in OpenSim.ini.example 2016-11-08 11:22:08 +00:00
UbitUmarov 01a4a883e0 Merge branch 'master' into httptests 2016-11-03 14:01:35 +00:00
UbitUmarov 4b326f8691 fix some coments, thanks Austin Tate 2016-11-03 14:00:45 +00:00
UbitUmarov 73b20c2ca2 XEngine: make calls to gc.collect on region startup scripts loading a configurable option, since it is very slow operation 2016-11-03 12:58:43 +00:00
UbitUmarov 2ce0673af2 Merge branch 'master' into httptests 2016-10-21 17:58:17 +01:00
UbitUmarov eaac332d00 fix a coment on OpenSim.ini.example ( mantis 8037) 2016-10-16 17:33:39 +01:00
UbitUmarov 90be326457 Xengine option AppDomainLoading default option true is causing problems with several mono versions. Until a fix is found change the default to false, so this is not a major problem for the less technical skilled users. 2016-10-15 21:06:17 +01:00
UbitUmarov 6b0094645c change some coments relative to ssl in config files 2016-10-10 20:14:02 +01:00
UbitUmarov 7aa4bd7006 add a comment about selfsigned certs 2016-10-09 01:15:53 +01:00
UbitUmarov 5b946405a0 changes to regions ssl suport: verify if hostnames are validate by the selected cert, make clear that for now all regions need to have the same ExternalHostName if using sll (due to other code that needs to be changed later) 2016-10-09 01:01:52 +01:00
UbitUmarov 9843e3776e Merge branch 'master' into httptests 2016-10-08 01:27:02 +01:00
UbitUmarov b51739e23e recover regions main http server ssl suport. Using a PKCS12 cert file, and not certs store for now. Option http_listener_cn, cert CN need to the same as external IP. Self sign certs do seem to work, but the viewers option NoVerifySLLCert needs to be set true. CA check is not done but they do check the IP 2016-10-06 21:35:11 +01:00
UbitUmarov 878fac3fe3 fix comment telling the correct default physics engine 2016-10-01 20:26:37 +01:00
UbitUmarov 606e9f99f3 forgot the dll 2016-09-03 08:52:15 +01:00
UbitUmarov 9aec227767 Merge branch 'master' into httptests 2016-09-03 07:51:53 +01:00
UbitUmarov c05ee23d3d minor change on warp3d lib 2016-08-24 04:10:35 +01:00
UbitUmarov 8eacc6b207 replace warp3D.dll by a newer modified version. (only minor testing done :( 2016-08-23 10:58:34 +01:00
UbitUmarov c631ffb943 remove region combine option (mega region) for config ini files 2016-08-21 06:49:16 +01:00
UbitUmarov 7ba3fb7b5d merge issue 2016-08-19 03:05:25 +01:00
UbitUmarov d701de4021 add cap GroupMemberData 2016-08-19 02:26:49 +01:00
UbitUmarov 4b73550eee allow cap HomeLocation to be disabled setting Cap_HomeLocation = "" 2016-08-18 13:17:46 +01:00
UbitUmarov a997ffd497 sync osForceAttachToOtherAvatarFromInventory thread level in code and in osslEnable.ini mantis: 7997 2016-08-16 04:35:49 +01:00
UbitUmarov 68a4e363dd Merge branch 'httptests' of opensimulator.org:/var/git/opensim into httptests 2016-08-07 00:24:17 +01:00
UbitUmarov 61ec34b441 fix osGetHealRate thread level 2016-08-06 01:15:26 +01:00
UbitUmarov ad76687227 update libode for mac osX. Thanks Gavin Hird (mantis 7781) 2016-08-04 15:05:33 +01:00
UbitUmarov 12658b1eed update libode for mac osX. Thanks Gavin Hird (mantis 7781) 2016-08-04 15:04:43 +01:00
UbitUmarov cb23d1bf24 Merge branch 'master' into httptests 2016-07-30 20:13:16 +01:00
UbitUmarov 3c4d908cda remove obsolete config setting 2016-07-30 12:43:14 +01:00
UbitUmarov 376084a2e5 Merge branch 'master' into httptests 2016-07-27 23:39:50 +01:00
UbitUmarov 4b832f0f8e add osGetHealRate(avatarkey) and osSetHealRate(avatarkey, healrate); healrate from 0 (disables auto heal) to 100 (maybe too fast) % per second. (untested) 2016-07-25 02:05:53 +01:00
UbitUmarov 2bb467e358 add osSetHealth() value from 1 to 100; (mantis 7973) 2016-07-24 16:31:29 +01:00
UbitUmarov 6a02ac634b identify contexts by ID now avaiable ( pipeline serialization) 2016-07-17 11:39:38 +01:00
UbitUmarov c802368c86 replace http server with test version 2016-07-17 10:49:59 +01:00
UbitUmarov c02fe98b7d add test option ObjectsCullingByDistance. In future, if true, it may
prevent sending objects outside view range to viewers. DO NOT SET TRUE
 unless testing it. Code still not completei!!!
2016-07-06 16:13:27 +01:00
Diva Canto e00603f78a New config var: DisableObjectTransfer. If set to True, objects never cross; instead they stay in the region, possibly placed outside its borders. 2016-07-03 12:24:31 -07:00
UbitUmarov 5143bbc9d6 mantis: 7936 replace httpServer_OpenSim.dll with a new one restoring some checks lost in last update 2016-06-28 14:01:16 +01:00
Diva Canto b522f0916a Mantis #7934 and related: landing points and telehubs for gods. Added a new configuration variable LandingPointBehavior that can switch between what we're used to in OpenSim and the behavior in SL. 2016-06-23 11:44:59 -07:00
Diva Canto 1065a4c1e4 Replace the http server dll with the right pair dll + xml 2016-06-23 07:55:50 -07:00
Melanie Thielker a2e4beea86 Update HttpServer_OpenSim.dll to fix an inventory loading bug. 2016-06-23 15:20:07 +02:00
Melanie Thielker 6f13d1e3df Remove "f" (float) type markers that may have crept in through copypasta. 2016-04-15 15:58:46 +02:00
AliciaRaven 4e5de888a7 Update LibOMV to latest versions. LibOMV commit hash 177ea9848a43e6df3b82f70aea4ac903ece1b2e3 2016-04-06 18:30:20 +01:00
AliciaRaven ed9d4feef5 Include option for the HG version of FSAssets connector under HGAssetService in robust example ini 2016-04-05 22:53:27 +01:00
Melanie Thielker 39f7c4a292 Expand on the comment on the new HTTP limit feature. 2016-03-14 16:11:37 +01:00
Jeff Kelley 41644bbfa9 Implement parameterization of HTTP_BODY_MAXLENGTH maximum as proposed in Mantis 7839. 2016-03-14 16:08:49 +01:00
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
Diva Canto 9b5bd4b279 Fixed comment in ini related to previous patch 2015-08-25 20:43:22 -07:00
Ai Austin 9d104f5453 Changes to .ini.example files to improve instructions and workflow for standalone setups
Clarify what must be changed in initial .ini files to create a working
standalone setup now that [Const] variables are used. Fix separator used
in one of choice lists for [Const] BaseURL descriptor. Minor changes to
line spacing of some sections in StandaloneCommon.ini.example file for
layout regularity. Correction of a typo in comment.

Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-08-25 20:42:02 -07:00
dahlia 1dae36ff7b Revert "update libomv managed dlls to 49a5cf05c32e - fresh clone default settings release mode VS 2015 community edition"
This reverts commit 4f8e18e31c.
2015-08-23 15:31:25 -07:00
dahlia 4f8e18e31c update libomv managed dlls to 49a5cf05c32e - fresh clone default settings release mode VS 2015 community edition 2015-08-23 15:16:31 -07:00
Ai Austin 3a27b47593 Refine comments .ini file setup for new Standalone
Helpful comment for setting [const] section of OpenSim.ini to allow for
standalone. Correction to StandaloneCommon.ini.example as
[GridInfoServices] welcome parameter does work and is also useful for
standalones.
2015-08-21 18:42:21 +02:00
dahlia 1bfdc9f32b Update libomv managed dlls to 49a5cf05c32e 2015-08-14 16:55:06 -07:00
Diva Canto 959872315f WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum.
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
2015-08-08 12:12:50 -07:00
Cinder f218cbd29d max-agent-groups support
Robust now tells viewers what the maximum number of groups is. Viewers show this limit to the users, and enforce it.

The default is 42, which is what viewers had assumed was the maximum number before this update.

Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2015-08-07 07:42:26 +01:00
Christopher 86c426e587 create osGetAvatarHomeURI
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-04 18:09:13 +02:00
AliciaRaven 971d57644f Fix a typo in my previous changes to robust.ini example files with regards to the FSAssets config. 2015-07-30 18:58:44 +01:00
Melanie Thielker 965f94e30f Add LogFile option in OpenSimDefaults.ini. It was omitted accidentally 2015-07-26 04:54:46 +02:00
AliciaRaven 3e90d28d33 Robust config loader does not support config includes. Replace these additions for FSAssets with direct options in robust.ini example files instead.
As suggested by Orenh in mantis 7644, in the future it would be beneficial and less confusing to use only 1 of the 3 current config loaders.

Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2015-07-22 18:28:33 +01:00
Oren Hurvitz 31a216af70 Added the thread name to the logs
This helps debug synchronization problems
2015-07-22 19:45:18 +03:00
AliciaRaven a7543a3391 Add config options for FSAssetService. The default is the original asset service.
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-07-13 19:04:45 +02:00
Cinder e99be0bb19 Fix my typo, the dll is named OpenSim, not Opensim
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-21 08:43:41 -07:00
Cinder 7edaf1d851 Add MaxMaterialsPerTransaction to SimFeatures
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-19 08:44:34 -07:00
Diva Canto 53502e8694 Added example of how to configure the GodNames module 2015-06-13 14:41:50 -07:00
Diva Canto bcb8a7d7f9 A few bug fixes for Agent Preferences to actually work. Also added missing config for standalone. 2015-06-13 08:36:06 -07:00
Cinder 0fa94f222d Refactor AgentPreferences so that database operations happen centrally. the opensim way.
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 07:27:42 -07:00
Diva Canto fe116b6af7 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2015-06-11 11:31:44 -07:00
Diva Canto 254a1e0f98 Restoring ICSharpCode.SharpZipLib.dll to what it was before, as it seems to have been inadvertently replaced in commit edcba95ab5 2015-06-11 11:31:21 -07:00
dahlia 6a6c5942fa Update libomv to current HEAD f75dccc313f3 2015-06-10 00:39:33 -07:00
Magnuz Binder 897c7e1bda Improve configuration description for llCastRay V3.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-06-01 13:09:21 -04:00
dahlia 22e0367203 Add an entry for osGetGender to config-include/osslEnable.ini. Thanks to Austin Tate for the suggestion. 2015-05-30 15:10:21 -07:00
Michael Cerquoni d271151504 fix file perms and change AllowLightshareFunctions to AllowLightShareFunctions 2015-05-25 20:52:27 -04:00
Michael Cerquoni defc9c1d86 fix permmission issue on OpenSimDefaults.ini 2015-05-22 01:22:17 -04:00
Magnuz Binder fdc383a843 Use own mesh cache in llCastRay V3 after throttling.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-22 01:21:50 -04:00
Magnuz Binder 7d26815d0e Throttle llCastRay V3.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-22 01:21:18 -04:00
Melanie Thielker edcba95ab5 Merge branch 'master' into moses
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2015-05-20 23:40:52 +02:00
Michael Heilmann 140ea04b9d Merging Opensim upstream before generating patch 2015-05-19 15:18:45 -04:00