ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,993 Commits 5 Branches 88 Tags
d2cb2da7909aa79260af52a7abbc7b491c5495c2
Commit Graph

1892 Commits

Author SHA1 Message Date
Melanie
c4c6121752 Merge branch 'master' into careminster 2012-11-22 03:17:33 +00:00
Robert Adams
56ef180c92 BulletSim: update DLLs and SOs. No functional changes. Only the parameter block format changed. 2012-11-21 16:44:02 -08:00
Robert Adams
cbc7e7bf85 BulletSim: Make avatar capsule so it is not circular. 
Simple attempt to make avatars better shaped.
Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth'
and 'avatarCapsuleDepth'.
More tweeking to avatar height calculation. A little better but
short avatar's feet are above the terrain and tall avatar's feet
are a little below the ground.
 2012-11-21 16:43:53 -08:00
Melanie
45eedb635a Merge branch 'master' into careminster 2012-11-20 20:25:15 +00:00
BlueWall
665f79e15c Expose configuration options for the XmlRpcGridRouter 
Expose configuration options for the XmlRpcGridRouter to allow simulators to register llRemoteData channels with an external routing service
 2012-11-19 21:51:37 -05:00
Melanie
9f2d232c71 Merge branch 'master' into careminster 2012-11-19 22:53:03 +00:00
Robert Adams
079a1e704f BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim libraries with code stripped of the obsolete code. 2012-11-18 18:17:30 -08:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Justin Clark-Casey (justincc)
7861090a17 Replace old Prebuild.exe accidentally added back in f977291 with one built without <copy> nant target generation and on mono 2.4.3 2012-11-14 02:44:10 +00:00
Justin Clark-Casey (justincc)
f977291a44 Replace previously updated Prebuild.exe with one built directly with mono 2.4.3 2012-11-14 02:40:37 +00:00
Justin Clark-Casey (justincc)
90c6d2e50c Stop Prebuild from generating <copy> statements which unnecessarily copy files into bin/Debug or bin/Release 
nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug
However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39).
Which makes nant time-consumingly copy these files when the aren't actually used.
Tested removal of <copy> on both nant 0.91 and nant 0.92
Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.
 2012-11-14 02:25:07 +00:00
Melanie
d84de8c9b6 Merge branch 'master' into careminster 2012-11-11 21:16:58 +00:00
PixelTomsen
a180fef99e remove entry OpenGridProtocol in OpenSimDefaults.ini - module was deleted 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2012-11-11 11:16:52 -08:00
Melanie
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
Diva Canto
4ac857f902 One more module: EventQueueGetModule. Also making it non-optional for this dll. 2012-11-10 08:48:31 -08:00
Melanie
b3e99a4d48 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
 2012-11-08 04:51:00 +00:00
Robert Adams
6df9d40d99 BulletSim: update the DLLs and SOs 2012-11-06 18:17:00 -08:00
Melanie
c623e35805 Merge branch 'master' into careminster 2012-11-04 22:44:42 +00:00
Robert Adams
895d28f14d BulletSim: update the DLLs and SOs 2012-11-03 21:28:23 -07:00
Melanie
d0473b73da Merge branch 'master' into careminster 2012-11-03 15:38:47 +00:00
Diva Canto
7412795a0b HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE. 2012-11-02 08:05:56 -07:00
Justin Clark-Casey (justincc)
ce7beb6f20 Add [AssetService] AllowRemoteDeleteAllTypes (default false). 
This allows a closed grid to delete asset types other than maptile remotely.
Only operational if AllowRemoteDelete = true also.
Defaults to false - do not enable if anybody other than you can make asset service requests.
 2012-11-02 01:41:38 +00:00
Melanie
e7a6328ea4 Merge branch 'master' into careminster 2012-11-01 15:52:32 +00:00
Justin Clark-Casey (justincc)
ccb17eab71 Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit version from libopenmetaverse commit 3731ee4 
This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries.
However, the reverse is also true.
If OpenSimulator stops working for you then please complain!  Long term alternative is probably to build a fat binary with both architectures.
 2012-11-01 03:31:30 +00:00
Melanie
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
SignpostMarv
a09cba6da3 refactoring to use assembly:classname style of configuration 2012-10-29 23:39:01 +00:00
SignpostMarv
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
SignpostMarv
e0b5a3cd90 tweaking configuration logic so that the INonSharedRegionModule will load by default 2012-10-29 23:39:01 +00:00
Melanie
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
Oren Hurvitz
424f68b64b Changed duplicate Asset ID's to unique ID's in CollisionSoundsAssetSet.xml 2012-10-25 23:30:48 +01:00
Robert Adams
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
Melanie
6ad8d3c43f Merge branch 'master' into careminster 2012-10-20 02:33:24 +01:00
Justin Clark-Casey (justincc)
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
Robert Adams
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
Melanie
ad60a29c93 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-10-17 00:03:02 +01:00
Justin Clark-Casey (justincc)
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
Melanie
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
Robert Adams
b63134764f BulletSim: update the DLLs and SOs 2012-10-11 14:01:35 -07:00
Diva Canto
311a03befa Updated Robust.HG.ini.example. Thanks Austin Tate. 2012-10-11 13:57:29 -07:00
teravus
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
teravus
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
Melanie
839aa57b42 Update the example 2012-10-08 18:01:56 +01:00
Melanie
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
Mic Bowman
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
Melanie
8a552ac907 Merge branch 'master' into careminster 2012-10-03 17:40:13 +01:00
Robert Adams
a5b8359b8e BulletSim: fix crash on load that showed up on 32bit Linux. 2012-10-02 17:04:33 -07:00
Melanie
944b1ed237 Merge branch 'avination' into careminster 2012-09-29 21:47:08 +01:00
Melanie
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
Robert Adams
7f96bb601a BulletSim: update SOs and DLLs 2012-09-28 12:51:47 -07:00
Robert Adams
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