Commit Graph

2480 Commits (ca250e0b0b564efaaeb5c0b80760126cfd710c5e)

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