aee7a31bc3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-18 13:17:39 +01:00
56da788243
Add information to ThreadStackSize about possibly increasing if suffering StackOverflowExceptions during script conversion/compilation (e.g. on Windows 64-bit)
2012-08-17 22:50:11 +01:00
ccc69d66a1
BulletSim: add parameters and functionality to specify the mesh
...
level of detail for large meshes.
Remove parameter and code for DetailLog (conditional logging into
regular log file).
2012-08-17 13:34:18 -07:00
d09fa0d76e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-16 16:13:38 +02:00
90ad98370a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
ae5db637f2
BulletSim: update DLLs and SOs to fix the problem with avatars jumping around at altitudes less than 25m.
2012-08-15 16:29:46 -07:00
ef4122213c
enables configurable minimum sizes for physical & non-physical prims
2012-08-15 23:35:23 +01:00
9f83f4bfa3
BulletSim: update DLLs and SOs
2012-08-15 12:08:29 -07:00
2b982ab212
BulletSim: add physics logging parameters to OpenSimDefaults.ini. Remove trailing semis from some the of the value definitions.
2012-08-15 12:08:25 -07:00
9b014a7167
Merge branch 'careminster' into avination
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
2012-08-14 02:34:03 +01:00
93e3ab3ebd
Merge branch 'master' into careminster
2012-08-11 17:32:30 +01:00
3ecd39068c
Merge branch 'bulletsim7'
2012-08-10 16:35:00 -07:00
3a55d5b123
BulletSim: actually update the DLLs and SOs
2012-08-10 16:34:22 -07:00
6ed3761147
Merge branch 'master' into careminster
2012-08-09 02:37:49 +01:00
5ab151c2d6
BulletSim: add avatar code to keep avatars from ending up trapped under the terrain
2012-08-08 13:48:49 -07:00
19417fca41
BulletSim: Added avatar capsule scaling for size of avatar.
...
This also fixes computation of avatar mass.
Added parameter MaxPersistantManifoldPoolSize.
Fixed a parameter setting bug which caused crashes of there were
more than 400 or so physical objects. I tested up to 5000.
Updated BulletSim DLLs and SOs.
2012-08-07 17:15:06 -07:00
85b4eab005
Merge branch 'master' into careminster
2012-08-07 20:20:28 +01:00
4adb3471ac
BulletSim: update SOs and DLLs to run on more Linux versions. Correct multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
2012-08-06 12:55:52 -07:00
dfb77330a8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
2012-08-04 11:42:59 +02:00
1b7a720b9f
update ode.dll for windows so both 32b and 64b are now version 0.12 (32b
...
is just a rebuild)
2012-08-04 10:36:50 +01:00
b9c4a637b4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-08-04 03:00:20 +01:00
d5cd60131f
BulletSim: update DLLs and SOs
2012-08-03 15:10:00 -07:00
205f2326dc
Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket.
...
All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
2012-08-03 23:02:39 +01:00
789e88d8bd
Move previously unadvertised SendPeriodicAppearanceUpdates setting from [Startup] to [Appearance] config section.
...
Add description and default of false (as before) to OpenSimDefaults.ini
If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds.
For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent.
However, this switch will not help with other appearance failure situations (e.g. failure to bake assets).
This setting is experimental but will not have any significant impact on the simulator if turned to true.
2012-08-03 21:36:00 +01:00
0c00abcce1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-08-03 16:46:11 +01:00
8b04e8a297
BulletSim: Debugging log statements added. Reduced size of updata buffer trying to find a corrupted memory problem. Update DLL and SO.
2012-08-02 16:30:23 -07:00
254d3e1ad3
merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
bin/Regions/Regions.ini.example
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
2012-08-02 18:21:08 +02:00
3d68d1deda
i local libs commit
2012-08-02 18:13:59 +02:00
ecffcf7f65
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2012-08-01 23:03:03 +01:00
c51ef38e2d
BulletSim: fix problem where resizing a primary shape (cube or sphere) would not rebuild the physics mesh. Update the DLLs and SOs to latest version.
2012-07-31 16:23:52 -07:00
8114260946
Merge branch 'master' into careminster
2012-08-01 00:08:02 +01:00
f9a8915cca
BulletSim: update the DLLs and SOs. This fixes the exception on shutdown
2012-07-31 09:44:32 -07:00
e60ec599e5
Add master's new binaries
2012-07-28 00:41:31 +01:00
771d79e83e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
2012-07-28 00:39:36 +01:00
134c6d181f
Update OpenMetaverse libraries at commit 6212cbd, this time built on Windows
...
This is to try and resolve a strange Initialization exception for the AppearanceManager type that only occurs on Windows 64 bit (not Windows 32 bit or Linux!)
2012-07-27 23:05:17 +01:00
cd44c3b90a
Replace libopenmetaverse commit 6212cbd with the same libraries but this time built with xbuild rather than nant.
...
This may fix Windows and some mono version builds.
2012-07-27 21:50:18 +01:00
811dc95105
Update libopenmetaverse to commit 6212cbd (Wed Jul 25 20:11:47 2012)
...
Built from https://github.com/openmetaversefoundation/libopenmetaverse/commits/master
This update incorporates a fix by Melanie in libomv where textures would sometimes rotate slightly when other properties were changed.
Hence addresses http://opensimulator.org/mantis/view.php?id=6100
This update also incorporates libomv bot code updates that significantly reduce the warning spam for pCampbot.
The change rate of libomv is low and many changes refer to bot or code not used by OpenSimulator, so I think it is sufficiently stable to use evne though it's not a release.
2012-07-27 20:16:29 +01:00
7d30637d51
BulletSim: refactor all the linkset logic out of the prim class
...
and into its own class. The BulletSim data structures track
individual prims as linksets of 1 so most of the prim code is not
different between a linked and unlinked object.
2012-07-26 16:05:57 -07:00
c6d02801db
BulletSim: update BulletSim DLLs and SOs
2012-07-25 16:31:22 -07:00
d7add2940a
BulletSim: add parameters for setting linkset constraint factors
2012-07-25 16:31:08 -07:00
6930d696e9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-07-25 18:19:12 +01:00
892dd59b13
BulletSim: update BulletSim.dlls and so's
2012-07-23 16:38:31 -07:00
fb8e92c90b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Helpers.cs
prebuild.xml
2012-07-23 18:54:12 +01:00
ac612e2105
Update BulletSim DLLs and SOs
2012-07-20 16:12:54 -07:00
1b1418e1de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-20 23:47:25 +01:00
b25d874afa
BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs attempting to fix a mono compile error.
2012-07-20 15:34:19 -07:00
13929613b1
Move RegionConfig.ini.example into bin/Regions/Regions.ini.example - all other example files are in the same directory as their real files.
...
Only files ending in .ini and .xml are actually loaded.
Also improves the help at the top of Regions.ini.example to mention that OpenSimulator would generate Regions.ini anyway on first startup.
2012-07-20 23:18:41 +01:00
64393a7ca8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-13 02:27:16 +01:00
75ab9b4b88
Change very recent AllowedViewerList and BannedViewerList config setting names in OpenSim.ini.example to AllowedClients and BannedClients to match long-existing settings in [LoginService]
...
Also changes separator from comma to bar to match existing [LoginService] config features.
Divergence of config names for identical facilities in different places makes for an unnecessarily confusing user experience.
2012-07-12 23:18:30 +01:00
89c9528e38
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-07-11 14:27:33 +01:00
0bc8238a6c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-11 03:56:50 +01:00
0d60568564
changed ODE lib for win32 to version 0.12
2012-07-10 01:29:44 +01:00
34f4dc29a1
change linux 32bit libode.so to ode version 0.12
2012-07-10 02:24:09 +02:00
1a2ab7bc69
More keys for automated ini processing
2012-07-08 22:50:56 -04:00
a96ac73302
Add more keys for OpenSim.ini.defaults automation
2012-07-08 13:45:17 -04:00
57094bd017
Add more automation keys to OpenSim.ini.example
2012-07-08 13:03:37 -04:00
af9d8de515
BulletSim: update the binaries to the current sources
2012-07-06 15:56:35 -07:00
5776351f6a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-05 22:17:39 +01:00
462f7bccf9
minor: Add more information to OSFunctionThreatLevel and clarify some text in using PARCEL_OWNER, PARCEL_GROUP_MEMBER, ESTATE_MANAGER, ESTATE_OWNER permission categories
2012-07-05 20:58:20 +01:00
3399596e0e
Adds a list of viewers that are allowed or banned from the region.
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-07-02 18:45:11 +01:00
7cc5b3d7d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-26 17:35:55 +01:00
9f3feeff8d
If starting scripts on initial sim start, provide INFO level log feedback each time 50 scripts have been started.
...
This is to provide an indication of what's happening now that the default isn't to report every single script start.
Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
2012-06-22 02:10:27 +01:00
eab211f94d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-21 01:10:13 +01:00
7b6c0232a5
Change default logging level for XEngine to WARN instead of DEBUG.
...
This is to reduce log spam from script loading, which is especially spammy for avatar movements with scripted attachments.
All important messages are at warn or above.
If you still want/need to see these messages, set <level value="DEBUG"/> in the <logger name="OpenSim.Region.ScriptEngine.XEngine"> section of OpenSim.exe.config.
This affects no other package logs, which still output at the root configured level (currently DEBUG by default).
2012-06-20 01:10:18 +01:00
4cfaa01c0a
Remove STARTUP COMPLETE message from the startuplogo.txt file and into main logging
2012-06-20 01:06:55 +01:00
5c5b359bcb
Oops! putting back the entry for map urls
2012-06-16 07:26:16 -04:00
fc1522ab60
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-16 06:29:49 -04:00
2ed768cbf5
Adjust Robust*.ini.examples V3 webprofile entries
2012-06-16 06:29:15 -04:00
22f25dfcab
Implement max_external_urls_per_simulator setting in [LL-Functions] to allow configuration of how many urls can be set up by llRequestURL()
...
Defaults remains as 100.
This setting is per simulator instead of per region due to how the url script module is structured.
2012-06-16 03:32:47 +01:00
d893e54f4b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-14 00:10:52 +01:00
7c0843aad1
Add the updated OpenSimDefaults.ini for the prior timer_Interval patch.
2012-06-12 21:55:31 -04:00
51fe97a00c
Set CreateDefaultAvatarEntries = true in Robust.HG.ini.example to match Robust.HG.ini
...
Thanks to Ai Austin for the spot.
2012-06-11 23:33:32 +01:00
76a9885ad2
Merge branch 'master' into careminster
2012-06-11 23:15:38 +01:00
84377a23db
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
2012-06-11 16:56:40 +01:00
8c91e761c8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-09 16:28:22 +01:00
1f3218e53f
Create avatar entries necessary to stop new v3 avatars being clouds (pants, shape, etc.) by default in grid mode.
...
This only affects avatars created through the "create user" console command or createuser XMLRPC.
This matches the default setting for standalone
2012-06-09 01:11:15 +01:00
08cd5d2503
Add documentation to AllowGodFunctions setting in [LL-Functions]
2012-06-09 00:33:17 +01:00
22906386b4
Replace the stock libomv with our home grown 0.9.1 with the texture bug fixed.
2012-06-08 03:25:51 +02:00
39cb2063bf
Add collision sounds to the asset set
2012-06-07 23:35:08 +01:00
69dd5b855a
Merge branch 'avination' into careminster
2012-06-07 23:34:22 +01:00
354ac8c978
Add collision sounds to the asset set
2012-06-07 19:02:43 +02:00
e733fb32cf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-06-06 13:07:05 +01:00
008c6a4610
Mantis 4597 AgentPaused packet is ignored.
...
The packet was actually being handled but not acted on.
This change extends the default timeout for paused clients to 5 minutes
and makes both the paused and non-paused timeout periods configurable.
2012-06-05 01:22:05 +01:00
9707a2d57c
Remove profile from basic configuration
2012-06-04 18:24:02 +01:00
e80161753f
Merge branch 'master' into careminster
2012-05-31 03:35:24 +01:00
0b02a4d42e
Add an optional mechanism for physics modules to collect and return arbitrary stats.
...
If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule
(http://opensimulator.org/wiki/Monitoring_Module )
This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings].
This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing.
This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds.
The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
2012-05-31 01:52:26 +01:00
884c0e7bb1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-27 19:24:30 +01:00
bc543c1797
Environment Module - allows Environment settings for Viewer3 warning: includes database region store migrations for mssql, mysql, sqlite
...
enable/disable this module:
Cap_EnvironmentSettings = "localhost" (for enable)
Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file)
or owerwrite in OpenSim.ini
mantis: http://opensimulator.org/mantis/view.php?id=5860
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-23 17:04:19 -04:00
ebd9d2618b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
2012-05-19 13:34:44 +01:00
9fa0577c7e
Enable FetchInventoryDescendents2 and FetchInventory2 caps by default. This appears to be required now for LL 3.3.1 to work properly.
...
Without this, LL 3.3.1 continually pushes LLInventoryModelFetchDescendentsResponder::error 499 to its log.
This cap will be ignored by older viewers - UDP inventory will work normally.
2012-05-19 00:00:52 +01:00
c05f87b50c
Provide Telehub setting to allow use of landmarks
...
Setting to allow use of landmarks to override telehub routing. Default is off.
2012-05-18 17:51:38 -04:00
90722875e8
Add millisecond logging to pCampBot for debugging purposes
2012-05-18 03:44:31 +01:00
34f20b7fe3
Merge branch 'master' into careminster
2012-05-17 13:28:25 +01:00
0aa7baf49a
Fix boo-boo in OpenSim.ini.example affecting telehub sequential routing
...
Configuration value should be "sequence" instead of "sequential"
2012-05-16 23:17:42 -04:00
597f99bca7
Merge branch 'master' into careminster
2012-05-16 12:40:45 +01:00
02f3b116c6
Allow use of regular expressions in "show object name", "show part name" and "delete object name" console commands if --regex switch is used.
...
Deleteing objects by name, creator uuid or owner uuid now requires confirmation to avoid accidental deletion.
2012-05-15 23:42:49 +01:00
6126b6da72
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-05-14 23:32:49 +01:00
d7fd9b159a
set executable bit for Ionic.Zip.dll for running OpenSimulator under cygwin
2012-05-14 19:36:26 +01:00
847127f83c
Oops - missed the config changes
2012-05-14 00:15:56 -04:00
30a272ba31
Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-13 17:34:20 -04:00
df7abbb367
Merge branch 'master' into careminster
2012-05-07 12:07:47 +01:00
4186fa10f0
remove default values from prior commit since mono cant deal with them
2012-05-07 00:08:56 -07:00
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
cccef2e56d
Calculate the Daylight Savings Time information sent to the viewer based on US Pacific Standard Time rather than whatever timezone the login server is set to.
...
This is because the viewer doesn't receive a timezone from the server but bases its displays on Pacific Standard Time.
However, it still expects to receive notification from the server as to whether or not Daylight Savings Time for PST is in operation.
This commit introduces a new DSTZone setting in the [LoginService] config setting that accepts a list of timezone names valid across different platforms to calculate Pacific DST.
If you need the old behaviour of calculating DST based on the local timezone of the server running the login service, then please override DSTZone with "local".
A mailing list announcement will be made later.
Thanks to Olivier Van Helden and Gudule Lapointe for determining this behaviour and providing this patch.
From http://opensimulator.org/mantis/view.php?id=5972
2012-05-04 19:21:43 +01:00
4b982db252
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/MySQLUserAccountData.cs
2012-04-30 19:04:38 +01:00
b678ea18b2
Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on and off within tests.
...
This makes *.Tests.dll.config files no longer needed, hence deleted.
2012-04-30 18:44:22 +01:00
dcbcbd697f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2012-04-27 22:28:09 +01:00
37d770f814
Use DotNetZip to compress OARs and IARs.
...
DotNetZip provides much better compression than standard .NET.
2012-04-27 19:46:31 +01:00
ac64fe03d8
Amend to last commit: account for the existence of proxies.
2012-04-27 09:59:46 -07:00
2970a18e54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-27 09:26:14 -07:00
e4e754ee93
MapImageService: added an additional security check for OSGrid and other grids like it.
2012-04-27 09:23:56 -07:00
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
a2d544c938
Add a configuration switch to turn on/off the use of the trash
...
folder when deleting objects from a scene. The use of the trash
folder causes assets to be created and stored everytime you delete
an object from the scene (slows down the delete and adds mostly useless
assets to your database).
Default is on (use the trash folder) which is the standard behavior.
2012-04-25 11:54:57 -07:00
fc9f244a7d
Merge branch 'master' into careminster
2012-04-18 00:28:33 +01:00
2d45ba47ac
add configuration for jsonstore module, disabled by default
2012-04-17 13:55:00 -07:00
fe65b51876
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-13 03:00:48 +01:00
30d8506bc2
make changes to FlotsamCache.ini.example as noted in mantis #5960
...
http://opensimulator.org/mantis/view.php?id=5960
2012-04-12 18:27:14 -07:00
4a67e8b98f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
2012-04-11 23:35:27 +01:00
1f4d3d3582
HGFriendsModule: Added optional user level based restriction to send friendship invitations to foreign users.
2012-04-11 18:52:07 +02:00
fb44e7b636
minor: convert tabs to spaces in config example files from recent 7c534e5
2012-04-10 17:46:34 +01:00
2b339bfd97
Correct max_listeners_per_region in OpenSimDefaults.ini to max_listens_per_region
...
Value for this setting in OpenSimDefaults.ini (1000) is same as setting in code (1000) so this should have no effect
Thanks to Ovi Chris Rouly for pointing this out.
2012-04-10 17:22:02 +01:00
a25d12d166
Merge branch 'master' into careminster
2012-04-08 02:25:48 +01:00
7c534e558d
Added gatekeeper and uas addresses to grid info, so that viewers can take advantage of that info.
2012-04-07 14:38:32 -07:00
4138880464
BulletSim: update 64 bit libraries and change Linux configuration to use the files in the lib32 and lib64 directories as needed.
2012-03-28 15:36:20 -07:00
7dad1ded2e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-29 00:27:35 +01:00
b18b1b1d70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
7223b63563
User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
2012-03-27 22:09:58 +02:00
6b5f3b49e7
Merge branch 'master' into careminster
2012-03-27 18:11:05 +01:00
84c9bd52d3
BulletSim: update BulletSim binaries and configuration fixing a crash which happens when there are more than a few hundred physical objects.
2012-03-26 13:48:15 -07:00
0bd0514e81
Merge branch 'master' into careminster
2012-03-26 16:47:02 +01:00
3691e39178
BulletSim: update BulletSim.dll and libBulletSim.so with latest versions
2012-03-26 08:48:51 -07:00
ff54b3c366
BulletSim: change default of shouldDisableContactPoolDynamicAllocation from False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
2012-03-23 15:50:32 -07:00
142de1d02f
BulletSim: add a bunch of internal Bullet configuration parameters to OpenSimDefaults.ini and the code.
2012-03-23 13:15:23 -07:00
2f6e8564fe
BulletSim: add updated (but not working) BulletSim dlls
2012-03-23 13:15:20 -07:00
de24feb275
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-23 13:15:17 -07:00
b22d040169
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-23 13:15:14 -07:00
6c50442625
BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to the new lib32 and lib64 binary directories
2012-03-23 13:15:13 -07:00
9a67baae21
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 14:24:55 +00:00
e5b182fb41
Add information about SendPeriodicAppearanceUpdates to OpenSimDefaults.ini for now.
...
Default remains false.
2012-03-23 03:38:33 +00:00
9edf99703a
Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster
2012-03-22 23:01:50 +00:00
25e5b6a76c
Added new simple_build_permissions config to the .ini and .example files.
2012-03-22 14:21:07 -07:00
3381899481
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-22 20:38:49 +00:00
45b588cf00
Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."
...
This reverts commit 6146e7ef25
2012-03-22 20:10:38 +00:00
6146e7ef25
Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
2012-03-22 12:57:12 -07:00
06c81a2afe
Fix typo
...
Add enclosing " to urls
2012-03-21 20:33:45 -04:00
91cc09b7bf
HG Friends config for Robust.HG.ini.example
2012-03-20 21:36:24 -07:00
ee9210f656
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-21 00:26:02 +00:00
3fa51f66ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Framework/Util.cs
2012-03-20 17:19:14 -07:00
d08ad6459a
HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
2012-03-20 17:14:19 -07:00
5768a151ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLXAssetData.cs
2012-03-20 02:48:11 +00:00
Melanie