Commit Graph

1690 Commits (43da879ea2123707190875fe2615e01be19ecced)

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
BlueWall ce4faf497f Add config option to Regions.ini for new maptile feature 2013-01-30 23:41:32 -05: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
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
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
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
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
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
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
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
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
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
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
BlueWall bd14fa15e4 Add back openjpeg dll for Windows
May generate some error output during startup on Robust - ignore for now, will fix soon.
2012-12-08 17:15:35 -05:00
BlueWall cba1390ffd Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-12-07 16:56:03 -05:00
Diva Canto 16d18afe21 Added missing config var in grided sims. 2012-12-07 12:38:19 -08:00
BlueWall 0b455d2882 Merge branch 'master' into connector_plugin 2012-12-07 15:36:43 -05:00
Robert Adams 707e186aa3 BulletSim: update DLLs and SOs with vehicle collision event check 2012-12-06 09:34:30 -08:00
nebadon f1d4e8f792 fix openjpeg on 64 bit OSX we were pointing to a file taht did not
exist.
2012-12-06 09:52:18 -07:00
Robert Adams 787636b97a BulletSim: Reduce idle region physics overhead where there are MANY
static objects by more restrictive selection of objects that collide
    with static objects.
Rename collision mask fuctions from 'filter' to 'group' so it is clear
    what is being set.
Rename BulletSimAPI.SetCollisionFilterMask() to SetCollisionGroupMask to match above.
Restore passing of time step to linear and angular motion component routines.
Use buffering vehicle physical parameter get/set routines consistantly.
Make range enforcement clearer by using ClampInRange() function for parameter setting.
Remove commented out experimental vehicle calculations.
2012-12-03 16:25:51 -08:00
Robert Adams b124aae05e BulletSim: Add DumpActivationInfo2 function. Change static objects from DISABLE_SIMULATION to ISLAND_SLEEPING. Update DLLs and SOs to add DumpActivationInfo2 function. 2012-12-01 15:39:13 -08:00
Robert Adams 24b3b4df2e BulletSim: update DLLs and SOs to remove simulator crash when calling SetInterpolationAngularVelocity. 2012-11-28 09:48:41 -08:00
BlueWall 88f2fbc8f1 Merge branch 'master' into connector_plugin 2012-11-26 06:55:03 -05:00
Robert Adams bd635e264a BulletSim: update DLLs and SOs with new collision margin setting function. 2012-11-25 20:04:31 -08:00
Robert Adams 9b98011714 BulletSim: update OpenSimDefaults.ini with current default values for friction and collision margin. Remove some of the BulletSim parameters that are very esoteric and dangerous. Most of the remaining parameters are features one can 'see'. 2012-11-25 20:04:30 -08:00
BlueWall c754003944 Merge branch 'master' into connector_plugin
Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs
2012-11-25 17:03:14 -05:00
Justin Clark-Casey (justincc) edbdbd44b9 Enable further client stack packet pooling by default by setting RecycleBaseUDPPackets = true by default.
This reduces base memory churn of every client connection, improving the garbage collection situation.
The effect is a significant portion of base load (an avatar standing still on a completely blank island)
but will probably still be swallowed up by other memory use on active regions.
Tests have shown no noticeable impact on speed of processing incoming packets, though setting remains
in case a switch back is needed.
2012-11-23 04:09:45 +00:00
Justin Clark-Casey (justincc) f473252fa8 Add AllowRegionRestartFromClient setting to [EstateManagement] section of OpenSim.ini.
Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate.
One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules,
though these should be fixed as soon as practicable.
Default is true, as has been the case historically.
2012-11-23 03:56:53 +00:00
Robert Adams 56ef180c92 BulletSim: update DLLs and SOs. No functional changes. Only the parameter block format changed. 2012-11-21 16:44:02 -08:00
Robert Adams cbc7e7bf85 BulletSim: Make avatar capsule so it is not circular.
Simple attempt to make avatars better shaped.
Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth'
and 'avatarCapsuleDepth'.
More tweeking to avatar height calculation. A little better but
short avatar's feet are above the terrain and tall avatar's feet
are a little below the ground.
2012-11-21 16:43:53 -08:00
BlueWall 665f79e15c Expose configuration options for the XmlRpcGridRouter
Expose configuration options for the XmlRpcGridRouter to allow simulators to register llRemoteData channels with an external routing service
2012-11-19 21:51:37 -05:00
Robert Adams 079a1e704f BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim libraries with code stripped of the obsolete code. 2012-11-18 18:17:30 -08:00
Justin Clark-Casey (justincc) 7861090a17 Replace old Prebuild.exe accidentally added back in f977291 with one built without <copy> nant target generation and on mono 2.4.3 2012-11-14 02:44:10 +00:00
Justin Clark-Casey (justincc) f977291a44 Replace previously updated Prebuild.exe with one built directly with mono 2.4.3 2012-11-14 02:40:37 +00:00
Justin Clark-Casey (justincc) 90c6d2e50c Stop Prebuild from generating <copy> statements which unnecessarily copy files into bin/Debug or bin/Release
nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug
However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39).
Which makes nant time-consumingly copy these files when the aren't actually used.
Tested removal of <copy> on both nant 0.91 and nant 0.92
Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.
2012-11-14 02:25:07 +00:00
PixelTomsen a180fef99e remove entry OpenGridProtocol in OpenSimDefaults.ini - module was deleted
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 11:16:52 -08:00
Diva Canto 4ac857f902 One more module: EventQueueGetModule. Also making it non-optional for this dll. 2012-11-10 08:48:31 -08:00
Robert Adams 6df9d40d99 BulletSim: update the DLLs and SOs 2012-11-06 18:17:00 -08:00
Robert Adams 895d28f14d BulletSim: update the DLLs and SOs 2012-11-03 21:28:23 -07:00
Diva Canto 7412795a0b HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE. 2012-11-02 08:05:56 -07:00
Justin Clark-Casey (justincc) ce7beb6f20 Add [AssetService] AllowRemoteDeleteAllTypes (default false).
This allows a closed grid to delete asset types other than maptile remotely.
Only operational if AllowRemoteDelete = true also.
Defaults to false - do not enable if anybody other than you can make asset service requests.
2012-11-02 01:41:38 +00:00
Justin Clark-Casey (justincc) ccb17eab71 Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit version from libopenmetaverse commit 3731ee4
This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries.
However, the reverse is also true.
If OpenSimulator stops working for you then please complain!  Long term alternative is probably to build a fat binary with both architectures.
2012-11-01 03:31:30 +00:00
SignpostMarv a09cba6da3 refactoring to use assembly:classname style of configuration 2012-10-29 23:39:01 +00:00