Commit Graph

22071 Commits (5d4b7d537d872d27c394402d3483c2a9bd2153f0)

Author SHA1 Message Date
UbitUmarov db00402fa8 make sure a buffer is closed, and changed a misleading log msg 2012-10-05 00:14:49 +01:00
Diva Canto 276fdbc1b3 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-04 15:33:17 -07:00
Diva Canto 5b90f5bb17 One more abstraction for GridUser so that it can be overridden in a sub-class. 2012-10-04 15:32:49 -07:00
Melanie d5ea203f93 Fix threading in remote asset connector 2012-10-05 00:15:55 +02:00
Melanie 637e9a10db Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-10-04 20:16:23 +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 b977f962fa Allow default animation to be stopped to be replaced with another one.
Fixes Mantis #6327
2012-10-04 15:42:52 +01:00
Melanie efb9b7014e Allow default animation to be stopped to be replaced with another one.
Fixes Mantis #6327
2012-10-04 15:20:04 +02:00
ubit 717802ab09 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 09:16:21 +02:00
UbitUmarov 89d342b5ce more changes and more non active code 2012-10-04 08:14:52 +01:00
ubit 840d56dcec Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 06:30:51 +02:00
UbitUmarov 113549c2e9 apply cmic fix to multi layer wearables 2012-10-04 05:29:32 +01:00
ubit fa5fd77823 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 06:06:21 +02:00
UbitUmarov 893b44497d Merge branch 'avination' into ubitwork 2012-10-04 05:05:57 +01:00
ubit 5bf8c54207 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 05:59:03 +02:00
UbitUmarov 51e1830f86 more changes. Most code not in use 2012-10-04 04:55:53 +01:00
Justin Clark-Casey (justincc) aa52c8b20f Output monitor data in response to console command on MainConsole.Instance rather than m_log
This should really be happening for all console commands (though many don't).
However, things might get difficult if both a console command and other code invoke the same paths.
2012-10-04 02:17:57 +01:00
Justin Clark-Casey (justincc) 3d36a6d55c Add generic PercentageStat.
Not yet used.
2012-10-04 01:27:40 +01:00
Justin Clark-Casey (justincc) e717398f6c Add experimental "slow frames" stat, available in "show stats" and via the monitoring module.
This increments a SlowFrames counter if a frame takes over 120% of maximum time.
This commit also introduces a generic OpenSim.Framework.Monitoring.Stat which is available to any code that wants to register a statistic.
This is more granualar than asking objects to create their own reports.
At some point this will supersede earlier IMonitor and IAlert facilities in MonitoringModule which are only available to scene code.
2012-10-04 00:32:42 +01:00
teravus a2ab3b88de Soliciting for comments on smoothness of physics objects for this build.
This introduces expected contact point hints to the ODE Collider to better determine when to throttle updates as excessive.   This /should/ smooth physics objects out again, however, I cannot know every configuration of OpenSimulator, so I'm requesting that testers please examine this change on their build.
Thanks!
2012-10-03 18:30:44 -04:00
ubit 57bfd38e2a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 00:18:57 +02:00
UbitUmarov a9f2bc150f missing changed file 2012-10-03 23:18:35 +01:00
ubit d657c48abf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 00:17:19 +02:00
UbitUmarov 9988558ec1 meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled
for all physics engines)
2012-10-03 23:14:56 +01:00
ubit 33b2096c5f Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-03 21:38:35 +02:00
UbitUmarov 4f51cc325c making meshworker have more work.. 2012-10-03 20:36:41 +01:00
ubit 149c2adf7d Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-03 20:35:29 +02:00
UbitUmarov 7137b234b4 introduce a ODEMeshWorker class, should be pure cosmetic changes for now 2012-10-03 19:33:28 +01:00
Mic Bowman b9baab5521 Fix the use of the wrong index when locating the assets associated
with wearables. The fact that this hasn't caused problems earlier
suggests either that no one is using multiple layers of wearables or
that this code is useless because the assets are coming in with the
wearables request.
2012-10-03 10:45:57 -07:00
Melanie 8a552ac907 Merge branch 'master' into careminster 2012-10-03 17:40:13 +01:00
Melanie bf565e9747 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-03 17:40:11 +01:00
Melanie 653a98e891 Fix a viewer crash issue
Conflicts:

	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-03 17:39:13 +01:00
Melanie fdacb88b29 Fix a viewer crash issue 2012-10-03 17:11:02 +02:00
teravus e56ef2720e I propose that 0.5m/step change for linear velocity is too big of a change to control the reporting of a new angular velocity. I think that this could be here for one of two reasons, 1. vehicles and llMoveToTarget with axis lock, or 2. To attempt to make things look more stable in the physics scene then they really are, however, this also really affects the angular velocity reporting negatively causing things to spin wildly and jump back into place repeatedly. To compromise, if the prim is a vehicle or is being used as a motor target, the original functionality is still applied. If that's not the case, angular velocity is reported with a linear velocity of 0.02m/step. To be clear on the effect of the physical world... When you push things, there's still a lag time where you walk into the object but once the object is in motion, it begins to move as you would expect so results in slightly more realistic motion. 2012-10-03 02:30:23 -04:00
teravus df3d1d1301 Minor Modification, switch /2 to 0.5f in ODEPrim.Velocity 2012-10-02 23:14:35 -04:00
Robert Adams a5b8359b8e BulletSim: fix crash on load that showed up on 32bit Linux. 2012-10-02 17:04:33 -07:00
Melanie 23d5bafa7f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-10-03 00:24:33 +01:00
Melanie f433ee317b Attempt to fix Mantis #6311. Honor a destination folder if one is given 2012-10-02 23:03:52 +01:00
Melanie ca5c0814f4 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-10-02 23:02:53 +01:00
Melanie f1886c449c Attempt to fix Mantis #6311. Honor a destination folder if one is given 2012-10-02 23:02:01 +01:00
SignpostMarv a1679517d3 correcting typo 2012-10-02 22:14:47 +01:00
SignpostMarv f555febdb7 taking into account the recent introduction of implicit operators 2012-10-02 22:14:46 +01:00
SignpostMarv ce7694c108 added perms checking, duplicated functionality to methods that do not require perms and have higher threat level 2012-10-02 22:14:46 +01:00
SignpostMarv c677c04f10 fixing copypasta 2012-10-02 22:14:46 +01:00
SignpostMarv 35b7c80e0b implementing osDropAttachment & osDropAttachmentAt 2012-10-02 22:14:46 +01:00
SignpostMarv e81e19a3b4 string format arguments in wrong order 2012-10-02 22:11:40 +01:00
Robert Adams 210f227fe6 BulletSim: Make parameter value defaults match what should be the default and what is in OpenSimDefaults.ini. Comment and debug printout changes. 2012-10-02 11:14:15 -07:00
Robert Adams ce47d0c454 BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its children of BSPrim and BSCharacter. 2012-10-02 11:14:09 -07:00
Robert Adams d8a786870b BulletSim: Fix problem where box shapes were not being rebuilt if the shape type changed. 2012-10-02 11:14:03 -07:00
Robert Adams ce97ebdc88 BulletSim: Fix linkset problem where delayed manipulations of child objects was using the child shape address at call time rather than the one created at taint time. 2012-10-02 11:13:57 -07:00