9501925397
Fix a merge issue
2012-10-12 19:23:35 +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
8c40215834
BulletSim: only use native sphere shape if it is a sphere.
2012-10-12 07:41:31 -07:00
fba59d905c
Get rid of accidental scene start left in ScenePresenceAutopilotTests
2012-10-12 03:20:27 +01:00
b9c2a1508e
Fix problems with regression tests by allowing invoke of Update() with a finite number of frames even if the scene isn't active.
2012-10-12 03:19:12 +01:00
ab7b7c5d3d
Get Watchdog to log thread removal
2012-10-12 02:59:28 +01:00
b5a3c74a5c
Add "active true|false" to "debug scene" console command.
...
This allows the scene update and maintenance loops to be started and stopped for debug purposes.
2012-10-12 02:52:08 +01:00
b7e75d467c
minor: Use && instead of & when deciding whether to print Improve/ObjectUpdate packet out messages when debug is turned on.
...
Practical effect is probably none.
2012-10-12 02:10:30 +01:00
8873a4a8fc
minor: Fix bug in categorization of blocks reused stat from packetpool
2012-10-12 01:59:47 +01:00
1e86c58822
Remove now unnecessary OpenSim.Framework.Console reference from Monitoring.
...
Properly resolve circular reference which no longer appeared in Mono build as there were no using statements for it.
2012-10-12 01:58:46 +01:00
21d0cbf703
Add AgentUpdate to PacketPool. This is the most common inbound packet from viewers.
2012-10-12 01:39:37 +01:00
87a87ebb9a
BulletSim: fix problem with some shapes (like cylinders) being implemented as cubes.
2012-10-11 17:37:27 -07:00
3af2095cbc
minor: Comment out "Client requested range for texture ... but" message. This is not useful during normal operation.
2012-10-12 00:27:12 +01:00
59a17ad676
Fix percentage stats to multiply by 100. Adjust container name for packetpool stats.
2012-10-12 00:26:15 +01:00
8a402850dd
Enable reuse of data blocks for ImprovedTerseObjectUpdate using existing Packetpool code.
2012-10-12 00:21:45 +01:00
387ce8ef35
Fix build break by moving OpenSim.Framework.Console back below HttpServer in the build order.
...
Luckily, it turns out Framework.Monitoring doesn't need to reference Console directly.
2012-10-12 00:10:51 +01:00
2e9ef015f7
Fix packetpool for ImprovedTerseObjectUpdate packets.
...
These were neither being returned or in many places reused.
Getting packets from a pool rather than deallocating and reallocating reduces memory churn which in turn reduces garbage collection time and frequency.
2012-10-11 23:58:37 +01:00
f5f5f2e3fb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-11 23:56:03 +01:00
1f2472d0fc
Extend "show stats" command to "show stats [list|all|<category name>]"
...
This allows different categories of stats to be shown, with options to list categories or show all stats.
Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism.
This commit also adds percentage stats for packets and blocks reused from the packet pool.
2012-10-11 23:28:53 +01:00
b63134764f
BulletSim: update the DLLs and SOs
2012-10-11 14:01:35 -07:00
b24190ec98
BulletSim: remove some unused API2 calls because they were removed from Bullet 2.81
2012-10-11 14:01:29 -07:00
5b82f18d64
BulletSim: normalize physics FPS to 45 (for real this time).
2012-10-11 14:01:25 -07:00
a86fedd25f
BulletSim: normalize physics FPS to 45.
2012-10-11 14:01:22 -07:00
3a458e2a36
BulletSim: Use full linkset mass when computing vehicle gravity force. Add taint-time specification to new AddForce().
2012-10-11 14:01:18 -07:00
919569f6ec
BulletSim: Change defaults for constraint CFM and ERP to make large linksets more rigid. Remove mass calculation for terrain (it should stay a static object).
2012-10-11 14:01:14 -07:00
a791620622
BulletSim: cosmetic changes (comments and renaming). Give mass to terrain to improve interactions.
2012-10-11 14:01:10 -07:00
68698975f1
BulletSim: Add Force* operations to objects to allow direct push to engine.
...
Update BSDynamics to use same (don't want to delay updates til next taint-time.
Suppress queuing a taint update for position and orientation calls if value
does not change.
Move Bullet timing statistics call from C# back to C++ code.
Throttle taints per simulation step and add parameter to set.
By default, don't create hulls for physical objects. Add a
parameter to turn on and off.
2012-10-11 14:01:07 -07:00
87825b0abe
BulletSim: Fix crash when linking large physical linksets.
...
Properly remove and restore linkage constraints when upgrading
a prim's mesh to a hull.
Lots more debug logging.
Definitions and use of Bullet structure dumping.
Centralize detail logging so a Flush() can be added for debugging.
2012-10-11 14:01:03 -07:00
311a03befa
Updated Robust.HG.ini.example. Thanks Austin Tate.
2012-10-11 13:57:29 -07:00
b768c35f6f
Assign endVector before control leaves ObjectCommandsModule.TryParseVectorRange() in order to fix mono 2.4.3 compile failure.
...
This doesn't fail the compile on mono 2.10.8.
2012-10-11 00:05:34 +01:00
efd9791506
Add "delete object pos <start-coord> to <end-coord>" console command.
...
This allows one to delete objects within a certain volume.
See help on console for more details.
2012-10-10 23:30:48 +01:00
756ac4f321
Correct osSetContentType() threat check to query osSetContentType rather than osSetResponseType
2012-10-10 01:39:47 +01:00
11d8119a21
Remove osDropAttachment threat level check wrongly placed in OSSL_Api.ShoutErrorOnLackingOwnerPerms.
2012-10-10 01:37:57 +01:00
528085adef
minor: Add method doc to EventManager.OnNewClient, OnClientLogin, ClientClosed, OnRemovePresence that any long-running operations should be launched on a thread separate to the event thread.
2012-10-10 00:48:20 +01:00
e76b01a201
Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to prevent an inactive connection being left behind if the user closes the viewer whilst the connection is being established.
...
This should remove the need to run the console command "kick user --force" when these connections are left around.
2012-10-10 00:26:43 +01:00
a3c0e3ed26
minor: elaborate method doc on Scene.NewUserConnection()
2012-10-09 22:19:47 +01:00
785671e242
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-09 17:29:44 +01:00
40bf789ad7
Disambiguate use of RegionFlags in NullRegionData
...
This was not necessary with the nant build but is for xbuild, since xbuild includes associated project DLLs
And so picks up OpenMetaverse.dll even though it isn't referenced by OpenSim.Data.Null.dll
2012-10-09 17:20:01 +01: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
ef3cc2e507
minor: Add documentation to IGridService.GetRegionFlags()
2012-10-09 01:40:55 +01:00
a0d047413b
Once again, forgot to add a file.
2012-10-09 01:37:02 +01:00
73c9abf5f2
Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
2012-10-09 01:35:27 +01:00
d342adaa87
Merge branch 'master' of git://opensimulator.org/git/opensim
2012-10-08 15:25:26 -07:00
f65218f826
Fix build break
2012-10-08 19:02:21 +01:00
839aa57b42
Update the example
2012-10-08 18:01:56 +01:00
ff92330523
Add a ServiceList section to Robust .ini to get rid of the long string
2012-10-08 17:57:22 +01:00
90a39379f0
Allow other whitespace characters than spaces in Robust connection string
2012-10-08 17:36:40 +01:00
0c5b36a4f7
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 03:12:21 +01:00
9be2d5c77d
Fix merge issues
2012-10-07 03:03:24 +01:00
Melanie