84946e3061
Merge branch 'master' into httptests
2017-06-14 03:04:14 +01:00
e650a4ff16
remove excessive notion of paralelism
2017-06-13 08:56:21 +01:00
832ca518d7
fix merge
2017-05-03 03:52:55 +01:00
1bfe9354e3
coment out optional fields that should be edited and uncomented if needed
2017-05-02 15:45:54 +01:00
55f7986b44
fix some comments
2017-05-02 13:14:26 +01:00
add27a503e
Merge branch 'master' into httptests
2017-01-07 16:55:03 +00:00
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
6172446e2a
Merge branch 'master' into httptests
2017-01-06 01:09:42 +00:00
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
86cc02f33e
Merge branch 'master' into httptests
2016-12-23 02:53:58 +00:00
7367f03d6e
remove a odd raycastv3 config option
2016-12-21 20:39:38 +00:00
82fc8e1a36
Merge branch 'master' into httptests
2016-12-18 05:03:27 +00:00
30cd36ff98
leave stupid broken permissions alone
2016-12-18 03:56:53 +00:00
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
48efbeb8d3
set pbs shape acording to mesh number of (material) faces
2016-12-15 15:14:12 +00:00
94a36396b1
respective .ini settings
2016-12-15 00:09:21 +00:00
95ff859484
change a few ssl config comments
2016-12-07 20:33:38 +00:00
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
877d3092b4
Merge branch 'master' into httptests
2016-11-27 15:14:34 +00:00
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
ec8393571f
Merge branch 'master' into httptests
2016-11-16 13:07:23 +00:00
b6329fb784
mantis 8055: fix default value of npc options
2016-11-12 14:07:40 +00:00
c5d85b5465
reduce diferencs btw OpenSimDefaults.ini and OpenSim.ini.example
2016-11-11 16:04:20 +00:00
6218913345
add some configuration options missing in OpenSimDeafults.ini but present in OpenSim.ini.example
2016-11-08 11:22:08 +00:00
01a4a883e0
Merge branch 'master' into httptests
2016-11-03 14:01:35 +00:00
4b326f8691
fix some coments, thanks Austin Tate
2016-11-03 14:00:45 +00:00
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
2ce0673af2
Merge branch 'master' into httptests
2016-10-21 17:58:17 +01:00
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
6b0094645c
change some coments relative to ssl in config files
2016-10-10 20:14:02 +01:00
7aa4bd7006
add a comment about selfsigned certs
2016-10-09 01:15:53 +01:00
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
9843e3776e
Merge branch 'master' into httptests
2016-10-08 01:27:02 +01:00
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
878fac3fe3
fix comment telling the correct default physics engine
2016-10-01 20:26:37 +01:00
c631ffb943
remove region combine option (mega region) for config ini files
2016-08-21 06:49:16 +01:00
d701de4021
add cap GroupMemberData
2016-08-19 02:26:49 +01:00
4b73550eee
allow cap HomeLocation to be disabled setting Cap_HomeLocation = ""
2016-08-18 13:17:46 +01:00
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
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
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
6f13d1e3df
Remove "f" (float) type markers that may have crept in through copypasta.
2016-04-15 15:58:46 +02:00
41644bbfa9
Implement parameterization of HTTP_BODY_MAXLENGTH maximum as proposed in Mantis 7839.
2016-03-14 16:08:49 +01:00
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
8981cba137
update OpenSimDefaults.ini
2016-01-26 20:52:09 +00:00
e095f51b05
update the xmlrpcGroups http keep alive option, and coment
2015-12-19 15:29:51 +00:00
a5a31114b2
add the option to not display parcel ban lines
2015-12-16 22:22:26 +00:00
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
059a09a684
add LegacySitOffsets option to configuration file
2015-11-17 18:34:22 +00:00
f93ce485b1
Merge branch 'master' into avinationmerge
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
2015-11-16 15:28:51 +01:00
554d4bad8d
Fixed typos
2015-11-12 18:40:10 -08:00
a2a71f0951
configuration options relative to last tow commits
2015-11-13 02:18:12 +00:00
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
55b524aa74
fix: set Normalized55FPS default to TRUE
2015-11-09 15:37:57 +00:00
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
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
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
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
d44bb7d009
we do not have prims with size 2^128...
2015-10-21 01:39:32 +01:00
f6252e9037
also on OpenSimDefaults.ini
2015-10-21 01:13:41 +01:00
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
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
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
82ea4179da
Clean up viewer-based access control specifications.
2015-09-06 10:00:20 -07:00
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
965f94e30f
Add LogFile option in OpenSimDefaults.ini. It was omitted accidentally
2015-07-26 04:54:46 +02:00
897c7e1bda
Improve configuration description for llCastRay V3.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-06-01 13:09:21 -04:00
defc9c1d86
fix permmission issue on OpenSimDefaults.ini
2015-05-22 01:22:17 -04:00
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
7d26815d0e
Throttle llCastRay V3.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-22 01:21:18 -04:00
140ea04b9d
Merging Opensim upstream before generating patch
2015-05-19 15:18:45 -04:00
d348f87161
Patch llCastRay fully simplified to V3.
2015-05-12 15:40:42 -07:00
44b8b9fef6
Revert "Patch llCastRay fully-simplified to V2." for further review.
...
This reverts commit c96ee68953
2015-05-04 16:23:16 -04:00
c96ee68953
Patch llCastRay fully-simplified to V2.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-04 12:44:58 -04:00
df12fbb0d2
add new config parameters for llCastRay to OpenSimDefaults.ini
2015-05-04 00:32:22 -07:00
43b8bd0c35
Implement llCastRay fully, simplified.
2015-05-03 23:41:11 -07:00
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
0303112dcb
Added new [Statistics] config section to go with the previous patch.
2015-04-29 18:42:20 -07:00
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
263db44129
Implement llGetBoundingBox fully.
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-20 16:23:34 -04:00
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
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
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
14b3ee636d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-01-07 11:09:04 -08:00
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
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
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
0af02efaed
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-12-30 20:05:33 -08:00
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
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
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
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
2014-11-25 23:23:11 +00:00
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
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
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
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
bde60cc92e
Add persistent command history in console
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-09-23 10:36:00 -04:00
47ac103df7
Merge branch 'master' into bullet-2.82
2014-09-03 21:21:01 -07:00
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
28ef6f83fc
Fix typo in OpenSimDefaults.ini comment
2014-08-21 06:35:27 -07:00
UbitUmarov