Commit Graph

2422 Commits (8cb3787de86a21afc3c020f934cdcc02edac5799)

Author SHA1 Message Date
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