d8c27de395
Merge branch 'master' into careminster
2013-02-06 02:38:30 +00:00
f567ff9f51
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-02-06 02:22:12 +00:00
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
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
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
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
7482ad1c22
Merge branch 'master' into careminster
2013-02-04 19:21:39 +00:00
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
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
e497cf6f04
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-01-31 20:16:45 +00:00
ce4faf497f
Add config option to Regions.ini for new maptile feature
2013-01-30 23:41:32 -05:00
9a4de546fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 02:53:11 +00:00
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
2cd56014a7
BulletSim: update Bullet with profiling disabled. This seems to fix the memory leak problem.
2013-01-28 06:21:51 -08:00
0b8bf69470
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2013-01-25 00:10:32 +00:00
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
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
2ce4a758e2
Merge branch 'master' into careminster
2013-01-24 00:27:00 +00:00
be4c8c4931
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-24 00:25:08 +00:00
5b334079e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-23 16:23:11 -08:00
1c3d84fe03
BulletSim: pass up and report the real collision penetration.
2013-01-23 16:20:44 -08:00
55c6753b13
Merge branch 'master' into cooptermination
2013-01-24 00:03:44 +00:00
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
cc4cfd9fa8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
2013-01-23 02:38:59 +00:00
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
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
70fa41863d
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
2013-01-16 01:13:14 +00:00
fc5711fa7a
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-01-16 01:11:20 +00:00
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
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
3a495ccd56
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-10 01:38:03 +00:00
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
40955fee2a
Merge branch 'master' into careminster
2013-01-06 10:52:16 +00:00
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
7943c8d11c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-01-02 11:52:37 +00:00
e8a3cc7019
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-01 23:27:10 +00:00
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
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
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
7e98dfd70b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-12-30 03:43:51 +00:00
976023366f
BulletSim: update values in OpenSimDefaults.ini to reflect the values really used by the code.
2012-12-28 16:31:45 -08:00
258588d5b5
Merge branch 'master' into careminster
2012-12-26 01:16:08 +00:00
1a841dfc59
* Update Example to include BulletSimN option and description.
2012-12-23 15:44:29 -05:00
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
0a876a305c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-12-16 21:19:30 +00:00
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
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
203b492fce
Update mono addins
...
Push a small fix for the mono addins
2012-12-13 00:05:34 -05:00
7be13d16c8
Move setting to correct locations in ini
2012-12-12 17:11:30 -05:00
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
5732ce9184
Replaced Mono.Addins dlls with ones compiled in Windows 64-bit.
2012-12-09 15:28:56 -08:00
f30d519bcc
Merge branch 'master' into careminster
2012-12-09 21:27:32 +00:00
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
cba1390ffd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-07 16:56:03 -05:00
16d18afe21
Added missing config var in grided sims.
2012-12-07 12:38:19 -08:00
0b455d2882
Merge branch 'master' into connector_plugin
2012-12-07 15:36:43 -05:00
2cb824d3fc
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-12-07 03:49:04 +00:00
707e186aa3
BulletSim: update DLLs and SOs with vehicle collision event check
2012-12-06 09:34:30 -08:00
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
5837e731bf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
2012-12-04 23:01:18 +00:00
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
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
daa1d99513
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-11-30 01:19:08 +00:00
24b3b4df2e
BulletSim: update DLLs and SOs to remove simulator crash when calling SetInterpolationAngularVelocity.
2012-11-28 09:48:41 -08:00
88f2fbc8f1
Merge branch 'master' into connector_plugin
2012-11-26 06:55:03 -05:00
bd635e264a
BulletSim: update DLLs and SOs with new collision margin setting function.
2012-11-25 20:04:31 -08:00
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
c754003944
Merge branch 'master' into connector_plugin
...
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
2012-11-25 17:03:14 -05:00
fd7a83f439
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
2012-11-25 14:13:50 +00:00
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
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
c4c6121752
Merge branch 'master' into careminster
2012-11-22 03:17:33 +00:00
56ef180c92
BulletSim: update DLLs and SOs. No functional changes. Only the parameter block format changed.
2012-11-21 16:44:02 -08:00
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
45eedb635a
Merge branch 'master' into careminster
2012-11-20 20:25:15 +00:00
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
9f2d232c71
Merge branch 'master' into careminster
2012-11-19 22:53:03 +00:00
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
06fa1681ae
Merge branch 'master' into careminster
2012-11-15 00:43:26 +00:00
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
f977291a44
Replace previously updated Prebuild.exe with one built directly with mono 2.4.3
2012-11-14 02:40:37 +00:00
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
d84de8c9b6
Merge branch 'master' into careminster
2012-11-11 21:16:58 +00:00
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
389077345f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2012-11-11 16:31:01 +00:00
4ac857f902
One more module: EventQueueGetModule. Also making it non-optional for this dll.
2012-11-10 08:48:31 -08:00
b3e99a4d48
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
2012-11-08 04:51:00 +00:00
6df9d40d99
BulletSim: update the DLLs and SOs
2012-11-06 18:17:00 -08:00
c623e35805
Merge branch 'master' into careminster
2012-11-04 22:44:42 +00:00
895d28f14d
BulletSim: update the DLLs and SOs
2012-11-03 21:28:23 -07:00
d0473b73da
Merge branch 'master' into careminster
2012-11-03 15:38:47 +00:00
7412795a0b
HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE.
2012-11-02 08:05:56 -07:00
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
e7a6328ea4
Merge branch 'master' into careminster
2012-11-01 15:52:32 +00:00
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
48569e856a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-30 01:02:20 +00:00
a09cba6da3
refactoring to use assembly:classname style of configuration
2012-10-29 23:39:01 +00:00
a16ddbee41
Renaming module back to SoundModule as the hypothetical plan was to make another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless.
2012-10-29 23:39:01 +00:00
e0b5a3cd90
tweaking configuration logic so that the INonSharedRegionModule will load by default
2012-10-29 23:39:01 +00:00
26cc57b6ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
424f68b64b
Changed duplicate Asset ID's to unique ID's in CollisionSoundsAssetSet.xml
2012-10-25 23:30:48 +01:00
de47646c3d
BulletSim: update binaries with small change that insures that manual position/rotation setting results in an update event.
2012-10-23 17:34:14 -07:00
07f1d44174
Merge branch 'master' into connector_plugin
2012-10-20 05:25:58 -04:00
6ad8d3c43f
Merge branch 'master' into careminster
2012-10-20 02:33:24 +01:00
cd3762ca9f
Add experimental [Groups] MessageOnlineUsersOnly option for Flotsam XmlRpc groups.
...
This retrieves and caches information from the PresenceService to only send messages to online users.
This is reported to much improve performance for large groups where most users are offline.
Cache is 20 seconds to balance requests against users not receiving messages until cache updates.
This is an alternative to an approach where login/logout notification is sent directly from simulator to groups service.
However, I'm not convinced that this PresenceService approach is actually better. Needs more thought.
2012-10-20 01:26:04 +01:00
45df324ab3
Bulletsim: update DLLs and SOs. Brings C++ routine in sync with C# sources and fixes problem where BulletSim would crash on startup on 32 bit Linux.
2012-10-19 15:47:51 -07:00
276600ab71
Merge branch 'master' into connector_plugin
2012-10-19 07:46:00 -04:00
ad60a29c93
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-10-17 00:03:02 +01:00
fc861c7904
Add optional pool for the UDPPacketBuffer objects that handle all incoming UDP data.
...
Even when an avatar is standing still, it's sending in a constant stream of AgentUpdate packets that the client creates new UDPPacketBuffer objects to handle.
This option pools those objects. This reduces memory churn.
Currently off by default. Works but the scope can be expanded.
2012-10-16 23:35:05 +01:00
6ce93b22d1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-12 19:05:06 +01:00
b63134764f
BulletSim: update the DLLs and SOs
2012-10-11 14:01:35 -07:00
311a03befa
Updated Robust.HG.ini.example. Thanks Austin Tate.
2012-10-11 13:57:29 -07:00
7e90ea3551
av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - No Avatar Avatar Collisions. This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment.
2012-10-09 10:41:16 -04:00
764270a0d8
Add config option to plant avatar where they are reducing avatar avatar 'pushability' av_planted see OpenSimDefaults.ini. Use when you have unruly visitors that rudely push each other around. Still allows a small amount of movement based on the avatar movement PID controller settings. You can increase the spring tension in the PID controller and really prevent any movement if you would like.
2012-10-09 09:26:11 -04:00
252af020b0
Merge branch 'master' into connector_plugin
...
Conflicts:
OpenSim/Server/ServerMain.cs
2012-10-09 06:44:14 -04:00
839aa57b42
Update the example
2012-10-08 18:01:56 +01:00
f7df68d922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 02:48:28 +01:00
440726250c
Added parts to manage repositories and plugin management
...
This is working - more testing to follow, then soem documentation
2012-10-06 11:48:21 -04:00
d98af79f77
Make the asset retrieval concurrency a config switch. The current value
...
of 30 is still hanging badly on some mono versions. The switch defaults to
30 to preserve current behavior.
2012-10-04 08:41:06 -07:00
741471e02c
Remove duplicate files
...
We are keeping these in bin/lib(32/64) now
2012-10-03 21:49:58 -04:00
227cfbdc67
Update Mono.Addins
...
Update Mono.Addins to latest - 3177b22e958c82bf2c5655ac3d4ef7ad25cc2588
2012-10-03 19:48:54 -04:00
e6c9b09006
Merge branch 'master' of /home/opensim/var/repo/opensim into modular_config
2012-10-03 19:14:40 -04:00
3e71c71cbf
Add modular configuration for Robust connectors
...
We can provide modular ini for connectors...
look for our configuration in the following places...
1) in the default ini/-inifile
2) in the named file (ConfigName) located in the configured directory
(see Robust[.HG].ini [Start] section for ConfigDirectory)
3) in the repository named in the connector (ConfigURL)
In this case, the file will be written into the configured
directory with the specified
See example connector/service @ https://github.com/BlueWall/SlipStream
for testing.
2012-10-03 16:07:11 -04:00
8a552ac907
Merge branch 'master' into careminster
2012-10-03 17:40:13 +01:00
a5b8359b8e
BulletSim: fix crash on load that showed up on 32bit Linux.
2012-10-02 17:04:33 -07:00
944b1ed237
Merge branch 'avination' into careminster
2012-09-29 21:47:08 +01:00
71dd55a1ce
Merge branch 'master' into careminster
...
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-09-29 19:21:07 +01:00
7f96bb601a
BulletSim: update SOs and DLLs
2012-09-28 12:51:47 -07:00
735d89e369
BulletSim: btGhostObjects working to make 'volume detect' work.
...
Rearrangement and cleanup of shape collection code. Much more readable.
Enabling and use of collision filters and masks.
Addition of ID to body creation BulletSimAPI calls so always set in
shape for collision reporting.
Change default of ShouldSplitSimulationIslands and ShouldRandomizeSolverOrder
from 'false' to 'true'. When 'false', this suppresses NO_CONTACT_RESPONSE
which makes volume detect fail.
2012-09-27 22:01:42 -07:00
d26fbf727a
Comment out unused RestPlugins text in OpenSimDefaults.ini
2012-09-28 02:19:15 +01:00
6511c3b5c6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-27 16:43:38 -07:00
7a50705188
Removed the bits about the TOSModule. That module doesn't go into core. WARNING: migration on GridUser withdrawn too, but left the migration number there.
2012-09-27 16:43:18 -07:00
285039949c
Update the Http server with a few additional properties. Adapt the test
...
server code to match.
2012-09-27 18:27:49 +01:00
637f5440fe
Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster
2012-09-27 15:46:35 +01:00
1efa87ba38
Format OpenSim.ini.example
...
Make lines fint in 80x24 terminal for easier reading
2012-09-27 15:27:39 +01:00
2bf42f30af
Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.
...
This controls how many undo steps the simulator will store for each prim.
Default is now 20 rather than 5 as it briefly was.
The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
2012-09-27 00:12:34 +01:00
3c77b8f463
Use GridUser properly for foreign users.
2012-09-26 12:40:41 -07:00
7d2cd0d935
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 20:04:10 -07:00
ae58cf4224
TOS module. WARNING: migration in GridUser table.
2012-09-25 20:03:49 -07:00
3c2fb77133
Format OpenSim.ini.example
...
Make lines fint in 80x24 terminal for easier reading
2012-09-25 18:13:32 -04:00
bbaf2c5a80
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-24 20:14:00 +01:00
fb6d6e5cca
HG 2.0: User Agent Service now can also control where the local users can go. Domain-name and user-level based. \o/
2012-09-22 11:11:48 -07:00
48f4b32d7f
More HG 2.0: access control at the Gatekeeper. \o/
2012-09-21 21:03:14 -07:00
b542622b3a
HG 2.0: added asset import/export policies at the sim too.
2012-09-21 07:44:18 -07:00
e379566e6e
Improvement over last commit: refactor the asset permissions code, so that it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
2012-09-20 19:50:57 -07:00
33aa6d172f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-20 15:51:27 -07:00
3089b6d824
More HG2.0: Added permission policies in HGAsset Service based on asset types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
2012-09-20 15:49:22 -07:00
f2a9d26118
Make ResendAppearanceUpdates = true by default in [Appearance] in OpenSimDefaults.ini.
...
This resends appearance uuids to avatars in the scene once a minute.
I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet.
The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached.
This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
2012-09-20 01:40:05 +01:00
e50b6b5334
Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this time using lkalif's linux libraries built against a much earlier libc (2.7)
2012-09-20 01:26:35 +01:00
e50155ebca
Downgrade libopenjpeg back to 1.3 from 1.5.
...
This is because libopenjpeg 1.5 appears to require a minimum of glibc 2.14, whereas at least one fairly recent distro (openSUSE 11.4 from 2011-03-10) only has glibc
Further investigation pending.
2012-09-19 00:35:06 +01:00
f99278c956
Add openmetaverse_data from libopenmetaverse to allow testing of texture baking via bot rather than just throwing out errors
2012-09-18 23:57:00 +01:00
95809cabd9
Update libopenmetaverse components to commit f5cecaa
...
Among other things this allows pCampbot to work under Windows since libopenmateverse now ships the same log4net.dll (publicly signed) as OpenSimulator
This also updates the libopenmetaverse embedded libopenjpeg from 1.3 to 1.5.
DLL naming and mapping for non-Windows libopenjpeg changes to remove version number to make future udpates easier and bring it into line with names of other shipped DLLs.
libopenjpeg updates have been made for OSX, Windows (32 and 64 bit) and Linux (32 and 64 bit). Please report any issues.
2012-09-18 23:45:06 +01:00
9d973ec3b3
Cleanup from prev. commit
...
Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
2012-09-18 10:12:32 -04:00
d29fc53052
Fix some inconsistencies in configurartion: NonPhys prims
...
Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*.
Please update your OpenSim.ini and Regions.ini to reflect these changes.
2012-09-18 09:53:45 -04:00
db774d4292
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
daa4745fb7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-15 19:35:33 -07:00
de69a24574
More on HG2.0: added the possibility of controlling the appearance that avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
2012-09-15 19:33:51 -07:00
b602b476ad
BulletSim: update DLLs and SOs and remove some debugging code.
2012-09-15 15:36:13 -07:00
d5c8c6bc12
For FlotsamAssetCache, always update access times of cached scene assets before looking for files to expire.
...
This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed.
The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced.
This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.
2012-09-15 01:08:15 +01:00
ebb394bbda
Fix indentation and issues where tabs were used instead of spaces in commit 783ee949
2012-09-12 01:45:34 +01:00
0d97beefce
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
783ee949ea
implementing per-region configuration of limits on the number of prims one can have in a linkset
...
Applied with changes - patch was based on a repo different from core
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-09 12:59:25 +01:00
d8df2d6bed
BulletSim: update the DLLs and SOs
2012-09-07 16:05:34 -07:00
924df14c5e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
2b506cffb1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-07 08:10:03 -07:00
33469a0d2b
Moved the new vars in Robust.HG.ini to the proper section.
2012-09-07 08:09:44 -07:00
8f02fd926e
If reusing dynamic textures, do not reuse small data length textures that fall below current viewer discard level 2 thresholds.
...
Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache.
This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request.
This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true
This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
2012-09-06 22:12:05 +01:00
9f914327c6
Added missing configs, and deleted the [Profile] part on the Hypergrind config.
2012-09-06 12:42:14 -07:00
e2e8b09059
Merge branch 'master' into careminster
2012-09-02 22:15:55 +01:00
32b534f324
BulletSim: update the SOs and DLLs
2012-08-31 11:41:39 -07:00
2d2495cc45
Remove the unused Newtonsoft.Json dlls
...
Also remove the license files
2012-08-31 11:33:53 -07:00
1b15144208
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-08-31 01:32:18 +01:00
3ed0d79b00
Make ReuseDynamicTextures an experimental config setting in [Textures]. Default is false, as before.
...
If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them.
This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable).
Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry).
If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated.
CUrrently experimental. Default is false, as before.
2012-08-30 22:57:40 +01:00
783773a0c0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-24 00:07:17 +01:00
a533db7e27
Add an [HGAssetService] section to SQLiteStandalone.ini with the same connection string as [AssetService].
...
This is necessary because commit 8131a24http://opensimulator.org/mantis/view.php?id=6200 , many thanks to DanBanner for identifying the exact problem commit which was very helpful.
This was a regression from OpenSimulator 0.7.3.1 which did not contain this bug.
2012-08-23 22:30:14 +01:00
f8603a215d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-23 01:41:47 +01:00
568de9313a
BulletSim: update DLLs and SOs to eliminate terrain update crash which manifested itself on Linux.
2012-08-21 20:55:48 -07:00
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
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
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
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
4972491efb
Move startup/shutdown command .txt files to .txt.example files to avoid clobbering on updates.
...
Thanks to Whitestar in http://opensimulator.org/mantis/view.php?id=5938 for pointing out this problem.
2012-03-19 00:29:02 +00:00
ab54ce1907
Fix configuration problems where XAssetDatabasePlugin was picked up accidentally.
...
The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up.
This replaces the changes in 92b1ade
2012-03-19 00:18:04 +00:00
c7e302864a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +00:00
7dfa0309c6
More on HG access control. This commit splits the UserManagementModule into the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com.
2012-03-17 15:36:20 -07:00
92b1ade78e
BAD JUSTIN!
...
People using standalone in master, please update your StandaloneCommon.ini according to this change.
People using robust in master, please update your Robust.HG.ini.example[.HG].ini according to this change.
2012-03-17 15:01:10 -07:00
33c14cb107
Region access control! Region operators can now specify things like DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector.
2012-03-17 10:00:11 -07:00
a2009ffe2e
Terrain: added [Terrain] section with an option to load an initial flat terrain. Default is still pinhead island. I much rather have a flat land in the beginning.
2012-03-16 13:08:05 -07:00
78e992dbd0
Move startup_commands.txt.example to startup_commands.txt for consistency with the existing shutdown_commands.txt.
...
Add comments to both files saying what they are (files that can contain console commands to execute on sim startup/shutdown) with an example.
2012-03-16 02:13:45 +00:00
b19be657b6
Remove unnecessary "backup" command in shutdown_commands.txt
...
The simulator is already doing this internally.
2012-03-16 02:10:59 +00:00
34f6f87b6c
Remove unused bin/ScriptEngines/Default.lsl
...
It would certainly be nice to change the default script on disk, but this is currently unused and isn't a suitable default.
At this location it would also stop an easy manual deletion of script engine compiles and state.
2012-03-16 01:51:16 +00:00
c0f70d17fc
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-03-14 11:33:51 +00:00
1547fe959e
Change OpenSim.ini.example to reflect how to actually enable prim limits,
...
as opposed to how it was first designed.
2012-03-12 16:06:35 +00:00
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
d6ebf2d6ca
Add ability to specify a default estate to be used when creating regions.
...
This is configured in the new [Estates] section of OpenSim.ini.
If a default estate is configured then all new regions are automatically joined to it instead of asking the user.
If the default estate does not already exist then it is created.
Current default behaviour remains the same - the user is asked for estate details when necessary.
Thanks to Frenando Oliveira for the patch which I adapated further.
2012-03-10 01:27:05 +00:00
c521f3b348
Fix UbitODE dll mappping by simply copying the one from ODE.Net
2012-03-09 02:39:02 +01:00
6338996f87
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2012-03-04 16:23:19 +00:00
ac934e2dbb
Add WebProfiles config to other config example
2012-03-04 11:11:01 -05:00
1f32730798
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-03-03 09:58:57 +00:00
6fc350725d
Merge branch 'master' into v3_support
2012-03-02 15:02:09 -05:00
255afbf08a
Remove more now unused third party libraries.
2012-03-01 02:11:15 +00:00
4177571a78
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support
2012-02-25 14:33:56 -05:00
6386fdcda7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
2012-02-25 16:24:01 +00:00
4a5f9fe6a2
Move libopenjpeg native libraries into lib32 and lib64 as appropriate.
2012-02-25 04:26:32 +00:00
6159110258
Remove some more unused Bullet libraries.
2012-02-25 04:22:59 +00:00
ca19b9078f
Remove old libbulletnet native libraries. These are not used in the current generation bullet physics plugin.
2012-02-25 03:36:43 +00:00
6138662716
Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.
2012-02-25 03:25:56 +00:00
3fbcd21916
Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like these were once connected with HttpServer.dll but are now unused.
2012-02-25 03:12:41 +00:00
165ae251ec
V3 Support
...
The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
2012-02-22 16:36:28 -05:00
67bea681e2
Add web profile url setting to ini
2012-02-21 23:04:49 -05:00
03e7bc1526
Merge branch 'master' into careminster
...
Conflicts:
2012-02-21 10:20:56 +00:00
a27e5a9c95
Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 bit one in lib64
2012-02-21 04:12:17 +00:00
daee2eda93
Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
...
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
2012-02-21 04:10:39 +00:00
a15b00d3ef
Replace previous windows 64-bit sqlite3.dll with one from http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip
...
In this zip, it's called System.Data.SQLite.dll. We rename it to lib64/sqlite3.dll
This is a little unexpected but it works. For some reason my hand-rolled one in Visual Studio 2008 did not.
This is sqlite 3.7.10. Other libraries are still currently 3.7.6 but this should make no difference.
This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet).
2012-02-21 04:01:27 +00:00
1b906ef2ad
Replace win 64-bit sqlite3.dll with another version, though I suspect this one won't work either.
2012-02-21 03:24:01 +00:00
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
2012-02-21 02:52:20 +00:00
19d271d3fc
Remove PhysXPlugin and wrappers.
...
In over 4 years this never progressed beyond an unimplemented stub.
This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
2012-02-21 01:45:17 +00:00
96409cc2ee
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
2012-02-19 20:08:01 +01:00
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
0ef64fbe03
Actually add the Windows 64-bit ode.dll file.
...
This might be why it didn't work.
2012-02-18 02:46:07 +00:00
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
...
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
2012-02-18 00:33:52 +00:00
04279e36d1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-15 03:51:30 +00:00
272ba5a741
Merge branch 'master' into careminster
2012-02-15 01:11:17 +00:00
33e66107be
Fix: Lightshare Module(Windlight)-Region settings are not applicable for database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
2012-02-14 02:06:42 +00:00
48b962c401
Update [XEngine] AppDomainLoading advice in OpenSim.ini.example
2012-02-14 00:00:49 +00:00
f49897a419
Clamp ODE character velocity. Make ODE falling character 54m/s by default.
...
If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value.
In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver.
This also appears to be the value used on the linden lab grid.
This should resolve http://opensimulator.org/mantis/view.php?id=5882
2012-02-11 02:28:40 +00:00
754129b903
files need to run UbitODE in linux ( untested )
2012-02-08 15:33:51 +00:00
236e1c45f2
Merge branch 'master' into careminster
2012-02-07 23:30:48 +00:00
a4367e75d3
Set UseMeshiesPhysicsMesh = true in [Mesh] by default
...
This means that uploaded meshes will get a physics (collision) mesh if uploaded with that option via a viewer.
2012-02-07 23:15:23 +00:00
773994723a
Add warning about only uncommenting EstateConnectionString if you know what you're doing to GridCommon.ini.example (was already in StandaloneCommon.ini.example)
2012-02-07 20:35:04 +00:00
37049180f6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-07 21:09:04 +00:00
54fc78013d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-02-05 20:58:04 +00:00
44badf452e
change NonPhysicalPrimMax to NonphysicalPrimMax to make this variable
...
work correctly, it was being ignored because of the case, this effects
OpenSim.ini.example and OpenSimDefaults.ini
2012-02-04 19:41:25 -07:00
ce5e900721
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
f17066b7bf
Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order.
...
This brings it into line with other deserializations such as object and will improve future backward compatibility.
2012-02-03 22:21:54 +00:00
1b63b21a4d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-01-31 20:53:49 +00:00
f3780b9eae
Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects.
...
These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature.
Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc.
However, data can be inconsistent due to different machine circumstances and virtual machine actions.
This area is under development.
2012-01-31 19:56:37 +00:00
9a86a713d3
Merge branch 'master' into careminster
2012-01-29 22:50:59 +00:00
e8b688b61f
Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php?id=2607
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-29 12:40:43 -07:00
abffda269f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-01-28 04:05:53 +00:00
088f1213b4
Remove accidental /user postfix from HomeURI in [HGInventoryAccessModule] in GridCommon.ini.example and from SRV_ProfileServerURI in [LoginService] in Robust.HG.ini.example
...
As per http://opensimulator.org/mantis/view.php?id=5852 , confirmed by diva via aiaustin
2012-01-28 01:01:19 +00:00
4ce42762ee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-26 00:21:21 +00:00
e9de7e7107
Update BulletSim.dll with some interface changes and tuning (see opensim-libs). Change BSScene to use new interface.
2012-01-25 14:40:38 -08:00
ba3b0c69f1
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
a0fb1e1788
Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE."
...
This reverts commit 4eef6725f4
2012-01-20 17:51:12 +00:00
717656c453
Merge branch 'master' of /home/opensim/src/opensim
2012-01-17 22:10:47 -05:00
9ed9720861
Update osGetGrid**** functions
...
The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
2012-01-17 22:07:40 -05:00
4eef6725f4
Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE.
...
As discussed on the opensim-dev mailing list, this is to avoid a demonstrated ODE collider segfault when stress-testing a simulator running more than one region using the bundled pCampbot.exe
As before, the ODE revision used is r1755 - only the collider has changed.
Tests so far reveal little performance change.
However, if noticeable issues do arise, please report on mantis and/or the opensim-dev mailing list.
The previous libraries are temporarily in bin/Physics-previous-ode-libs
These can be copied back to bin if one wants to compare behaviour with the previous libraries.
2012-01-17 20:49:20 +00:00
59a0c50d48
Comment out noisy log lines I accidentally included in the nant build target adjustment commit.
...
Left in the method doc.
2012-01-16 23:04:08 +00:00
82ad9d4e04
Remove monocov and other obsolete nant build targets.
...
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
2012-01-16 22:58:58 +00:00
8bdd80abfa
HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
2012-01-12 09:56:35 -08:00
4492bc1bcd
Merge branch 'master' into careminster
2012-01-12 17:52:29 +00:00
34137ed4ea
Correcting ini.example were permissionmodules uses komma instead of space as separator
2012-01-12 12:27:41 -05:00
a4c2e7f599
Merge branch 'master' into careminster
2012-01-10 20:34:43 +00:00
a2fe3e2081
Remove DEBUG option
...
Remove DEBUG option from OpenSim.ini.example as it is handled in the console now with "debug teleport"
2012-01-10 15:29:08 -05:00
1cc685e820
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-01-10 18:33:32 +00:00
707c8c6f2b
Add some run-time debugging support
...
Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful.
Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
2012-01-09 18:19:55 -05:00
9bab43b4d1
eliminate a few tabs from OpenSimDefaults.ini
2012-01-06 21:36:30 +00:00
5f682b51ec
Add disabled Cap_FetchInventory2 = "" reference to [ClientStack.LindenCaps] in line with all the other ones that are there
2012-01-06 21:29:18 +00:00
11c48ac807
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
2012-01-06 21:41:36 +00:00
1ebc9d04aa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-01-05 08:15:33 +00:00
6166a40440
Update C5.dll to version 1.1.1 from 1.1.0
...
C5 is a collections library and can be found at http://www.itu.dk/research/c5/
This is used in the UDP texture (image) sending code.
2012-01-03 20:22:15 +00:00
a6e305063e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
2012-01-02 21:41:36 +00:00
5d8ed077bc
Bring back the Hyperlinker to the Robust console. Moved the config to [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
2011-12-30 19:17:35 -08:00
bde004c08e
Merge branch 'master' into careminster
2011-12-28 09:24:35 +00:00
f36fe45fa7
Add Copy task to Prebuild.exe (vsxxxx targets)
...
<Files>
<Match pattern="*.cs" recurse="true"/>
<Match pattern="../bin/MyConfig.xml" buildAction="Copy" recurse="false" destination="$(OutputPath)" />
</Files>
2011-12-25 00:04:42 -05:00
eef6f92029
Merge branch 'master' into careminster
2011-12-22 19:52:59 +00:00
48113f0fc8
Make it possible to force all prims to be phantom via the collidable_prim boolean setting in the OpenSim.ini config [Startup] section.
...
Naturally, default is true.
When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom.
This setting is for test purposes.
This switch does not affect the collision of avatars with the terrain.
2011-12-22 19:44:52 +00:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
4f628849f3
Add more documentation to EstateConnectorString in StandaloneCommon.ini.example
2011-12-17 00:14:48 +00:00
898549d13e
Merge branch 'master' into careminster
2011-12-14 08:57:55 +00:00
3a06640730
Get rid of the 'lolcat' library asset.
...
This was both unused and an invalid jpeg2000 texture from way back in 2008
2011-12-12 21:17:01 +00:00
e9b59e7627
Remove long unused libdb_dotNET43.dll
2011-12-12 19:31:12 +00:00
f025387f10
Set adaptive throttles false by default because it doesn't play nice with AVN
...
code
2011-12-09 19:56:03 +01:00
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
fd023b317a
Update libomv to 0.9.1
2011-12-07 09:56:15 -05:00
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
6541fc08d4
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 22:46:37 -05:00
e26ef8aeca
change misleading login = http://127.0.0.1:9000/ in GridInfoService in Robust.ini.example to 8002
2011-12-03 02:48:16 +00:00
e7930b1d0f
Make fix to Nini for null references in some cases.
2011-11-29 22:25:03 -05:00
dc612d0f08
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-11-28 11:06:38 +00:00
676d32974a
Implement the FetchInventoryDescendents2 capability using the same code as WebFetchInventoryDescendents.
...
Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
2011-11-25 22:46:42 +00:00
b785f204ce
remove some mono compiler warnings
2011-11-25 22:19:57 +00:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
d4e3a7fe81
Shell Environment Variables in config
...
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration.
Nini @ https://github.com/BlueWall/Nini-Dev
2011-11-23 10:11:47 -05:00
a94ce3f1df
Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in OpenSim.ini.example.
...
If anybody was changing this and wondering why there was no effect, this is why.
2011-11-21 15:30:00 +00:00
bdb5ac96d9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-11-19 22:39:15 +00:00
21353de9b7
Enable v2/v3 map tile url setting on robust as default in config
...
This is necessary to see map tiles on v2/v3 viewers and appears to work fine
2011-11-19 00:34:56 +00:00
f72c4bdba5
Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.
...
This will hopefully address mantis 5471, 5694 and 5718.
This code is now in opensim-libs, along with Diva's slightly older patches (which were already applied to the DLLs in the opensim tree).
Thanks Oren!
2011-11-18 22:52:59 +00:00
9d458fdd7f
Turn the [RegionReady] module on by default and login_disable = true while scripts are loading.
...
From field experience, we know that simulators can be unstable if a user logs in before the scripts have finished loading.
This commit turns login_disable = true in [RegionReady] on by default which prevents this from happening.
If you want the old behaviour, please copy these section from OpenSimDefaults.ini into OpenSim.ini and set login_disable = false
2011-11-18 21:31:23 +00:00
169387b390
Turn SellEnabled in the [EconomyModule] on by default.
...
This only provides enough functionality to allow operations for no money (e.g. sell for $0).
2011-11-17 23:53:25 +00:00
2d4ac6288d
Alter commit 3758306 to allow region name to be substituted within a region console prompt
...
This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash)
e.g. "Region (\R) " is the current and continuing default prompt
This renames custom_prompt in [Startup] to ConsolePrompt
2011-11-10 22:56:13 +00:00
4939d99b57
Merge branch 'master' into bigmerge
2011-11-10 23:03:50 +00:00
a1426739a2
Merge branch 'master' into bigmerge
2011-11-10 17:35:35 +00:00
37583063ee
Allow custom setting for the console prompt
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-11-10 06:56:32 -05:00
facdc9c46e
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 22:56:08 +00:00
4d3926694d
Remove enableprejump config option and associated code as this is now
...
fully functional and cannot be disabled because that would break timings.
2011-11-05 22:43:45 +00:00
24235006f4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
59232a6ea8
Change default say distance to 20m from 30m, the same as on the big grid. This is to improve the migration of scripts that expect a 20m say distance.
...
If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
2011-11-02 20:05:31 +00:00
b69f679122
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2011-11-01 23:54:09 +00:00
4b58d4ff95
Removed see_into_this_sim_from_neighbor configuration option.
2011-11-01 16:51:14 -07:00
74cc834fec
Remove unused PumaCode.SvnDotNet library
2011-10-31 21:37:35 +00:00
083b28de8c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-30 10:16:25 +00:00
9bdf118e0d
Add missing max_listens_per_region to [LL_Functions] config section in OpenSimDefaults.ini + explanation.
...
This setting controls the maximum number of listeners in a region
2011-10-29 02:45:50 +01:00
6a96c9546d
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-26 17:48:51 +01:00
41395d5443
Added optional owner classes to existing OSSL agent Permissions
...
PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 10:35:50 -04:00
740077a291
Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge
2011-10-25 03:26:20 +01:00
4e9457ca0c
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
...
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
2011-10-25 03:26:09 +01:00
508f2ebb76
Merge commit '655aee44c4236d7023b9274645bf033b87b17131' into bigmerge
2011-10-25 03:19:30 +01:00
98b7bd01cb
Merge commit '229ca09b7956f51fc2618dc35dff87cf04bf0fc9' into bigmerge
2011-10-25 03:19:16 +01:00
a71c60ee6d
Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge
2011-10-25 02:56:56 +01:00
cdca0fb387
Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge
2011-10-25 02:56:03 +01:00
f5e2bdebef
Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge
2011-10-25 02:55:57 +01:00
90f17785c3
Merge commit '352002fd0b74a87f62ea82c76969e4110ba2542f' into bigmerge
2011-10-25 02:54:53 +01:00
8841b77cd1
Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge
2011-10-25 01:53:53 +01:00
3eb51e9a79
Merge commit 'bea65b06a445c267ecb77be08452146cb7fee1ce' into bigmerge
2011-10-25 01:52:12 +01:00
2d4ba1a871
Merge commit '03102864f0d9851b6937ca5472f48f10ec861a26' into bigmerge
2011-10-25 01:52:00 +01:00
b4395143e7
Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 01:50:07 +01:00
e28e2d24c7
Add new EventQueueTests with basic test to check that adding a client registers an http poll
2011-10-24 22:23:41 +01:00
4c9400e646
Add optional getauthinfo and setauthinfo authentication service calls.
...
These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default)
These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
2011-10-24 21:40:36 +01:00
655aee44c4
Rename some of the example commented out server names to mygridserver.com like all the others.
...
This is to make it easier to change all these names at once, where all grids services are running from the same location.
Also rearranges some lines in [Modules] so that StandaloneCommon.ini.example and GridCommon.ini.exmaple are consistent.
2011-10-22 02:51:41 +01:00
229ca09b79
Make config comments about choosing assetcache modules clearer.
...
OpenSim needs an asset cache. Running without one will cause problems.
Thanks to Ai Austin for the suggestions in http://opensimulator.org/mantis/view.php?id=4850
2011-10-22 02:47:53 +01:00
d9184eceab
Add option to allow remote http calls to setpassword in the AuthenticationService.
...
This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini
Default is false as before.
2011-10-19 19:03:17 +01:00
9d59b285bb
Allow an http call to set account details if AllowSetAccount = true in [UserAccountService].
...
As before, default is false to not allow these calls.
2011-10-19 00:06:40 +01:00
c85a780583
Provide an option to allow remote calls to the CreateUser method on the UserAccountService
...
Default is false, as before.
Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces.
Only Ruths can be created at present.
Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
2011-10-18 22:51:40 +01:00
352002fd0b
Set enable_adaptive_throttles = true in OpenSimDefaults.ini
...
As discussed in http://lists.berlios.de/pipermail/opensim-dev/2011-October/010599.html and the preceeding thread mails,
the aim of this setting is to avoid overloading the viewer UDP connection where the client is failing to ack packets.
Please mantis any anomalous viewer connection behaviour which wasn't there before.
2011-10-17 22:11:56 +01:00
3843efe478
Restore [Startup] physical_prim flag which can stop any prims being subject to physics
...
This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed.
Default for this flag is true as previously.
2011-10-15 02:42:43 +01:00
bea65b06a4
Add back the missing bin/addon-modules directory that I somehow managed to accidentally delete in 2fbc98f (Jul 7 2011)
2011-10-14 23:32:15 +01:00
03102864f0
change default ODE world_stepsize to 0.0178 from 0.02
...
This exactly fits five ODE steps in the default frame time (0.089).
This means that ODE execution time now matches the default minimum frame time.
This eliminates errors between distance travelled as calculated by ODE in clear air and simple extrapolation.
On the old values, ODE would actually do calculations over 0.1 seconds rather than 0.089.
This means that once the avatar is at top speed, no additional packets need to be sent for smooth movement, since no error develops between server and viewer.
This approach replaces the tweaks previously discussed on the opensim-dev mailing list
2011-10-14 21:11:00 +01:00
4e7d4330c2
Expose minimum frame time and update periods for experimentation.
...
Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change
Defaults are the same as previously.
More information to come on opensim-dev shortly.
Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested.
2011-10-13 23:47:37 +01:00
35def547f7
Merge branch 'master' into bigmerge
2011-10-12 16:45:48 +01:00
4b7b9e81f7
Make it possible to disable the HG linker. On non-HG systems it spits yellow
...
spam, so it should not load unless HG is desired.
2011-10-12 15:41:59 +01:00
0faa8db0ef
Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled
...
by default) the config default. This way it will work for current cases while
allowing the use of other groups modules without config bloat.
2011-10-12 09:23:57 +01:00
c9fae6f8a2
Disable Flotsam groups messaging module in our config base
2011-10-12 09:27:48 +02:00
d2dc2316c2
Merge branch 'master' into bigmerge
2011-10-12 09:26:35 +01:00
ad46ad1ab2
Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge
2011-10-12 07:23:54 +01:00
1c67c13d77
Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge
2011-10-12 07:09:10 +01:00
2c23fc9e68
Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge
2011-10-12 07:09:04 +01:00
4a284110e6
Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge
2011-10-12 07:07:12 +01:00
e3f6344f54
Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge
2011-10-12 01:29:31 +01:00
ae8504f8d9
Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge
2011-10-11 23:15:00 +01:00
20a2b5d63c
Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmerge
2011-10-11 23:14:54 +01:00
d1e681f682
Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2011-10-11 23:14:23 +01:00
5536cdf90c
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
2011-10-11 23:01:52 +01:00
d8b78ca498
Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge
2011-10-11 22:53:38 +01:00
1b2849319c
Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge
2011-10-11 22:52:15 +01:00
36ec9f0e94
Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge
2011-10-11 22:22:49 +01:00
b9de3b7f5b
Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge
...
Conflicts:
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
prebuild.xml
2011-10-11 22:22:34 +01:00
071c3fe721
Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge
2011-10-11 22:15:44 +01:00
45ce8db5db
Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge
2011-10-11 22:14:17 +01:00
117d24be54
Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge
2011-10-11 21:45:01 +01:00
f1fa059b37
Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge
2011-10-11 21:32:24 +01:00
288f5bd727
Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmerge
2011-10-11 21:29:38 +01:00
9d22110c23
Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge
2011-10-11 21:22:58 +01:00
8114f895c2
Provide a way to turn the MonitorModule on and off
...
Default is currently on since this is the historical setting
2011-10-10 22:17:29 +01:00
5551542c28
Improve explanation of access_ip_addresses in [RemoteAdmin] to say that there are no restrictions if not set
2011-10-08 01:39:27 +01:00
4073cd6ced
Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.
...
Also adds password check to some functions where this was missing and fixes some parameter checking.
This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me.
Thanks Michelle Argus.
2011-10-08 01:23:26 +01:00
5bc6503ae1
Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in OpenSim.ini.example
2011-10-07 21:43:52 +01:00
f1986d54bb
Clarify explanation of DeleteScriptsOnStartup switch in [XEngine].
2011-10-04 22:48:28 +01:00
844b4f3a16
copy config information on allow/disallow individual os functions into OpenSim.ini.example
...
I this is generally useful rather than a 'default' setting
2011-09-30 23:55:02 +01:00
6d0978594d
remove unused postgresql dll
2011-09-30 18:58:26 +01:00
e742cffe15
Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.
...
This is for debugging purposes. Defaults to Attachments Enabled
2011-09-30 01:19:22 +01:00
39d7945efc
Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.
...
I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
2011-09-24 01:59:02 +01:00
5364607005
Clarify explanation of the "DeleteScriptsOnStartup" config switch and add this to OpenSim.ini.example since it's very useful if you're not updating OpenSim from source.
...
On reflection, "DeleteScriptsOnStartup" isn't a great name since it suggests real script deletion rather than compiled versions.
2011-09-24 00:22:23 +01:00
ceb09cde4d
Correct asset id of library default iris texture.
...
For this change to show up you will need to clear viewer cache.
2011-09-23 21:57:52 +01:00
27af016381
Add BulletSim physics option details to OpenSim.ini.example. Marked as in development and experimental.
2011-09-17 01:13:07 +01:00
f950338124
Remove old bullet DotNET and X libraries in preparation for BulletS
...
These weren't working properly anyway.
You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
2011-09-17 01:09:25 +01:00
6f69ab3bcb
Add back BulletSPlugin.dll.config that I somehow managed to delete today in a00327d
2011-09-17 00:49:26 +01:00
744602f6d1
Revert "uncomment Standalone config in OpenSim.ini.example."
...
This reverts commit 44a491f36b
2011-09-17 00:10:19 +01:00
c38b25a1d2
Fix base_hair.dat to actually contain the base hair asset rather than base eyes by mistake.
...
I must have had it cached last night.
This now makes completely fresh avatar setups appear properly (remember to wipe viewer cache and server cache as well as database).
As a bonus, eyes now appear by default too!
2011-09-16 21:43:58 +01:00
a00327d0e5
Fix build errors on Windows by adding missing OpenSim.Services.Base reference
2011-09-16 19:54:23 +01:00
37370a8102
On standalone, by default create the necessary minimum body parts and clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d
...
This is controlled by the CreateDefaultAvatarEntries switch in the [UserAccountService] section of config-include/Stnadalone.ini
This is left as false in grid mode
2011-09-16 00:30:37 +01:00
c4efb97d49
Write code to create minimum necessary body parts/clothing and avatar entries to make a newly created user appear as a non-cloud on viewer 2
...
Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries.
Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim.
Default is currently off. My intention is to switch it on for standalone shortly.
This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities.
Need to fix creation of suitable entries for users created as estate owners on standalone.
Avatars still appear with spooky empty eyes, need to see if we can address this.
This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461 ) which can be used.
2011-09-15 22:59:29 +01:00
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
44a491f36b
uncomment Standalone config in OpenSim.ini.example.
...
This is to make my life easier when creating releases.
I think that it also gives a better story for anybody newly compiling from source.
2011-09-12 20:31:14 +01:00
9f75eaf50e
Fixed BulletSim config files for Linux *.so libraries.
2011-09-04 21:42:33 +02:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
91f59f246f
also get "nant clean" to remove old .mdb from .exe and .dll
2011-08-30 23:20:54 +01:00
9e4153f16b
Hack our copy of Prebuild to just delete the dlls and mdbs in Physics, so as to leave the new config file
2011-08-30 23:17:02 +01:00
b705ad477e
BulletSim: update values in OpenSimDefaults.ini to the same as defaults in the source.
2011-08-30 13:49:50 -07:00
b281163457
BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read.
2011-08-30 13:19:53 -07:00
21708b832b
BulletSim: add mesh representation. Use meshes for static objects and switch to hulls for physical objects.
2011-08-26 15:51:21 -07:00
23f10f1d22
Merge branch 'master' into bulletsim
2011-08-26 15:23:46 -07:00
2307d9a2f9
minor: Add explanative text for the new currency parameter. Convert some tabs to spaces
2011-08-22 00:58:11 +01:00
384cb79a1a
Merge branch 'master' into bulletsim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2011-08-19 14:49:16 -07:00
a0a0c64cb1
Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.dll (patched version) instead
2011-08-19 03:02:17 +01:00
fef73a1a10
BulletSim: add runtime setting of physics parameters. Update default values.
2011-08-18 14:32:09 -07:00
eb431f91c0
Add terminating quotes to http addresses in [SimulatorFeatures] section of OpenSim.ini.example.
...
As per http://opensimulator.org/mantis/view.php?id=5638 . Thanks DutchGlory.
2011-08-16 21:50:15 +01:00
96ee87e39b
Change the default standalone asset cache to be the Flotsam asset cache (with memory caching not enabled).
...
This matches the GridCommon setting and is the best tested setting. It appears to work fine on standalone.
Also, add information that the flotsam asset cache is the recommended cache, since it is most used and actively maintained.
2011-08-16 21:38:51 +01:00
e29e50798a
minor: Add warning to OpenSim.ini.example about bullet plugins not working right now, pending the new plugin
2011-08-16 21:31:48 +01:00
70ea625447
Added optional Login Service parameter "Currency" to be able to change the currency name shown in the viewer.
2011-08-14 18:20:20 +02:00
e19843a0ee
WorldMap: Added map item for Land-for-Sale. Implemented backlist item timeouts (default 10 minutes; see also new config file setting BlacklistTimeout) and removing backlisted neigboring regions that have been restarted from the blacklist.
2011-08-14 17:45:23 +02:00
c3f579046c
Merge branch 'master' into bulletsim
2011-08-05 11:13:02 -07:00
7640b5abf6
BulletSim: Parameters settable from ini file. Linksets. Physical property value tuning
2011-08-05 11:01:27 -07:00
c1c0d780ee
correct config comments mistakes
2011-08-03 04:36:25 +01:00
797def8aa4
Put config to enable disable [NPC] module.
...
Default is disabled. You will need to explicitly enable to toy with this.
2011-08-03 04:33:45 +01:00
59f548cda8
Get osNpcCreate appearance working with avatars that are currently in the scene.
...
Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing).
Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing.
Extended TestCreate() to check this.
2011-08-01 23:41:29 +01:00
835352aee9
Make it clearer what the save_crashes setting in [Startup] actually does.
2011-07-30 01:05:30 +01:00
a95f2fe4b3
BulletSim: Update dlls
2011-07-25 10:11:55 -07:00
ea58aee338
Change default AllowScriptCrossings config setting to true.
...
When this setting is false and other defaults haven't been changed, scripts entering the simulator from another sim are automatically restarted but their state is not preserved.
When this setting is true, state that accompanies the script is reloaded (e.g. if a script had a variable i = 1 when leaving the source region, it will still have i = 1 on the destination region).
This setting does not affect crossings when regions are run in the same simulator. In this case, state is already preserved.
2011-07-23 02:31:00 +01:00
4eaca4884e
Fixed serverside_object_permission default value confliction
2011-07-23 02:26:13 +01:00
f0895028e9
Remove manually permissions settings on all current library items so that they use the defaults instead.
...
Some items had completely wrong permissions - this is easier than correcting them all.
The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts)
2011-07-23 02:13:11 +01:00
fcaa4f6012
Revert "Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default)."
...
There actually are uses for this. I will correct the perms instead since some entries appear to be wrong.
This reverts commit 667b54f5a2
2011-07-23 02:05:51 +01:00
667b54f5a2
Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default).
...
Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes.
2011-07-23 01:59:14 +01:00
869883f2dc
BulletSim: fix buoyancy for prims. Start of configurable physics parameters.
2011-07-22 15:23:57 -07:00
5ffec1cd64
Pass collisions and updates in pinned memory (saves marshaling).
...
Fix folding feet by using collision normals.
Add constraint specification.
2011-07-22 10:23:40 -07:00
Melanie