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
BlueWall
aeadddf77a
Add back URL endings in examples
2014-08-25 20:29:46 -04:00
Robert Adams
28ef6f83fc
Fix typo in OpenSimDefaults.ini comment
2014-08-21 06:35:27 -07:00
Robert Adams
64cf75866e
BulletSim: Windows and Linux 32 and 64 bit versions of Bullet 2.82
2014-08-18 15:52:49 -07:00
Kevin Cozens
626536b8cc
Added RestrictEmail to make llEmail only send to avatars email address if true.
2014-08-14 02:40:06 -04:00
Justin Clark-Casey (justincc)
4c781db572
Make RootTerseUpdatePeriod and ChildTerseUpdatePeriod configurable in [InterestManagement] in OpenSim.ini for experimental purposes.
...
If n > 1 for RootTerseUpdatePeriod only every n terse update is actually sent to observers on same region, unless velocity is effectively zero (to stop av drift).
If n > 1 for ChildTerseUpdatePeriod only every n terse update is sent to observers in other regions, unless velocity is effectively zero.
Defaults are same as before (all packets are sent).
Tradeoff is reduction of UDP traffic vs fidelity of observed av mvmt.
Increasing n > 1 leads to jerky observed mvmt immediateley for root, though not on child, where experimentally have gone to n = 4 before jerkiness is noticeable.
2014-08-14 01:39:26 +01:00
Justin Clark-Casey (justincc)
f1f935ed95
Add 'server' stats information to pCampbot, as used elsewhere in OpenSimulator
...
This adds the "show stats", "stats record", etc. commands and information on available Threadpool threads, etc.
It also adds the Watchdog which logs warnings if time between executions is unexpectedly large.
2014-08-13 19:53:42 +01:00
Justin Clark-Casey (justincc)
fbdf507e98
Update libomv libraries with those built from commit 2208379.
...
This is to resolve some issues for pCampbot, chiefly with capability connection and inbound handling.
2014-08-12 01:53:48 +01:00
Justin Clark-Casey (justincc)
91f3be71e3
Reduce default rotation AgentUpdate output sensitivity to a setting that cuts down UDP traffic without obvious adverse effects on observed avatar rotations.
...
Experimentally, on the Linden Lab grid the avatar can rotate slightly before triggering AvatarUpdates, whereas this is practically impossible in OpenSimulator.
These updates allow other avatars to see rotations, though sensitivity is low since other avatars can only be seen in one of 8 body rotations.
This commit changes sensitivity from 0.01 to 0.1, which better matches LL and reduces UDP traffic which has a beneficial impact on network and CPU load.
This has no impact on rotations in the simulator itself so simulation fidelity is the same as before.
To change this setting back for test/other purposes, edit RootRotationUpdateTolerance in the [InterestManagement] section of OpenSim.ini
2014-08-08 23:39:40 +01:00
Justin Clark-Casey (justincc)
a483525016
Change default max threads if SmartThreadPool is used as the main thread pool from 15 to 300
...
Running out of such threads under heavy load causes delayed packet processing which can lead to spurious UDP resends and knock on issues.
We already massively boost the min/max builtin pool worker and IOCP threads (which even with STP are still used for inbound network requests) without obvious adverse effects.
The threads are only instantiated if they are required.
This change does not affect other async_call_method options.
2014-08-08 23:34:49 +01:00
BlueWall
10a8d2852e
OpenSimExtras
...
Move the experimental extra features functionality into the GridService. This sends default values for map, search and destination guide, plus ExportSupported control to the region on startup. Please watch http://opensimulator.org/wiki/SimulatorFeatures_Extras for changes and documentation.
2014-08-06 17:25:12 -04:00
Justin Clark-Casey (justincc)
78ccadb27e
Add RootPositionUpdateTolerance, RootRotationUpdateTolerance, and RootVelocityUpdateTolerance parameters to [InterestManagement] in OpenSimDefaults.ini
...
These govern when AgentUpdates are sent to observers on position, rotation and velocity changes to an avatar (including the avatar themselves).
Higher values reduce AgentUpdate traffic but at a certain level will degrade smoothness of avatar and perceived avatar movement.
2014-08-06 00:53:14 +01:00
BlueWall
cac910d401
Add region-side extra feature setting for destination guide
2014-07-31 08:20:06 -04:00
BlueWall
3ec695e05b
Add Chat module extra feature settings to GridExtraFeatures service
2014-07-30 15:01:26 -04:00
BlueWall
e0d8f42e6b
Simulator Extra Features Service
...
Provide a means for regions to fetch extra features supported by modern viewers from a central location
.
2014-07-30 11:24:39 -04:00
Michael Cerquoni
46781253c3
fix comments in physics section of [Startup] to reflect the actual default engine.
2014-07-25 12:30:09 -04:00
Justin Clark-Casey (justincc)
e85291329b
Add suppression of grid-side "show regions" command in simulator console for Hypergrid setups as well as normal grid.
...
Should have been done in recent commit 6048dfcd
Resolves http://opensimulator.org/mantis/view.php?id=7281
2014-07-25 02:02:07 +01:00
Justin Clark-Casey (justincc)
086bc6f748
Add missing default female hair texture for Ruth avatar.
...
This was not in library assets despite being referred to in assets/BodyPartsAssetSet/base_hair.dat
Texture ID is 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b
Taken from https://github.com/openmetaversefoundation/simiangrid/blob/master/Grid/default_assets/Default%20Female%20Hair-7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c
2014-07-24 20:03:19 +01:00
Oren Hurvitz
11031abf26
Changed the default XBakes directory to a local path: "./bakes".
...
Previously it was an absolute path. Now it's a sibling of the maptiles directory.
This fixes http://opensimulator.org/mantis/view.php?id=7063
2014-07-21 09:27:47 +01:00
Robert Adams
b81187db5a
Set "[Terrain]SendTerrainUpdatesByViewDistance=true" by default.
...
This, by default, enables terrain patches being sent to each avatar
from the avatar away (rather than the old outside-in pattern), only
sending terrain patches within the avatars view distance (making
view loading quicker), and sending multiple terrain patches per
protocol packet (making terrain loading and editing quicker).
2014-07-20 10:56:52 -07:00
Justin Clark-Casey (justincc)
6048dfcd71
In grid mode, add SuppressConsoleCommands flag to [GridService] so that we can stop misleading grid service only console commands from registering.
...
We need to do this because the simulator initializes and internal copy of the GridService in grid mode for internal purposes
2014-07-18 22:57:04 +01:00
Justin Clark-Casey (justincc)
8cd7ca568d
Change default script stop method to co-op instead of abort.
...
co-op should be more stable as it doesn't abort threads, which can trigger virtual machine instability
This change will be invisible to users as script DLLs are recompiled automatically where necessary, though the change won't take affect until the next simulator restart.
This change has no effect on existing script state.
If you want to continue using abort, set ScriptStopStrategy = abort in the [XEngine] section of OpenSim.ini
2014-07-16 22:58:38 +01:00
Justin Clark-Casey (justincc)
d62acc7e37
Update information in OpenSimDefaults to reflect the fact that ScriptStopStrategy in [XEngine] can now be changed without manually deleting old compiled scripts.
2014-07-14 20:53:06 +01:00
Diva Canto
ba233008cd
Changed GetUserInfo so that the exposure of user account details is ruled by a configuration variable. It's on by default.
2014-07-06 16:02:04 -07:00
Vegaslon
abf85b7f19
Bulletsim: Create AvatarTerminalVelocity to BulletSim like what ODE and SL has. Before this falling from really high caused the avatar to fall faster then the veiwer can handle and cause camera issues.
2014-06-27 23:34:34 +01:00
Robert Adams
7f0adfd203
Add [Startup]LogShowStatsSeconds=n parameter which controls the interval
...
that simulator statistics is output to the console. Setting to zero turns
stats logging off.
2014-06-13 21:27:07 -07:00
Robert Adams
8956cdc55f
Add [Terrain]SendTerrainUpdatesByViewDistance=false to OpenSimDefaults.ini
...
so people can find the setting.
2014-06-08 09:50:31 -07:00
Michael Cerquoni
0dc14b5f35
fix the comment section of max_distance setting to reflect default value
2014-06-06 22:29:04 -04:00
Diva Canto
74cda2ad78
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-06-06 14:51:05 -07:00
Diva Canto
2766b37d8b
Missed this ini change in previous commit
2014-06-06 14:50:38 -07:00
Michael Cerquoni
b913f1c8ab
bump default teleport limit to 65535 regions
2014-06-06 16:59:13 -04:00
Diva Canto
fe779128b0
Added simulation version compatibility check so that agents coming from 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer.
2014-06-06 11:04:53 -07:00
Diva Canto
90de9df3e8
Better comment regarding SizeX and SizeY
2014-06-05 20:31:31 -07:00
Diva Canto
30cde52634
Updated Regions.ini.example to include var regions configs.
2014-06-05 16:51:08 -07:00
Justin Clark-Casey (justincc)
464d31b70b
Stop appending redundant newline to console messages in Robust and pCampbot configs
...
This is to fix an issue since recent commit fbcb763
where these are no longer removed automatically.
OpenSim.*.config was already not appending these newlines
2014-05-27 20:44:00 +01:00
Diva Canto
20f20895cf
Adds optional HTTP Basic Authentication to Robust service connectors.
2014-05-23 16:19:43 -07:00
Justin Clark-Casey (justincc)
77a331fce3
Add DebugMessagingEnabled = false to OpenSim.ini.example for consistency. Slightly simplify config comments.
2014-05-19 23:00:04 +01:00
Justin Clark-Casey (justincc)
b46be88db6
Split verbose groups messaging logging into its own setting separate from that of the groups module.
...
This is to allow us to get useful information on messaging without being overwhelmed by the rest of groups debug.
Enabled with [Groups] DebugMessagingEnabled = true in config (default false)
Or "debug groups messaging verbose true|false on the console" (similar to existing groups setting).
Done for both xmlrpc and V2 groups.
2014-05-19 22:45:17 +01:00
Diva Canto
f4cba27105
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-07 17:00:12 -07:00
Justin Clark-Casey (justincc)
2b33677402
Add GridUserService service config to [UserAccountService] in Robust[.HG].ini.example so that home can be set for new users rather than always warning that it can't be set.
...
Code already exists to do this but forgot to put entry into config files a long time ago.
Thanks to AliciaRaven for the spot.
Relates to http://opensimulator.org/mantis/view.php?id=7155
2014-05-07 23:32:02 +01:00
Justin Clark-Casey (justincc)
812f5e124d
Remove duplicate HypergridLinker entry from [GridService] in Robust.HG.ini.example
2014-05-07 18:39:56 +01:00
Justin Clark-Casey (justincc)
539165e6bd
minor: Change configuration text in config files to reflect the existing situation of BulletSim as the default physics engine.
2014-05-06 17:28:21 +01:00
Diva Canto
13b2ac1425
Makes it possible to support grids in which all the simulators share all central services of a Robust server EXCEPT assets. In other words, grids where the simulators' assets are kept in one DB and the users' inventory assets
...
are kept on another. When users rez items from inventory or take objects from world, an HG-like asset copy takes place between the 2 servers, the world asset server and the user's asset server. This makes the simulators independent of the central asset server.
Note that this an advanced configuration and requires some security strengthening coming up.
2014-05-04 20:54:42 -07:00
Diva Canto
5a10da3ee8
Added a optional key between the group remote connectors, sim and service. This allows for more secure group services, to be used by collections of mutually-trusting grids.
2014-05-03 17:13:53 -07:00
Melanie
a108fcac95
Restore overload mode accidentally disabled in a prior commit. Add a new
...
config option, LogOverloads, to log when a thread pool overload occurs.
This option defaults to "True" because the logging data is useful for
diagnosing threading issues.
2014-04-25 21:34:29 +01:00
Oren Hurvitz
d1865c526d
Removed unused CsharpSqlite DLLs
2014-04-24 06:19:49 +01:00
Dev Random
18b91fdbe9
Tweak to PrimLimits and add missing Regions.ini example
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-04-12 14:40:34 +01:00
Robert Adams
562a3cb338
BulletSim: small tweek to avatar height reduce feet embedded into prims.
...
This adjustment makes a default, shoeless avatar stand properly on a prim
for the various heights (0% to 100% in the appearance adjustment).
2014-04-10 06:53:36 -07:00
Robert Adams
65c4cb48ac
BulletSim: make avatar physical shape to be a rectangle rather than
...
a capsule. Set the default to be the rectangle shape and adjust the
parameters in OpenSimDefaults.ini for the new shape.
The rectangle shape will perform better and avatar height can be
computed more accurately.
2014-04-02 21:53:58 -07:00
BlueWall
a15282f023
Merge branch 'master' into m_test
2014-03-27 12:21:38 -04:00
Justin Clark-Casey (justincc)
af54e6f370
minor: Change incorrect "Maximum" in the PhysicalPrimMin OpenSim.ini.example description to "Minimum"
...
Thanks to aiaustin for the spot.
2014-03-26 23:45:02 +00:00
Justin Clark-Casey (justincc)
e7fa8a4699
minor: change misspelling of overriden to overridden in comments within config files
...
Thanks to aiaustin for the spot.
2014-03-26 23:43:49 +00:00
Oren Hurvitz
14a7ddb885
Revert "Use log-rolling on the log files (once per day)"
...
This reverts commit 8ecab21b37
.
2014-03-26 08:56:56 +02:00
Justin Clark-Casey (justincc)
cffea984f1
minor: Remove "js" (Javascript) from list of allowed languages in script config since it hasn't been present in OpenSimulator for a very long time (0.6 days)
...
One reason support was removed is that the external DLL that implemented Javascript stopped development.
Not sure how well this ever worked in OpenSimulator.
Not removing vb for now as this is directly supported by Mono (via vbnc compiler) though I strongly suspect it is also inoperable.
2014-03-26 00:50:33 +00:00
BlueWall
fce3fca7f9
Add the UserProfiles local service module to non-HG Standalone configuration.
2014-03-25 11:08:58 -04:00
Oren Hurvitz
8ecab21b37
Use log-rolling on the log files (once per day)
...
Resolves http://opensimulator.org/mantis/view.php?id=6950
2014-03-25 09:53:02 +01:00
Oren Hurvitz
5b2af7f99e
Moved the linkage between LoginService and HGInventoryService to the config file
2014-03-24 18:33:18 +02:00
Oren Hurvitz
f5ae36d7e2
Updated Prebuild to support .NET 4.5
...
Resolves http://opensimulator.org/mantis/view.php?id=6951
2014-03-24 12:26:54 +01:00
Oren Hurvitz
81c9952e99
Added missing quotes in Robust.HG.ini.example
2014-03-23 16:40:09 +02:00
Dev Random
3d0778bcd6
Allow Mono Plugin Registry setting for Regions
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-03-22 01:29:51 +00:00
H-H-H
da25903300
Adding a way to disable/enable the in built Dwell Module
2014-03-20 22:35:50 +00:00
Michael Cerquoni
b5f94c72b9
Allow MaptileStaticFile path to be set to anywhere and not force it to bin/maptiles
2014-03-19 11:16:52 -04:00
Jak Daniels
61353dde80
Allow Region specific static maptiles to be loaded from file.
2014-03-18 22:18:50 -07:00
Justin Clark-Casey (justincc)
fdcd392582
Set executable bit on Npgsql.dll for cygwin
2014-03-18 21:04:37 +00:00
Justin Clark-Casey (justincc)
f27766d47b
Set executable flag on BulletXNA.dll for cygwin
2014-03-18 21:02:51 +00:00
Lani Global
71c808cd32
PhysicalPrimMax 64m for OpenSim_ini_example standard size prim
...
Signed-off-by: Robert Adams <misterblue@misterblue.com>
2014-03-10 22:11:24 -07:00
Lani Global
3e8f593bf2
PhysicalPrimMax to 64m for ini Default files to enable standard size prims and mesh to be used with vehicles.
...
Signed-off-by: Robert Adams <misterblue@misterblue.com>
2014-03-10 22:11:09 -07:00
Michael Cerquoni
4f67286044
fix missing quote for xBakes connector in Robust example ini files
2014-03-09 19:09:10 -04:00
Michael Cerquoni
cfd3e8f0ea
minor spelling mistake fix.
2014-03-09 11:46:25 -04:00
Michael Cerquoni
abcb2cdb36
add XBakes connector to Robust.HG.ini.example
2014-03-08 21:50:41 -05:00
Michael Cerquoni
a96601478c
add [BakedTextureService] section to Robust.HG.ini.example file same as Robust.ini.example.
2014-03-08 21:48:33 -05:00
Michael Cerquoni
e3c4936dea
remove RefreshTime = 0 from [MapImageService] in Standalone.ini, StandaloneHypergrid.ini, Grid.ini, GridHypergrid.ini they were redundant and would not allow variables in OpenSim.ini to be set to anything.
2014-03-08 16:28:45 -05:00
Michael Cerquoni
da990d01f2
set RefreshTime = 0 in [MapImageService] in Standalone.ini and StandaloneHypergrid.ini to eliminate memory leaking for Warp3D map tiler, these variables should be erased needs more discussion!
2014-03-08 15:57:19 -05:00
Michael Cerquoni
12f2648a57
set RefreshTime = 0 in [MapImageService] in Grid.ini and GridHypergrid.ini to eliminate memory leaking for Warp3D map tiler, these variables should be erased needs more discussion!
2014-03-08 15:41:26 -05:00
dahlia
d6837f5dc7
update libomv to 59280cfe3e96714151158f4ec7b167af57f60e93 (current head) to hopefully resolve zlib incompatibilities when rendering maptiles with mesh
2014-02-22 18:52:59 -08:00
Melanie
1aed6567a8
Samle configurations for the baked texture server.
2014-02-04 02:49:13 +00:00
Robert Adams
0842e2e15b
BulletSim: default physical terrain implementation to heightmap.
...
It originally looked like mesh terrain would perform better for vehicles
but, after much use, heightmap is the clear winner.
Force terrain implementation to heightmap if the physics region is
larger than legacy region size. This solves running out of memory for
very large regions.
2014-01-29 06:44:14 -08:00
Melanie
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
Melanie
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
Robert Adams
4c362a83f9
Merge branch 'master' into varregion
2014-01-21 11:31:51 -08:00
Mic Bowman
83626e60e6
Adds a configuration option to cannibalize bandwidth from the
...
udp texture throttle and move it to the task throttle. Since most
viewers are using http textures, the udp texture throttle is holding
onto bw that could be used for more responsive prims updates. See
the documentation for CannibalizeTextureRate in OpenSimDefaults.ini.
Option is disabled by default.
2014-01-20 18:59:43 -08:00
dahlia
4800303abd
update OpenMetaverse.StructuredData to git master (bf4e9f654ff99c85e20b53e56faac38e307dd8c2) which fixes JSON OSD serialization to a standards compliant means of encoding floating point NaN and Infinity
2014-01-20 03:18:36 -08:00
Oren Hurvitz
3018b2c5d7
Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default
...
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
2014-01-20 00:38:42 -08:00
Robert Adams
54a4b9eab4
varregion: Update Warp3D to properly handle varregions.
...
This includes additions to Warp3D:
Optional rendering of mesh and scupltie prims (INI parameter. Off by default)
Texturing of large prims (INI parameter. On by default)
Better garbage collection
2014-01-19 07:33:56 -08:00
Justin Clark-Casey (justincc)
70dd4cf152
In library inventory, correct asset id for llSay example script
...
From http://opensimulator.org/mantis/view.php?id=6917
Thanks to FreakyTech for this spot.
2014-01-10 20:51:28 +00:00
Melanie
6d6b9ab791
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-07 01:08:49 +00:00
Justin Clark-Casey (justincc)
13017034b1
minor: Change ProfileServiceURL reference in OpenSim.ini.example to be consistent
2013-11-28 00:23:27 +00:00
Melanie
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
8217b52d3a
Remove old *.exe.config files that related to programs that have long been deleted or renamed
2013-11-23 01:40:48 +00:00
Justin Clark-Casey (justincc)
bd5c414618
Stop .NET 4 complaining on Windows when it tries to load in DLLs that haven't been marked as trusted in the operating system.
...
This is done by adding <loadFromRemoteSources enabled="true" /> to the execute *.config files.
This tells .NET 4 to trust the DLLs, which is safe in our case since we are not loading DLLs from locations that untrusted users may specify
Addresses http://opensimulator.org/mantis/view.php?id=6853 and http://opensimulator.org/mantis/view.php?id=6846
As far as I know, CAS policy checks have never been performed in Mono
2013-11-23 01:29:55 +00:00
dahlia
f63fd81a68
update libomv to 1538d3088e79ff0a9abea6905b487755b6890a85 in hope that it fixes some bulletsim issues on linux
2013-11-15 14:40:38 -08:00
justincc
869a23e223
Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions.
...
Also fixes some issues in associated solution files
2013-11-13 01:07:14 +00:00
Melanie
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
Justin Clark-Casey (justincc)
626a050159
minor: Make PID file example in Robust.HG.ini more meaningful as is now the case in OpenSim and vanilla ROBUST config files
2013-11-08 00:34:35 +00:00
dahlia
3b2721c957
update OpenMetaverse.dll to 7ae74674a09877119cbb4c80cbffea474e20da29
...
- addresses particle flags issue
2013-11-06 19:13:41 -08:00
Justin Clark-Casey (justincc)
52ff860f30
minor: Make PID file examples in OpenSim and Robust config somewhat more meaningful than just /tmp/my.pid
2013-11-06 23:27:19 +00:00
dahlia
e1ce3907f2
Update libomv to 7e260ad419ebb1c24a5f1b123e11dd930e05f414. Thanks lkalif :)
2013-11-05 23:01:14 -08:00
Latif Khalifa
417836ac5e
Updated libomv to 25ee208a 2013-11-05
2013-11-06 02:43:44 +01:00
Melanie
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
dahlia
46a4c32e27
update libomv to 5b4c1e8694479629f7cacd72dd6bc39a6b327f9c (git master as of time of this commit)
2013-10-30 22:01:34 -07:00
Robert Adams
d23ef79f98
BulletSim: restore collision flags when clear collision cache.
...
THis fixes the extranious addition of objects to the collision cache
which created extra CPU overhead.
2013-10-26 21:30:51 -07:00
Justin Clark-Casey (justincc)
5be8f6632b
minor: Fix commented out GridInfo service URL to be 8002 in Robust.ini.example rather than 9000 (already done in Robust.HG.ini.example)
2013-10-25 00:54:33 +01:00
Robert Adams
a7e7bed660
BulletSim: update SOs and DLLs with version that enables compressed
...
AABB maps for Bvh meshes. This greatly reduces the memory usage for
large meshes and for mesh terrain in particular.
2013-10-19 11:44:27 -07:00
Robert Adams
571a75f934
BulletSim: update lib32/libBulletSim.dylib to current BulletSim C++ API.
2013-10-18 09:15:08 -07:00
Justin Clark-Casey (justincc)
1bd89ac287
Readding Mono.Security.dll. This comes from http://pgfoundry.org/frs/download.php/3354/Npgsql2.0.12.0-bin-ms.net3.5sp1.zip
...
This is identical to what was previously there but need to record origin information
2013-10-17 22:31:15 +01:00
Justin Clark-Casey (justincc)
6221356712
Removing Mono.Security.dll temporarily so that it can be re-added with origin information
2013-10-17 22:28:58 +01:00
Fernando Oliveira
8fdf70b87e
* Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - Mono.Security.dll missing. The root of the issue is that the Postgres driver relies on Mono.Security.dll from the mono project. Unfortunately, when using Mono, including the dll in the distribution causes conflicts. This solution puts Mono.Security.dll in bin/lib/NET/ and, if windows .NET is the runtime, informs the assembly loader to load bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security namespace. On Mono, the included Mono.Security assembly is ignored.
2013-10-16 20:16:29 -05:00
Justin Clark-Casey (justincc)
acfe603a5f
As discussed on many previous occasions, switch the default physics engine in OpenSimulator from OpenDynamicsEngine to BulletSim.
...
The BulletSim plugin is higher performance and has a better implementation of vehicles amongst other things.
Many thanks to Robert Adams for making this possible with the enormous amount of work that he has done on this plugin.
If you want to continue using ODE, set physics = OpenDynamicsEngine in the [Startup] section of OpenSim.ini
2013-10-15 23:24:49 +01:00
Justin Clark-Casey (justincc)
a27c2432bb
This is Npgsql2.0.12.0-bin-ms-net3.5sp1
...
From http://pgfoundry.org/frs/download.php/3354/Npgsql2.0.12.0-bin-ms.net3.5sp1.zip
This is identical to the version added in ff8a7682
, removed and readded to check and record version
2013-10-14 23:59:49 +01:00
Justin Clark-Casey (justincc)
dbdcf2d995
Remove to re-add with version information for future reference
2013-10-14 23:58:12 +01:00
Michael Cerquoni
daf44cc65e
fix missing " for variable SRV_IMServerURI in example file
2013-10-12 20:47:10 -04:00
Fernando Oliveira
ff8a768258
Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.
...
* Added PostGreSQL support
* Added MySQL/MySQLXGroupData.cs
* PostgreSQL data access implementation
* PostgreSQL dll binarie and RegionStore.migrations
* Migrations Scripts from MSSQL to POSTGRES
* Postgres SQL Type fixes
* Postgres SQL Connection string
* Data type issues
* more fixes
* tests and +tests
* UUID x string - FIGHT!
* Fixed PG types to internal csharp types
* More data type fix (PostgreSQL fields are case sensitive) :(
* more field case sensitive fixes
* changed the migration files to be case sensitive for fields.
* fixed fields case
* finished converting, now search for hidden bugs.
* some more fixes
* bool type fixed
* more case fixes;
* creatorID case fixed
* case fields fixed
* fixed default now() for TMStamp fields with don't allow nulls.
* fix case sensitve for Region name and Estate name
* fixed case for names for search
* fix class name Error
* Bug fixed on select and migrations
* Un-Reverting my change due to Postgres issue with the ILIKE function
* Fixed some issued for Diva Distro
* Fixes for integration with Diva Distro
* Added System.Core to prebuild.xml for PG project
* Configured to make DIff for Push to OpenSim Project
* Diffs only to PostgreSQL mods.
2013-10-12 16:33:45 -05:00
teravus
f76cc6036e
* Added a Basic DOS protection container/base object for the most common HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler
...
* Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice.
* Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers
* Added CircularBuffer, used for CPU and Memory friendly rate monitoring.
* DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
2013-10-07 21:35:55 -05:00
Melanie
75c68fa29e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
Justin Clark-Casey (justincc)
585d0800dd
minor: Make OpenSimDefaults.ini consistent (spacing and tabs to spaces)
2013-09-27 00:14:40 +01:00
Justin Clark-Casey (justincc)
70b51f12cd
minor: Clean up tabbing and spacing issues in OpenSim.ini.example
2013-09-27 00:01:18 +01:00
Justin Clark-Casey (justincc)
979b17165b
For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 teleport protocol even if SIMULATION/0.2 is available.
...
This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details.
Default remains "SIMULATION/0.2"
Primarily for http://opensimulator.org/mantis/view.php?id=6755
2013-09-19 22:45:50 +01:00
Justin Clark-Casey (justincc)
997700c4aa
minor: Make config-include .ini files more consistent
...
Chiefly tabs to spaces.
No actual setting changes
2013-09-18 23:49:27 +01:00
Justin Clark-Casey (justincc)
ac0a527976
Add [SimulationService] section to GridHypergrid.ini and StandaloneHypergrid.ini
...
This was already in Grid.ini and Standalone.ini
Default settings are same as previously, just introduce a debug ConnectorProtocolVersion parameter
2013-09-18 23:27:37 +01:00
Justin Clark-Casey (justincc)
53de6d94ea
minor: replace spaces with tabs for see_into_region setting
2013-09-12 23:38:50 +01:00
Robert Adams
2d7adcb22f
BulletSim: update DLLs and SOs to disable Bullet's internal profiling.
...
This was accidentily left on. This version should make performance better
and fix the memory leak.
2013-09-12 13:07:18 -07:00
BlueWall
3c85afbb43
Allow setting the EntityTransfer-max_distance to 0 to override distance checks. This is to facilitate current viewer work fixing the distance limitations for teleporting.
2013-09-12 11:46:12 -04:00
Robert Adams
8bcf753127
BulletSim: update DLLs and SOs with ClearCollisionCache inteface calls
...
and constraint debugging messages.
2013-09-11 09:12:26 -07:00
Robert Adams
e34385634b
BulletSim: update DLLs and SOs for spring parameters and constraint
...
debugging dump code.
2013-09-11 09:12:22 -07:00
Robert Adams
8755aeb348
BulletSim: update DLLs and SOs with Bullet svn version 2644 (no major fixes) and with BulletSim implementing more of the constraint types and parameter settings.
2013-09-11 09:11:56 -07:00
Michael Cerquoni
663059ac5c
chaning the default max_distance to 16383 as we actually start counting at zero, thank you dahlia for pointing this out.
2013-09-10 19:56:39 -04:00
Michael Cerquoni
ec5f17b2ce
This extends the default max_distance for teleports to 16384, a big thank you to all of the viewer devs who made this possibe!
2013-09-10 18:35:02 -04:00
Melanie
2f365ea80b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-09-07 13:54:19 +01:00
Justin Clark-Casey (justincc)
b858be345a
minor: add doc about DefaultHGRegion and some of the other GridService region settings (though not all as of yet)
2013-09-05 00:41:03 +01:00
Justin Clark-Casey (justincc)
4cbadc3c49
Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins.
...
This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators.
This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified
then existing configured defaults will still work.
Immediate use is for conference where we need to be able to specify different defaults
However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
2013-09-02 17:27:45 +01:00
Melanie
008c98a974
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-09-01 22:49:31 +01:00
Justin Clark-Casey (justincc)
85824d2cd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-25 20:12:59 +01:00
Diva Canto
5cd7bc2848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-24 03:42:39 -07:00
Diva Canto
6a24515269
Whitespace fubar.
2013-08-24 03:40:44 -07:00
Justin Clark-Casey (justincc)
1a623bb266
Rename pCampbot.ini -> pCampBot.ini (and example file) to be consistent with other capitalizations of pCampBot
2013-08-23 20:58:46 +01:00
Justin Clark-Casey (justincc)
70f89ae65b
Make it possible to adjust the pCampbot login delay via the [BotManager] LoginDelay parameter of pCampbot.ini
2013-08-22 23:43:33 +01:00
teravus
a6af561660
* Fix some threading issues in BulletXNA (the managed bullet library), this should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs.
...
* Fixed a null ref during shutdown.
2013-08-20 21:09:17 -05:00
Melanie
df7a1e68f6
Merge branch 'master' into careminster
2013-08-14 21:25:22 +01:00
Justin Clark-Casey (justincc)
225cf0d010
Add pCampbot RequestObjectTextures ini setting to control whether textures are requested for received objects.
2013-08-14 19:53:10 +01:00
Justin Clark-Casey (justincc)
5933f9448d
Add a SendAgentUpdates setting to a new pCampbot.ini.example file which can control whether bots send agent updates
...
pCampbot.ini.example is used by copying to pCampbot.ini, like other ini files
2013-08-13 23:54:50 +01:00
Melanie
ad1b2902f2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-08-11 17:31:25 +01:00
Robert Adams
d9bd6e6b5b
Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini.
...
Add 'callback' query parameter to managed stats return to return function
form of JSON data.
2013-08-08 09:45:30 -07:00
Melanie
005c69511d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-08-07 23:29:42 +01:00
Diva Canto
dbd773e89e
Amend to last commit -- remove the obsolete var from OpenSim.ini.example
2013-08-07 10:04:53 -07:00
Justin Clark-Casey (justincc)
4c2f6de8e4
Add the experimental ability to dump stats (result of command "show stats all") to file OpenSimStats.log every 5 seconds.
...
This can currently only be activated with the console command "debug stats record start".
Off by default.
Records to file OpenSimStats.log for simulator and RobustStats.log for ROBUST
2013-08-06 18:29:33 +01:00
Justin Clark-Casey (justincc)
54b1071556
Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be manually forced in a new [SimulationService] config setting.
...
This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not
"SIMULATION/0.2" (the newer teleport protocol) remains the default. If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol.
Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
2013-08-02 23:12:54 +01:00
Justin Clark-Casey (justincc)
c9695a0a59
Move experimental attachments throttling further down the chain so that multiple attachments changes (e.g. change outfit) are also throttled
2013-08-02 00:00:00 +01:00
Melanie
6fc03c7e6e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-08-01 23:42:19 +01:00
Justin Clark-Casey (justincc)
216e785ca9
Add experimental "debug attachments throttle <ms>" setting (command line) and ThrottlePer100PrimsRezzed in [Attachments] in config
...
This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously.
It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in.
Default is 0 (no throttling).
"debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable.
Also adds "debug attachments status" command to show current throttle and debug logging levels.
2013-08-01 21:16:53 +01:00
Melanie
21f5e67030
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
2013-08-01 01:23:24 +01:00
Mic Bowman
d82126b651
Add the Simian service config to the GridCommon example
2013-07-31 11:42:22 -07:00
Melanie
bf283208df
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
Diva Canto
7b0b5c9d97
Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
2013-07-28 13:49:58 -07:00
Diva Canto
9cbbb7eddf
Clarification on docs of .ini.examples for Groups (again)
2013-07-27 19:16:48 -07:00
Diva Canto
1572e91b5f
Clarifications on documentation of Group configs
2013-07-27 08:04:48 -07:00
Melanie
7914eaa357
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSimDefaults.ini
2013-07-25 16:55:23 +01:00
Diva Canto
e103e34f1d
Added config var that we all thought was already there: see_into_region. (Note: different from the defunct see_into_neighboring_sim, which used to control the process from the other end). This enables child agents in neighbors for which the root agent doesn't have permission to be in.
2013-07-24 11:25:41 -07:00
Melanie
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
Melanie
7830cc9954
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
Diva Canto
9432f3c94d
Improvements to the ServiceThrottleModule: added a category and an itemid to the interface, so that duplicate requests aren't enqueued more than once.
2013-07-16 19:04:30 -07:00
Diva Canto
d48946f9ef
Document obscure Groups config related to the user level required for creating groups
2013-07-14 16:51:07 -07:00
Robert Adams
a65cec3986
BulletSim: implementation of linkset center-of-mass.
...
Default off, for the moment, until more testing.
Add separate thread and center-of-mass flags to OpenSimDefaults.ini.
Clean up comments in OpenSimDefaults.ini.
2013-07-06 08:25:15 -07:00
BlueWall
f2f33b7577
Some consistency fixes for the ini to stop parser breakage
2013-07-04 17:45:17 -04:00
Melanie
ffcee82b1d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2013-06-30 18:27:30 +01:00
Justin Clark-Casey (justincc)
4406f07a84
Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars.
...
This makes stars appear more realistically rather than as massive chunks due to the missing IMG_BLOOM1 asset from the viewer.
Thanks to YoshikoFazuku for supplying the star asset which I then uploaded via a viewer and extracted as JPEG2000.
Thanks also to Ai Austin for helping this process along.
See http://opensimulator.org/mantis/view.php?id=6691 for more details.
2013-06-28 23:34:16 +01:00
Melanie
56f4adeb60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00
BlueWall
b2c8d5eec7
Add Option: ClassifiedFee
...
Add option to set minimum fee for publishing classifieds. Many viewers have a
hard coded minimum of 50, which makes publishing classifieds fail where grids
have no economy. This allows the grid to set the minimum fee to a suitable
value for their operation.
The option is located in the [LoginService] section and defaults to 0. The
value is sent as "classified_fee" in the login response.
2013-06-13 09:18:27 -04:00
BlueWall
9fec0faade
Revert "Add option to set minimum fee for classified ads"
...
This reverts commit 90097de6c3
.
2013-06-11 21:46:40 -04:00
BlueWall
90097de6c3
Add option to set minimum fee for classified ads
...
Upcoming phoenix-firestorm (4.4.1) adds a configurable option for setting
the minimum price for publishing a classified ad.
http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/43415d69b048
2013-06-11 20:35:25 -04:00
Melanie
fe4a67efb6
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
Melanie
02548bdc16
Update HTTP server
2013-06-04 21:11:16 +01:00
Melanie
648e258b8e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
Diva Canto
43d804b998
New HttpServer_OpenSim.dll with increased limits on number of connections, requests, etc.
2013-06-04 12:27:22 -07:00
BlueWall
ba2f13db63
Adding back the BasicProfileModule
2013-05-31 21:19:15 -04:00
Robert Adams
924a5df25f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-30 19:20:36 -07:00
Robert Adams
3aa2fb9928
BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini and
...
replace with things someone might actually want to tune (avatar height, ...).
2013-05-30 19:16:29 -07:00
BlueWall
328883700a
UserProfiles
...
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
2013-05-30 17:59:18 -04:00
Melanie
669fa3ff9a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2013-05-30 21:48:09 +01:00
Robert Adams
0c35d28933
BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs
...
which recompute GImpact shape bounding box after creation as Bullet
doesn't do that itself (something it does for nearly every other shape).
Now, physical prims without cuts become single mesh convex meshes. Physical
prims with cuts become GImpact meshes. Meshes become a set of convex
hulls approximated from the mesh unless the hulls are specified in the
mesh asset data. The use of GImpact shapes should make some mechanical
physics more stable.
2013-05-26 17:35:12 -07:00
Melanie
09c2cd0d76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-05-24 00:45:08 +01:00
Robert Adams
10097f13aa
BulletSim: update DLLs and SOs with version containing gImpact code.
2013-05-21 21:40:26 -07:00
Melanie
42c82b564e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2013-05-16 21:59:14 +01:00
Latif Khalifa
71a5cc2041
Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686b
2013-05-16 00:07:55 +02:00
Latif Khalifa
12289c4fd1
Removed obsolete libopenmetaverse file
2013-05-16 00:02:28 +02:00
Melanie
13cd8c17d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2013-05-11 02:35:26 +01:00
BlueWall
182ea00cb3
Application support:
...
Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
2013-05-09 10:50:18 -04:00
Melanie
cdaceea5a6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-05-08 21:51:48 +01:00
Mic Bowman
33aaa40bee
Adds an event and a method so that handling of the CachedTexture
...
packet can be pulled out of LLClientView and moved to
AvatarFactory. The first pass at reusing textures (turned off by
default) is included. When reusing textures, if the baked textures
from a previous login are still in the asset service (which generally
means that they are in the simulator's cache) then the avatar will not
need to rebake. This is both a performance improvement (specifically
that an avatars baked textures do not need to be sent to other users
who have the old textures cached) and a resource improvement (don't
have to deal with duplicate bakes in the asset service cache).
2013-05-08 13:13:51 -07:00
Melanie
bda4565067
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2013-05-08 20:59:44 +01:00
Diva Canto
601aa91163
Delete "" entry for AvatarPicker cap.
2013-05-07 19:16:42 -07:00
Diva Canto
e92c05ebbd
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
Melanie
3aa83738e2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-05-04 01:22:12 +01:00
BlueWall
4cb73192a7
Make default config directory "."
2013-05-01 23:01:33 -04:00
Melanie
8c5445b774
Merge branch 'master' into careminster
...
Conflicts:
ThirdParty/SmartThreadPool/SmartThreadPool.cs
2013-05-01 21:39:49 +01:00
Justin Clark-Casey (justincc)
8d3250cee4
Add information about creating a PID file for robust to the Robust.ini and Robust.HG.ini example files
2013-05-01 19:15:05 +01:00
Melanie
d36a52ea55
Merge branch 'master' into careminster
2013-04-25 00:22:28 +01:00
Robert Adams
1593d795ea
BulletSim: version of libBulletSim.so for 32 bit systems that doesn't
...
crash on startup. Doesn't yet solve the new glibcxx dependencies.
2013-04-24 15:01:11 -07:00
Robert Adams
e324f6f3f0
BulletSim: update DLLs and SOs to they have no dependencies on newer
...
glibc (2.14) since that is not yet in some Linux distributions.
Add unmanaged API calls and code for creating single convex hull shapes.
2013-04-24 08:03:45 -07:00
dahlia
ed22014646
revert CSJ2K.dll to version in use prior to commit d4fa2c69ed
2013-04-23 15:01:20 -07:00
Melanie
8b57ee4fd1
Merge branch 'master' into careminster
2013-04-22 22:38:58 +01:00
Melanie
3e818eaeb5
Add the enter uuid dialog
2013-04-22 22:58:33 +02:00
Melanie
671a97ef76
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-04-22 22:28:41 +02:00
Melanie
a7a92e7339
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-04-22 22:26:04 +02:00
Melanie
4aa6f2bbba
Add the set object owner floater template
2013-04-22 22:23:42 +02:00
Diva Canto
6ddc39a676
Clean up unused config and config comments.
2013-04-21 16:56:18 -07:00
Melanie
231c298ca5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
bin/OpenMetaverse.StructuredData.XML
bin/OpenMetaverse.XML
bin/OpenMetaverseTypes.XML
2013-04-21 14:11:39 +01:00
BlueWall
855c88a9c0
Fix spelling
2013-04-20 11:57:11 -04:00
dahlia
d4fa2c69ed
update libomv to git master which adds support for MaterialID in TextureEntry
2013-04-17 21:31:18 -07:00
Melanie
7cf377fff0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-04-10 13:20:55 +01:00
Robert Adams
59135c9a31
BulletSim: add Bullet HACD library invocation. Turned off by default as not
...
totally debugged. Updated DLLs and SOs with more debugged HACD library code.
2013-04-09 18:00:23 -07:00
Justin Clark-Casey (justincc)
659c741ff5
Add more notes to async_call_method relating to UnsafeQueueUserWorkItem
...
UnsafeQueueUserWorkItem is so called because it allows the calling code to escalate its security privileges.
However, since we must already trust this code anyway in OpenSimulator this is not an issue.
2013-04-09 23:15:01 +01:00
Robert Adams
4d2203ff52
BulletSim: Add dylib for BulletSim and add he who figured out building BulletSim
...
on a Mac to the CONTRIBUTORS file.
2013-04-08 09:15:20 -07:00
Jon Cundill
f68b963596
fixed bullet config for osx
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-04-08 09:09:30 -07:00
Melanie
41a652f6bd
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-04-02 23:47:19 +01:00
Robert Adams
17aef1c883
BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD
...
mesh to hull conversion calls in place but code not working. Update
BulletSim DLLs and SOs for new API and HACD code.
2013-04-01 18:03:11 -07:00
Melanie
5b950ca36a
Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster
2013-03-19 00:54:23 +00:00
teravus
6e1b3f9951
*Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
2013-03-16 03:14:11 -04:00
Melanie
8b657773e4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2013-03-14 22:34:15 +00:00
teravus
9fad90a914
Merge branch 'master' of ssh://opensim/var/git/opensim
2013-03-14 00:58:00 -04:00
teravus
42c533c589
* Updates HttpServer again to re-add the code that closes the stream and connection when It's done sending. Be on the lookout for an old linux/mono bug where the client doesn't get the last bit of the stream before it is disconnected!. Code on opensim-libs. All tests pass.. HttpServer's internal tests pass.. but just a bad feeling. More people should test :)
2013-03-14 00:57:42 -04:00
Melanie
710381e838
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
2013-03-13 02:02:46 +00:00
Justin Clark-Casey (justincc)
fb1211ad5e
Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section of OpenSim.ini. False by default.
...
This option allows the simulator to specify that the cancel button on inter-region teleports should never appear.
This exists because sometimes cancellation will result in a stuck avatar requiring relog.
It may be hard to prevent this due to the protocol design (the LL grid has the same issue)
In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
2013-03-12 23:01:27 +00:00
Melanie
1e7c7fb779
Merge branch 'master' into careminster
2013-03-11 19:09:49 +00:00
Robert Adams
13f3bcae94
Update comment about setting physics=BulletSimN as the C# Bullet
...
version has been wrapped into one BulletSim and the physics engine
selection is now done as specified in OpenSimDefaults.ini.
2013-03-10 22:24:34 -07:00
Melanie
70f0587558
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-08 01:07:05 +00:00
Diva Canto
2f1aa87eb5
One more comment inconsistency fixed.
2013-03-07 08:02:48 -08:00
Diva Canto
fdebee25db
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-07 06:41:03 -08:00
Diva Canto
2b0056eaca
Fixed inconsistency in comments. Thanks Ai Austin.
2013-03-07 06:40:39 -08:00
Melanie
81552f41c6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-05 23:57:53 +00:00
teravus
7556b42d7a
* Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9
...
* Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter.. which adds up the Length property all of the blocks.
2013-03-04 21:26:26 -05:00
Diva Canto
aadf7d32d1
GridUserService was missing from [Gatekeeper]
2013-03-04 12:52:28 -08:00
Robert Adams
b47ffb5dc4
Added existance and default value for [XEngine]MinTimerInterval to OpenSimDefaults.ini
2013-03-02 13:02:02 -08:00
Justin Clark-Casey (justincc)
1bc8692a99
Move AllowedClients and BannedClients section to new [AccessControl] section in OpenSim.ini from [Startup]
...
This change also corrects the setting names - they were actually wrong (though the text in {} was correct).
If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
2013-03-02 01:43:54 +00:00
Justin Clark-Casey (justincc)
4999d7920a
Revert "Removed more vars from [Startup]. I think these were already moved elsewhere, because I can't find any reference to them in the code."
...
This reverts commit efa7227865
.
2013-03-02 01:23:01 +00:00
Melanie
a675f7d4c3
Merge branch 'master' into careminster
2013-03-01 23:54:00 +00:00
Diva Canto
20530ee667
Moved permissions config vars out of [Startup] into [Permissions]. Backwards compatible ([Startup] still being looked up), but please update your configs sometime soon.
2013-03-01 15:24:22 -08:00
Diva Canto
efa7227865
Removed more vars from [Startup]. I think these were already moved elsewhere, because I can't find any reference to them in the code.
2013-03-01 14:18:01 -08:00
Melanie
eb9458fd7e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2013-02-28 21:20:07 +00:00
Diva Canto
9e0c678c1e
Robust.HG.ini.example updated to get an [Hypergrid] section too.
2013-02-28 06:24:09 -08:00
Diva Canto
64b8ce73da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-27 20:50:03 -08:00
Diva Canto
f1010d7b15
Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
2013-02-27 20:49:41 -08:00
Justin Clark-Casey (justincc)
1bef19b914
Do not have the Freeswitch connector on by default in Robust ini example files.
...
This is not widely used (may even be currently broken), only allows very poor quality voice (not the fault of FreeSwitch)
and requires a complicated Freeswitch setup.
Having it on but not configured results in spurious warnings in the logs
2013-02-27 21:45:31 +00:00
Melanie
578174d21c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-02-27 18:05:04 +00:00
Justin Clark-Casey (justincc)
20760fde25
Improve description of GenerateMapTiles config option
2013-02-27 00:31:54 +00:00
Justin Clark-Casey (justincc)
917c1695a1
Add documentation on default or Warp3D image module choice to OpenSim.ini.example.
...
As before, default is MapImageModule.
Thanks to Ai Austin for pointing out this omission.
2013-02-27 00:27:21 +00:00
Melanie
54ee95dd8e
Merge branch 'master' into careminster
2013-02-26 13:34:20 +00:00
Justin Clark-Casey (justincc)
d0cb4fc326
Move map related settings from [Startup] to a new [Map] section in OpenSim.ini
...
Existing map settings in [Startup] will continue to work, and if present will override anything in [Map]
However, the proper place for such settings would now be [Map]
This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings.
This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
2013-02-25 23:04:38 +00:00
Diva Canto
53470d5057
Missing var in [LoginService] for HG Robust.
2013-02-25 10:25:36 -08:00
Melanie
e3ea2c4bee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-02-23 20:37:09 +00:00
Diva Canto
6a01683aeb
More clarification on the [Groups] section
2013-02-23 11:24:11 -08:00
Diva Canto
a0161e7161
Further clarification on the same spot.
2013-02-23 11:21:14 -08:00
Diva Canto
c72c238f5d
Improved documentation of Groups section.
2013-02-23 11:16:50 -08:00
Diva Canto
0d08f81421
Err.. wrong dll name for groups in Robust.HG.ini.example
2013-02-21 19:07:39 -08:00
Melanie
9534d5f929
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
Diva Canto
0e5859d2b4
Minor formatting cleanup. No changes.
2013-02-21 17:26:37 -08:00
Diva Canto
e515cdddec
Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
2013-02-21 17:26:19 -08:00
Justin Clark-Casey (justincc)
db2b3627f2
Add information about MinLoginLevel to example ini files
2013-02-20 00:48:02 +00:00
Diva Canto
fc89987656
Previous build failed. Checking in a dummy change to see if the fail persists.
2013-02-19 07:30:55 -08:00
Diva Canto
9380d01976
First commit of Diva Groups. The Data bits went to OpenSim.Data core, the rest to Addons.Groups.dll.
2013-02-19 07:26:40 -08:00
Diva Canto
46e182dbf5
Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.
2013-02-19 06:37:20 -08:00
Diva Canto
5e709b087c
Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll
2013-02-18 15:44:00 -08:00
Robert Adams
1d7276235a
BulletSim: add calls for creating all the different Bullet constraint types.
...
Updated the DLLs and SOs and code for BulletXNA to create the types.
All the detailed control calls are not all in place yet.
2013-02-17 20:13:49 -08:00
Melanie
d0c5e0990b
Merge branch 'master' into careminster
2013-02-13 01:54:06 +00:00
Robert Adams
0194a3d890
BulletSim: fix density since the simulator/viewer track density in a
...
funny unit that is 100 times real density (default 1000).
Fix avatar drifting slowly when stationary flying.
Fix for physical prims getting corrected for being under terrain when it was
just its geometric center that was below terrain.
Add PreUpdatePropertyAction allowing plugable modifiction of phys
parameters returned from Bullet.
Fix an exception setting GravityMultiplier on initialization.
Update DLLs and SOs for good measure (no functional change).
2013-02-12 15:52:10 -08:00
Melanie
467e8d56b5
Merge branch 'master' into careminster
2013-02-12 23:21:26 +00:00
Diva Canto
aaa80d11a8
Replaced Ionic.Zip.dll with a new one that fixes a bug in it. DotNetZip (from which Ionic.Zip.dll is derived) is now a fork in opensim-libs, forked from 1.9.1.8 and added that simple bug fix.
2013-02-12 14:47:26 -08:00
Melanie
069e587841
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
2013-02-10 00:17:14 +00:00
Robert Adams
4808b8ee38
BulletSim: add parameter to set global contact breaking threshold. Update DLLs and SOs for setting same.
2013-02-08 16:29:52 -08:00
Melanie
12971e73d4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
2013-02-08 23:29:47 +00:00
Mic Bowman
e93defd0ca
Adds size limits to JsonStore. Adds a separate configuration
...
variable to enable binding to dynamic attributes.
2013-02-08 15:07:43 -08:00
Melanie
45f5a6a6db
Merge branch 'master' into careminster
...
Conflicts:
bin/HttpServer_OpenSim.dll
2013-02-07 20:51:51 +00:00
teravus
94a5232d3a
* Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
2013-02-07 10:50:17 -05:00
teravus
4867a7cbbf
This is the final commit that enables the Websocket handler
2013-02-07 10:27:18 -05:00
Justin Clark-Casey (justincc)
07a7ec4d1b
minor: Add explanation of MaptileStaticUUID setting in Regions.ini.example
2013-02-06 02:40:32 +00:00
Melanie
d8c27de395
Merge branch 'master' into careminster
2013-02-06 02:38:30 +00:00
Melanie
f567ff9f51
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-02-06 02:22:12 +00:00
Robert Adams
3646361279
BulletSim: make removing zero width triangles from meshes optional
...
and, for the moment, default to 'off'.
2013-02-05 17:19:55 -08:00
Robert Adams
dce9e323f4
BulletSim: remove degenerate triangles from meshes. This fixes the
...
invisible barriers in sculptie doorways (Mantis 6529).
Bump up level-of-detail for physical meshes to 32 (the max). This
fixes the invisible barriers that showed up in prim cut arches.
NOTE: the default LOD values are removed from OpenSimDefaults.ini.
If you don't change your OpenSimDefaults.ini, you will continue
to see the arch problem.
2013-02-05 16:56:33 -08:00
Robert Adams
ad438ee59f
BulletSim: rework some parameter setting implementation moving functionality that was in BSScene to BSParam. Remove unused parameters that were passed to the unmanaged code. Update DLLs and SOs for the new param block.
2013-02-05 16:56:23 -08:00
teravus
1dc09d8e8f
We're not really done here.. but we're getting there. Socket Read is working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
2013-02-05 18:02:25 -05:00
Melanie
7482ad1c22
Merge branch 'master' into careminster
2013-02-04 19:21:39 +00:00
Justin Clark-Casey (justincc)
80d9b336ff
Remove [XMLRPC] section I added by accident to the top of OpenSimDefaults.ini in previous commit 95883282
2013-02-04 07:08:48 +00:00
Justin Clark-Casey (justincc)
9588328242
Stop exceptions being thrown if GenerateMapTiles = false but no static map tile has been set. Do more informative warn instead.
2013-02-02 00:59:26 +00:00
Melanie
e497cf6f04
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-01-31 20:16:45 +00:00
BlueWall
ce4faf497f
Add config option to Regions.ini for new maptile feature
2013-01-30 23:41:32 -05:00
Melanie
9a4de546fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 02:53:11 +00:00
Robert Adams
e9aff0a91d
BulletSim: do not zero an avatar's standing velocity if it is standing
...
on a moving object.
Rearrange pre/post action subscription code to put more in locks.
Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings).
Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure.
2013-01-28 15:11:50 -08:00
Robert Adams
2cd56014a7
BulletSim: update Bullet with profiling disabled. This seems to fix the memory leak problem.
2013-01-28 06:21:51 -08:00
Melanie
0b8bf69470
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2013-01-25 00:10:32 +00:00
Robert Adams
427ab219b8
Add JSONification of WebStats module. Adds a '?json' query parameter
...
to the fetch URL to return the data in JSON format. Also adds a simple
'sim.html' that uses JavaScript to display the JSON data. Not pretty
but an example.
2013-01-24 10:44:57 -08:00
teravus
ba9d6b7337
* Repairs the Object updates, Collision updates, and Child Prim methods making the bulletXNA engine work again.
...
* The only thing that had an issue was when creating a new RigidBody, BulletXNA didn't know the type SimMotionState and the upcast type is unknown in the constructor. Therefore, I had to update the IMotionState with a new method 'SetBody'. All of the duplicated type information has been removed and BulletXNA is not relying on any non-standard types external to the library.
2013-01-24 07:11:32 -05:00
Melanie
2ce4a758e2
Merge branch 'master' into careminster
2013-01-24 00:27:00 +00:00
Melanie
be4c8c4931
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-24 00:25:08 +00:00
Robert Adams
5b334079e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-23 16:23:11 -08:00
Robert Adams
1c3d84fe03
BulletSim: pass up and report the real collision penetration.
2013-01-23 16:20:44 -08:00
Justin Clark-Casey (justincc)
55c6753b13
Merge branch 'master' into cooptermination
2013-01-24 00:03:44 +00:00
Justin Clark-Casey (justincc)
c51cae8fe8
Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini and OpenSim.ini.example. Default remains abort.
...
This setting controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
co-op should be more stable but this option is experimental.
If moving from co-op to abort, existing script DLLs will need to be recompiled.
This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
2013-01-23 23:57:09 +00:00
Melanie
cc4cfd9fa8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
2013-01-23 02:38:59 +00:00
teravus
2c517d792f
This updates prebuild to remove BulletSimN, implements the BulletSim API in BulletSPlugin using the BulletXNA Bullet physics engine. It also updates the BulletXNA library to be compatible with the changes. OpenSimDefaults has been updated to describe how to switch engines and terrain implementations.
2013-01-20 08:18:16 -05:00
PixelTomsen
9c590e51b6
IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in OpenSimDefaults.ini / section [IRC]
...
http://opensimulator.org/mantis/view.php?id=6470
idea: https://github.com/ssm2017/IrcBridgeAlert
2013-01-19 02:40:28 +00:00
Melanie
70fa41863d
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
2013-01-16 01:13:14 +00:00
Melanie
fc5711fa7a
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-01-16 01:11:20 +00:00
Robert Adams
13778c895a
BulletSim: by default, turn on continuious collision detection (CCD)
...
and enable friction computation caching. Remove dangerous BulletSim
settings from OpenSimDefaults.ini.
2013-01-15 01:44:34 -08:00
Robert Adams
459fcd81c9
BulletSim: move center of gravity of linkset to its geometric center.
...
Necessitated allowing simulator and physical position of a body to
get out of sync since Bullet assumes that <0,0,0> is the center of mass.
Update DLLs and SOs for the UpdateChildTransform so positions of
individual prim in a linkset can be implemented.
2013-01-11 16:47:53 -08:00
Melanie
3a495ccd56
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-10 01:38:03 +00:00
Robert Adams
9393403253
BulletSim: update DLLs and SOs with better debugging output.
...
Add definition of hand crafted avatar mesh. Not used yet.
Comments and cleanup.
2013-01-06 14:01:15 -08:00
Melanie
40955fee2a
Merge branch 'master' into careminster
2013-01-06 10:52:16 +00:00
Robert Adams
2eda385f5e
BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnostic
...
functions. If values set from console, the functions are called. Looking
for why the collision pools fill up with unnecessary stuff.
2013-01-04 17:06:48 -08:00
Melanie
7943c8d11c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-01-02 11:52:37 +00:00
Justin Clark-Casey (justincc)
e8a3cc7019
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-01 23:27:10 +00:00
Justin Clark-Casey (justincc)
96e196a9dd
Clarify that AllowLightShareFunctions setting is false, which is the default in OpenSimDefaults.ini and the code.
2013-01-01 23:23:08 +00:00
Robert Adams
9396ccc078
BulletSim: eliminate the use of the unmanaged HeightMapInfo structure.
...
Remove all related calls from the unmanaged and BSAPITemplate interfaces.
Update DLLs and SOs to include the version without HeightMapInfo structures.
2012-12-31 19:57:25 -08:00
Robert Adams
3d0fc70864
BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.
...
Update BulletSim DLLs and SOs with simplier step function interface.
2012-12-31 19:57:24 -08:00
Melanie
7e98dfd70b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-12-30 03:43:51 +00:00
Robert Adams
976023366f
BulletSim: update values in OpenSimDefaults.ini to reflect the values really used by the code.
2012-12-28 16:31:45 -08:00
Melanie
258588d5b5
Merge branch 'master' into careminster
2012-12-26 01:16:08 +00:00
teravus
1a841dfc59
* Update Example to include BulletSimN option and description.
2012-12-23 15:44:29 -05:00
teravus
92e4f9f412
* Initial commit of BulletSimN (BulletSNPlugin). Purely C# implementation of BulletSim. This is designed to be /as close as possible/ to the BulletSim plugin while still being entirely in the managed space to make keeping it up to date easy as possible (no thinking work). This implementation is /slower/ then the c++ version just because it's fully managed, so it's not appropriate for huge sims, but it will run small ones OK. At the moment, it supports all known features of BulletSim. Think of it like.. POS but everything works. To use this plugin, set the physics plugin to BulletSimN.
2012-12-23 15:21:25 -05:00
Melanie
0a876a305c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-12-16 21:19:30 +00:00
Robert Adams
4a67b93618
Independently control logging for per region module loading. I just got sick of, when debugging, the zillions of log lines verifying that each module is being added to each region.
2012-12-13 16:31:53 -08:00
Justin Clark-Casey (justincc)
523213060b
Add WaitForEventCompletionOnScriptStop [XEngine] config param to OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread
...
Default is 1000, as has previously been the case.
This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
2012-12-13 23:21:25 +00:00
BlueWall
203b492fce
Update mono addins
...
Push a small fix for the mono addins
2012-12-13 00:05:34 -05:00
BlueWall
7be13d16c8
Move setting to correct locations in ini
2012-12-12 17:11:30 -05:00
BlueWall
d7c4f16928
Replace Mono.Addins libraries
...
Mono.Addins.Setup uses Ionic.Zip for compression. Libraries Compiled on Win32
2012-12-11 21:54:27 -05:00
Diva Canto
5732ce9184
Replaced Mono.Addins dlls with ones compiled in Windows 64-bit.
2012-12-09 15:28:56 -08:00
Melanie
f30d519bcc
Merge branch 'master' into careminster
2012-12-09 21:27:32 +00:00