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
dahlia
7566d22a18
update libomv to 6b8afb2b61d3
2015-05-12 22:54:53 -07:00
Magnuz Binder
d348f87161
Patch llCastRay fully simplified to V3.
2015-05-12 15:40:42 -07:00
Diva Canto
923a57a91f
Added tests for UserAccountService in Robust. In the process fixed a couple of bugs in the network connectors. For some reason the robust-bound code had a CreateUser method, while the client-bound code had no such method. I assume someone is extending the client-side code with their own connectors. I added the missing method, but didn't add it to the service interface.
2015-05-11 19:55:23 -07:00
Diva Canto
3df472f10d
Added inventory tests to Robust.Tests.
2015-05-11 08:52:12 -07:00
Diva Canto
eb9b16d284
Added simple test for IM in Robust too.
...
Changed Inventory data to use the mock one in Common Tests. (but still not inventory tests)
2015-05-10 21:49:24 -07:00
Diva Canto
c2cf22ea4f
Added the beginning of a new test framework for robust connectors and services. For now, just Grid and Presence. This framework starts a robust server (as a thread) listening on a port in localhost, then the tests are client code.
2015-05-10 21:04:46 -07:00
Michael Cerquoni
44b8b9fef6
Revert "Patch llCastRay fully-simplified to V2." for further review.
...
This reverts commit c96ee68953
.
2015-05-04 16:23:16 -04:00
Magnuz Binder
c96ee68953
Patch llCastRay fully-simplified to V2.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-04 12:44:58 -04:00
dahlia
df12fbb0d2
add new config parameters for llCastRay to OpenSimDefaults.ini
2015-05-04 00:32:22 -07:00
Magnuz Binder
43b8bd0c35
Implement llCastRay fully, simplified.
2015-05-03 23:41:11 -07:00
Robert Adams
30f9e5372e
Only send parcel layer data around the point of interest. Can be disabled
...
by setting [LandManagement]LimitParcelLayerUpdateDistance=false
New parameters added to OpenSimDefaults for the distance and enablement.
2015-05-03 21:56:41 -07:00
Diva Canto
0303112dcb
Added new [Statistics] config section to go with the previous patch.
2015-04-29 18:42:20 -07:00
Robert Louden
2e7ace4e25
Readded file to repository. Acciedently removed.
2015-04-21 18:42:30 -04:00
Robert Louden
9822692c12
Phase 2 additons with Frame Dilation metric.
...
Test Plan: Compiles and runs successfully.
Reviewers: szielinski
Reviewed By: szielinski
Differential Revision: http://cr.irl.ucf.edu/D268
2015-04-21 16:59:43 -04:00
Glenn Martin
1959eb8372
Moved over metrics from previous OpenSim 0.8.0.3 repository (this new repository is now the master branch from OpenSim).
2015-04-21 14:29:17 -04:00
Magnuz Binder
263db44129
Implement llGetBoundingBox fully.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-20 16:23:34 -04:00
BlueWall
67d4e4475f
Small fix for ini comments
2015-04-15 15:55:47 -04:00
Robert Adams
e4e58fad32
Enable OSSL functions by default using the osslEnable.ini configuration file.
...
This changes OpenSim.ini.example to, by default, include osslEnable.ini which
turns on the OSSL functions and limits who can do which operations.
2015-04-14 07:17:54 -07:00
Robert Adams
520e6ed6f3
Remove ossl settings in XEngine section of OpenSim.ini.example with note to where
...
they were moved. At the moment, ossl settings are in the XEngine section although
they should apply to any LSLish script engine. Moves all ossl settings to osslEnable.ini
Update osslEnable.ini with more decriptive comments and set some functions to be more
restrictive -- especially the functions that allow scripts to do things to other
avatars and prims.
2015-04-14 06:18:25 -07:00
Robert Adams
d96d31be45
Add warnings in osslEnable.ini about use of osAvatarPlayAnimation which forces animations
...
on avatars without requesting user permission.
2015-04-12 19:32:06 -07:00
Robert Adams
2a302d9a32
Move osslEnable.ini file from bin/ to bin/config-include.
...
Per comments, putting new configuration files in bin/ is not preferred.
Add comments and instructions to heading of osslEnable.ini.
Add a commented out include of osslEnable.ini to OpenSim.ini.example.
Fix line endings of osslEnable.ini to be Unix style.
2015-04-12 16:00:54 -07:00
Robert Adams
01a6ce2baa
Add the missing commas to parcel parameter setting in osslEnable.ini
2015-04-12 08:00:46 -07:00
Robert Adams
d5ed6493d9
Add 'osslEnable.ini' file which enables a restricted set of ossl functions.
...
An 'include' in OpenSim.ini would enable the ossl functions but, for the moment,
the functions are still disabled by default and this file is an example
of what could be done.
2015-04-11 22:07:16 -07:00
Justin Clark-Casey (justincc)
441d77b5b6
For the public-facing Hypergrid asset and inventory services, override a general AuthType setting with None in Robust.HG.ini.example
...
This is necessary because both asset and inventory reuse generic connectors that will otherwise set up authentication configured in the [Network] section.
This allows one to set up authentication for private services whilst still being able to use asset and inventory on foreign grids.
The setting is AuthType = None in both [HGAssetService] and [HGInventoryService]
Private grid asset and inventory services will still set up the authentication as configured.
2015-03-13 23:01:50 +00:00
Justin Clark-Casey (justincc)
b9c384fc3c
Add rough and ready element explanation in a comment at the top of inventory library items xml
2015-03-11 23:12:21 +00:00
Justin Clark-Casey (justincc)
db24cf5322
Add required wearable flags values to inventory body parts and clothing example xml
2015-03-11 23:04:39 +00:00
Justin Clark-Casey (justincc)
b333a19102
minor: Remove unnecessary quoting in Regions.ini.example
2015-03-11 22:46:11 +00:00
Justin Clark-Casey (justincc)
921f4f9500
minor: Change InternalAddress in Regions.ini.example from 127.0.0.1 to more normal 0.0.0.0
2015-03-11 22:44:26 +00:00
Justin Clark-Casey (justincc)
3255335c42
Make private services forbid llHTTPRequest() calls by rejecting those that have the X-SecondLife-Shard header.
...
If you need to enable this, set AllowHttpRequestIn = true in [Network] for all private services or individual [*Service] sections.
2015-03-04 18:27:51 +00:00
Justin Clark-Casey (justincc)
7d3bafd5ab
Add outbound URL filter to llHttpRequest() and osSetDynamicTextureURL*() script functions.
...
This is to address an issue where HTTP script functions could make calls to localhost and other endpoints inside the simulator's LAN.
By default, calls to all private addresses are now blocked as per http://en.wikipedia.org/wiki/Reserved_IP_addresses
If you require exceptions to this, configure [Network] OutboundDisallowForUserScriptsExcept in OpenSim.ini
2015-03-04 18:27:50 +00:00
Robert Adams
7b9ad11a98
BulletSim: update the OSX BulletSim binary to the latest sources in
...
opensim-libs.
2015-02-21 14:27:01 -08:00
Justin Clark-Casey (justincc)
85133daae0
minor: Add explanation that [Startup] CombineContiguousRegions should be false for varregions.
2015-02-19 21:47:02 +00:00
Robert Adams
f62008f728
BulletSim: bring the BulletSim dll's and so's up to date with
...
the sources in the 'libs' source repository. No functional changes.
2015-02-13 20:59:13 -08:00
Robert Adams
e26ba505f6
BulletSim: update DLLs, SOs, and dylib with latest versions.
...
The dylib update is a new version that doesn't leak memory.
2015-01-25 13:24:50 -08:00
Justin Clark-Casey (justincc)
d9bfc710c0
Replace the tabs that have crept into isolated places in config and config example files with spaces
2015-01-21 00:54:13 +00:00
Diva Canto
72814245be
Also deleted the option of setting Cap_WebFetchInventoryDescendents from OpenSim.ini.example
2015-01-14 06:33:15 -08:00
Diva Canto
e2dd15625f
Added GetDisplayNames capability. For now, we don't actually use display names, and this cap returns the regular name. But this moves the server side into the newer, preferred, protocol used by the viewer for fetching the names of agents in the scene given their UUIDs. (the old protocol is via UDP). This works fine in my limited tests, but could use further testing by others.
2015-01-09 08:31:56 -08:00
Diva Canto
16ff808595
Fix name of EstateDataRemoteConnector in the comment.
2015-01-07 19:18:18 -08:00
Diva Canto
14b3ee636d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-01-07 11:09:04 -08:00
Diva Canto
46ab59723d
Added a different/better way of specifying data services in DataSnapshot -- using DATA_SRV_ keys, one per service. This allows 3rd party modules to add data services automatically.
2015-01-07 11:04:23 -08:00
Robert Adams
700543b161
BulletSim: tweek step parameters and logic to make walking up steps
...
closer to SL. This change should address small floor edges acting like
walls, approaching a step at any angle (other than walking backwards)
will allow walking up, and reducing the avatar pop-up when going up
stairs.
2015-01-07 06:39:29 -08:00
Diva Canto
8e562f04d1
Donation of robust network connectors for estate service, as promised. This allows to have one central database for estates without having to open the MySql port. This is off by default, so not to disturb everyone's existing installations. To use it, see GridCommon.ini.example [EstateDataStore] section and Robust*.ini.example's new additions.
...
Note that I also made things consistent by removing both the EstateDataService and the SimulationService into their own dlls, just like all other services. They really didn't belong in Services.Connectors, since everything in that component is about network connectors to robust backends. We may have too many dlls, and at some point it might not be a bad idea to merge all services into one single dll, since they all have more or less the same dependencies.
2015-01-06 21:24:44 -08:00
BlueWall
383a1a6fe1
Fix typo in OpenSim.ini.example
2015-01-04 18:52:37 -05:00
Robert Adams
d3a74894ab
BulletSim: update BulletSim DLLs and SOs to remove chatty debug log messages.
2015-01-04 14:21:43 -08:00
Diva Canto
5179f078f7
Removing the Wifi config example from Robust.HG.ini.example, because it is not needed anymore. Wifi is now a mono addin to Robust, and it can be deployed in two ways: by installing the Wifi plugin via mautil or by compiling Wifi from source, in which case it will appear in the registry when Robust starts because the Diva Wifi dlls are present in bin.
2015-01-04 11:06:28 -08:00
Robert Adams
cfa89bbe31
Make bin/mautil.exe executable when checked out.
2015-01-03 15:28:15 -08:00
Diva Canto
e643722d7c
Changed the dll name that comes in Robust.HG.ini.example for Wifi.
2015-01-02 16:54:13 -08:00
Diva Canto
d520611f57
Amend to previous commits -- also needed for bug fixes: the mono addins dlls.
2015-01-02 16:06:11 -08:00
Diva Canto
faea742f32
Slight change in the way region module addins handle their configuration. Rather than opensim grabbing their config file automatically from the addins folder, it's the module's responsibility to read its own config file. This makes it consistent with Robust-bound addins.
2015-01-02 13:32:20 -08:00
Diva Canto
08509a87cd
Another minor improvement to mautil related to https://github.com/mono/mono-addins/issues/22 . And since these commits show up in that issue report, I thought I'd say 'hi' to the zealous Xamarin developer who seems to be eager to get pull requests. Not yet, my friend, not until I fix all the bugs that stand in my way, now that I'm using mautil :-)
2015-01-02 13:30:04 -08:00
Diva Canto
36eb45fc8e
Switched mautil.exe with another that has a bug fix for this bug report: https://github.com/mono/mono-addins/issues/22
2015-01-02 09:17:39 -08:00
Diva Canto
462f521eba
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-12-30 23:47:29 -08:00
dahlia
186d4a6d5b
compile Prebuild.exe with mono 3.2.8 targeting .NET framework 3.5
2014-12-30 23:14:01 -08:00
Diva Canto
0af02efaed
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-12-30 20:05:33 -08:00
Diva Canto
a88bc50a16
Add support for expansion of key values in nini config files.
...
Add loading of 3rd-party addin inis automatically.
2014-12-30 20:05:12 -08:00
Mic Bowman
bc7570e59c
Merge branch 'mb-throttle-test'
...
Merge in the new throttle code.
2014-12-30 16:26:57 -08:00
Diva Canto
5cf6a6f830
WARNING: BREAKING CHANGES FOR REGION MODULE DEVELOPMENT.
...
This cleans up Opensim's use of mono addins. In particular, the extension points /OpenSim/RegionModules and /OpenSim/WindModule moved from OpenSim.exe to OpenSim.Region.Framework.dll. From here on, developers of region modules should declare their dlls to be dependent on OpenSim.Region.Framework, starting with version 0.8.1
Additional changes:
- Addins version uniformly updated to 0.8.1. These numbers should be compatible with the release numbers or else it becomes very confusing.
- Mono addins directives moved from files addins.xml to embedded directives in the class and assembly declarations, to make it all consistent
2014-12-30 07:58:42 -08:00
Mic Bowman
041a09ecb9
Enable runtime configuration of the minimum rate for adaptive
...
throttles. Setting adaptive_throttle_min_bps will change the
minimum rate that the adapative throttles will drop to in case
of network packet loss. The current rate default rate is 256kbps.
The viewer can throttle rates under that amount, but the dynamic
adaptation will not.
2014-12-29 18:46:33 -08:00
Diva Canto
89c1ac4cff
Updated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number doesn't need to match the release version number, but I think it's a very good idea that they do.
2014-12-29 15:05:44 -08:00
Diva Canto
b5bc5665a6
Updated Mono.Addins to version 1.2 ( https://github.com/mono/mono-addins/releases/tag/mono-addins-1.2 ). Also included mautil.exe, the command line application for managing mono addins.
2014-12-29 14:38:18 -08:00
Diva Canto
789cd4e928
Updated libomv to grab the latest bug fixes in Collada upload
2014-12-25 08:02:34 -08:00
Justin Clark-Casey (justincc)
92c9dd42c4
Restore OpenMetaverse.dll to the one compiled under Windows again from commit 2660619
. Somehow it got replaced again in the ghosts merge with the one built under Linux.
...
No other dlls are affected
2014-12-10 23:44:13 +00:00
Justin Clark-Casey (justincc)
d930ca7b1d
minor: Add doc about [InventoryService] AllowDelete setting to robust ini example files.
2014-12-04 19:37:25 +00:00
Justin Clark-Casey (justincc)
c3c05a8693
Reintroduce general xengine extra debugging log level. This can be controlled at runtime with the command "debug xengine log <level>", as with similar commands.
...
If log level is 1 then every script load is logged.
This means the <logger name="OpenSim.Region.ScriptEngine.XEngine"> section in OpenSim.exe.config is no longer needed to avoid log spam on regions with many scripts and can be removed.
2014-12-03 20:48:17 +00:00
BlueWall
caa7b1e6a1
Fix typo in ini
2014-12-01 10:15:56 -05:00
Robert Adams
db2a22e622
BulletSim: update BulletSim DLLs and SOs.
...
Hopefully fix problem of multiple physical meshes crashing Windows simulators.
2014-11-30 19:53:01 -08:00
BlueWall
981fff95cd
A little more cleaning of config files.
2014-11-30 15:09:13 -05:00
BlueWall
d0f9644417
A little bit of cleanup behind commit r5f88ceab2269
2014-11-30 14:57:47 -05:00
BlueWall
5f88ceab22
Set configuration files to use key expansion for widely used common settings.
2014-11-30 13:59:23 -05:00
Justin Clark-Casey (justincc)
e8ec1e6de5
minor: Make Robust.ini.example and Robust.HG.ini.example files consistent within themselves and OpenSim.ini.example by changing tabs to spaces, indenting, spacing.
2014-11-28 00:01:32 +00:00
Justin Clark-Casey (justincc)
59b38f842a
Add [Startup] JobEngineEnabled setting that allows the job engine to be disabled for testing purposes if necessary.
2014-11-25 23:23:11 +00:00
Justin Clark-Casey (justincc)
124be38f74
Add [BulletSim] option AvatarToAvatarCollisionsByDefault to control whether avatars collide. This is true by default.
...
This is implemented with a new collision type (PhantomToOthersAvatar) to potentially allow colliding and non-colliding avatars to be present in the same scene.
So there is no provision yet for giving avatars different collision types.
This commit replaces the temporary change in commit f3eaa6d8
where avatars would never collide when using BulletSim
This is equivalent to the av_av_collisions_off option in ODE.
2014-11-25 23:23:11 +00:00
justincc
aed4e96cf8
Update libomv to cedac55
...
This resolves an issue with pCampbot where some bots would occasionally connect with the same UDP source port.
This sometimes led to console messages where bots would report receiving packets multiple times that weren't marked as resends.
DLLs built under windows
2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
9b09dd3575
Add "wearables show" console command.
...
This shows summary wearables information (shape, hair, etc.) for all avatars in the scene or specific information about a given avatar's wearables.
Similar to the existing "attachments show" command.
2014-11-25 23:23:09 +00:00
Justin Clark-Casey (justincc)
a4209d2df4
small adjustment to commented out scene_throttle_max_bps and client_throttle_max_bps examples in OpenSimDefaults.ini
...
Make them actually reflect 20 mbit and 1.5 mbit respectively
2014-11-25 23:18:40 +00:00
Justin Clark-Casey (justincc)
c5cd93db81
Change help text for client_throttle_max_bps in OpenSimDefaults.ini to state it is in bytes, not bits
...
This is the same as already done for scene_throttle_max_bps
Internally, the token buckets are in bytes and the other help text makes it clear that the number is bytes per second
(though with the wrong assumption that 1 mbit = 1024 * 1024 bits whereas 1 mbit = 1000 kbits = 1000000 bits)
2014-11-25 23:18:40 +00:00
justincc
26606190e5
Update libomv to cedac55
...
This resolves an issue with pCampbot where some bots would occasionally connect with the same UDP source port.
This sometimes led to console messages where bots would report receiving packets multiple times that weren't marked as resends.
DLLs built under windows
2014-10-30 22:56:57 +00:00
justincc
c995b07818
Refresh OpenMetaverse libraries again at 0f4b361 but with Windows builds to see if this resolves some user problems.
2014-10-24 22:54:53 +01:00
Justin Clark-Casey (justincc)
afa85e6b3c
Set appearance refresh to false by default.
...
This setting was originally added some time ago to deal with issues where appearance was not received properly by all users.
However, it does not scale well with large numbers of agents.
Disabling to see if the original problem has abated or whether this will have to be tackled in another way.
2014-10-02 22:30:44 +01:00
BlueWall
1a24b7fa93
Fix key name in example Regions.ini file
2014-09-28 23:04:49 -04:00
Justin Clark-Casey (justincc)
530b0cbbf1
Move expired objects cleaning trigger to the maintenance thread of a region rather than it's main scene loop.
...
[Startup] default setting UpdateTempCleaningEveryNFrames becomes UpdateTempCleaningEveryNSeconds.
Default becomes 180s instead of effective 182s (which would also vary with any changes in frame time or extra long frames)
2014-09-27 00:23:52 +01:00
Roger Kirkman
36a1f1c70c
Add missing HGInventoryService responsible for creating My Suitcase to StandaloneHypergrid.ini
2014-09-26 23:08:04 +01:00
Justin Clark-Casey (justincc)
7852bae78f
Update libopenmetaverse to 0f4b361.
...
Primarily to get a small message logging improvement for pCampbot.
2014-09-24 23:44:51 +01:00
Jak Daniels
bde60cc92e
Add persistent command history in console
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-09-23 10:36:00 -04:00
Justin Clark-Casey (justincc)
8d177296ad
Reinsert OpenMetaverse.dll from commit fbdf507
from an accidental replace in f1f935e
...
This only affected pCampbot.
2014-09-22 22:22:09 +01:00
Robert Adams
47ac103df7
Merge branch 'master' into bullet-2.82
2014-09-03 21:21:01 -07:00
BlueWall
e19d1ecce8
Cleanup some unused code and configuration entries
2014-09-03 17:09:57 -04:00
BlueWall
3e5bc75f89
Remove the 32 bit launchers as discussed at OpenSimulator Office Hour 9//2/14 http://opensimulator.org/wiki/Chat_log_from_the_meeting_on_2014-09-02 . Find the binaries, sources and README in ./share/32BitLaunch if needed.
2014-09-03 13:00:09 -04:00
Justin Clark-Casey (justincc)
ac866a1c46
Add [EntityTransfer] AllowAvatarCrossing setting to determine whether avatars are allowed to cross regions at all.
...
Defaults to true. For test purposes.
2014-09-03 00:25:56 +01:00
Robert Adams
b3e423303f
Merge branch 'master' into bullet-2.82
2014-08-26 06:47:50 -07:00