Commit Graph

19925 Commits (74a341fd22b7478c51408441c0e7f057e78f835c)

Author SHA1 Message Date
BlueWall cd64da8746 Cleanup 2013-06-05 18:41:55 -04:00
Justin Clark-Casey (justincc) 47ffa12078 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-06-05 22:26:42 +01:00
Justin Clark-Casey (justincc) f41fc4eb25 Avoid a deadlock where a script can attempt to take a ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order.
This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless).
The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region.
This looks to address http://opensimulator.org/mantis/view.php?id=6557
2013-06-05 22:20:48 +01:00
BlueWall 10572b78f8 Remove a couple of orphaned lines 2013-06-05 15:10:53 -04:00
BlueWall b4f472c4fa Make locking more uniform 2013-06-05 15:08:25 -04:00
Robert Adams b5d0ac4c42 BulletSim: default PhysicsTimeStep to same as the simulator's
heartbeat timestep when running the physics engine on a separate
thread. This reduces the occurance of heartbeats that happen when
there is no physics step which is seen as vehicle jerkyness.
2013-06-05 07:12:14 -07:00
Robert Adams 0c971d148c BulletSim: fix corner case when rebuilding a compound linkset while
a mesh/hull while a mesh or hull is being rebuilt when its asset
is fetched. This fixes a 'pure virtual function' crash when changing
physical state of complex linksets that include many meshes.
2013-06-05 07:09:43 -07:00
Diva Canto 43d804b998 New HttpServer_OpenSim.dll with increased limits on number of connections, requests, etc. 2013-06-04 12:27:22 -07:00
Robert Adams 07058b044b BulletSim: experimental movement of physics execution off of heartbeat
thread. Off by default until more testing.

Setting "[BulletSim]UseSeparatePhysicsThread=true" causes the physics
engine to be called on its own thread and the heartbeat thread only
handles the reporting of property updates and collisions. Physics frame
rate is about right but physics execution time goes to zero as accounted
by the heartbeat loop.
2013-06-01 14:52:44 -07:00
BlueWall d7fa9f671e Adding standard OpenSim header to source files 2013-05-31 22:03:27 -04:00
BlueWall ba2f13db63 Adding back the BasicProfileModule 2013-05-31 21:19:15 -04:00
Justin Clark-Casey (justincc) 217c7d1140 Remove unnecessary m_scenes and m_scene from AsyncCommandManager.
These were private and the sole point of use (to know when to load config for the first time) can be done by looking at script engines instead.
2013-05-31 23:00:10 +01:00
Justin Clark-Casey (justincc) 921ad8704e Lock areas of AsyncCommandManager where multiple threads could try to access/update the same static structures simultaneously.
This is possible where there is more than one scene (multiple copies of the same script engine) and/or more than one script engine being used.
These operations are not thread safe and could be leading to the exceptions/problems seen in http://opensimulator.org/mantis/view.php?id=6651
This also prevents a small race condition where more than one AsyncLSLCmdHandlerThread could be started.
2013-05-31 22:50:15 +01:00
Justin Clark-Casey (justincc) 00c1586ff8 refactor: Remove unused AsyncCommandManager.PleaseShutdown 2013-05-31 18:12:36 +01:00
BlueWall bf03523323 Fill in fields with default values on profile creation 2013-05-31 10:40:47 -04:00
BlueWall 5b3a443125 Trigger Jenkins build 2013-05-30 22:52:17 -04:00
Robert Adams 924a5df25f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-30 19:20:36 -07:00
BlueWall e85c70223a Merge branch 'work' contains UserProfiles with Robust service and updates region module using JsonRpc messaging. Requres no databse changes (but backup existing data before use). 2013-05-30 22:16:42 -04:00
Robert Adams 4d32ca19bf Trigger OnScenePresenceUpdated when the avatar's animations change. 2013-05-30 19:16:36 -07:00
Robert Adams 48a175eff7 Add methods to Animation and AnimationSet for easier manipulation and
display of groups of animations (Equal(), ToString(), FromOSDArray(), ...).
No functional change to animations.
2013-05-30 19:16:34 -07:00
Robert Adams 439f11cc3c Add region heartbeat start event to complement heartbeat end event.
This allows object modification before the usual heartbeat operation.
2013-05-30 19:16:31 -07:00
Robert Adams 3aa2fb9928 BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini and
replace with things someone might actually want to tune (avatar height, ...).
2013-05-30 19:16:29 -07:00
Justin Clark-Casey (justincc) 46335b103e If an exception occurs in the AsyncCommandManager loop, spit it out to log rather than silently swallowing it.
This might help diagnose the cause of http://opensimulator.org/mantis/view.php?id=6651 where sometimes scripts fail to start on region start.
2013-05-30 23:51:35 +01:00
BlueWall 328883700a UserProfiles
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
2013-05-30 17:59:18 -04:00
Justin Clark-Casey (justincc) 6b88a665d3 minor: fix warnings in GodsModule that were due to duplicate using statements 2013-05-30 22:43:52 +01:00
Justin Clark-Casey (justincc) 12a3b85561 Fix passing of voice distance attenuation to the Vivox voice server.
Because of a typo, this wasn't being done at all - now the 'default' value as described in OpenSimDefaults.ini of 10m is passed (vivox_channel_clamping_distance)
Thanks to Ai Austin for spotting this.
2013-05-30 22:20:02 +01:00
Justin Clark-Casey (justincc) 8f9a726465 If on a sit request we sit the avatar on a different prim in a linkset for some reason (e.g. because it has a sit target), then send the actual sit prim UUID to the viewer rather than the requested one.
This purports to fix the issue described in http://opensimulator.org/mantis/view.php?id=6653 where the camera can end up following the requested sit prim rather than the actual.
The original spot was by Vegaslon, this commit just goes about it in a slightly different way
This commit also makes m_requestedSitTargetUUID to be the actual UUID, which is consistent with m_requestedSitTargetID which was already doing this.
However, this adjustment has no practical effect since we only currently need to know that there's any requested sit UUID at all, not which one it is.
2013-05-30 19:27:20 +01:00
Justin Clark-Casey (justincc) cc7aa88b26 Try caching the user name for a new agent earlier on in the process of establishing a connection, to see if this helps with "Unknown UserUMMTGUN" issues.
The UMMTGUN form of Unknown User seems to appear because a viewer sometimes sends a UUIDNameRequest UDP request that fails to find a binding.
However, in theory the incoming agent should have made that binding before any such request is triggered.
So moving this binding to an earlier point in the process to see if this makes a difference.
Unknown user name is also updated to UserUMMTGUN2 - if you see the old name then you need to clear your viewer cache.
This relates to http://opensimulator.org/mantis/view.php?id=6625
2013-05-29 23:08:54 +01:00
Justin Clark-Casey (justincc) f9ee9efb97 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-29 22:40:51 +01:00
Justin Clark-Casey (justincc) 4898f18f89 Add HG regression TestCachedUserNameForNewAgent() 2013-05-29 21:28:38 +01:00
Diva Canto 233b9ec4d7 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-28 20:59:54 -07:00
Diva Canto 7e1c7f54c7 First change in Vivox for ages! -- added a lock to serialize calls to vivox servers. This may ameliorate things when lots of avies arrive in a sim at about the same time. Turns out that there are 4 http requests per avie to Vivox. 2013-05-28 20:59:25 -07:00
Robert Adams ae0d6ab28a BulletSim: don't zero motion when changing vehicle type.
Some vehicle scripts change type on the fly as an easy way of setting
all the parameters (like a plane changing to a car when on the ground).
2013-05-28 09:19:08 -07:00
Robert Adams 7c3a46ccea BulletSim: default using mesh asset hulls to 'true'. This means that,
if the mesh asset specifies physics hulls, BulletSim will fetch and
use same rather than approximating the hulls. If physics hulls are not
specified, the representation will fall back to the regular physics mesh.
2013-05-27 14:38:59 -07:00
Robert Adams 0c35d28933 BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs
which recompute GImpact shape bounding box after creation as Bullet
doesn't do that itself (something it does for nearly every other shape).

Now, physical prims without cuts become single mesh convex meshes. Physical
prims with cuts become GImpact meshes. Meshes become a set of convex
hulls approximated from the mesh unless the hulls are specified in the
mesh asset data. The use of GImpact shapes should make some mechanical
physics more stable.
2013-05-26 17:35:12 -07:00
Melanie 533bbf033d Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
This will require all money modules to be refactored!
2013-05-25 02:08:54 +01:00
Robert Adams 1821372634 Meshmerizer: remember to add the copied hull verts to the list of hulls. 2013-05-24 16:32:19 -07:00
Robert Adams 5f1f5ea5ab BulletSim: add VehicleInertiaFactor to allow modifying inertia.
Another parameter for vehicle operation tuning.
Default to <1,1,1> which means nothing is different under normal use.
2013-05-24 16:24:16 -07:00
Robert Adams 4979940def BulletSim: properly set mesh hash key in use tracking structure.
Shouldn't see any functional difference.
2013-05-24 16:23:10 -07:00
Robert Adams 81a6c39781 Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.
Default to off.
To turn mesh parsing DEBUG detail logging on, add
    [Mesh]
        LogMeshDetail=true
to the INI file.
2013-05-24 16:20:26 -07:00
Mic Bowman a087dbed7f One more appearance change: drop sending the SendAppearance packet
to avatar when it becomes root. This packet shows up in the viewer
logs as an error and appears to cause problems for completing the
texture rebake process for v1 viewers in some cases.
2013-05-24 13:26:07 -07:00
Mic Bowman bb0ea25090 Protect one more update of the baked texture hashes. 2013-05-24 13:25:25 -07:00
Mic Bowman 681fbda4b6 This is an experimental patch that adds support for comparing texture
hashes for the purpose of accurately responding to AgentTextureCached
packets. There is a change to IClientAPI to report the wearbles hashes
that come in through the SetAppearance packet. Added storage of the
texture hashes in the appearance. While these are added to the
Pack/Unpack (with support for missing values) routines (which means
Simian will store them properly), they are not currently persisted in
Robust.
2013-05-24 13:18:16 -07:00
dahlia 440905ad14 change a hull debugging message to Debug instead of Info 2013-05-24 10:31:14 -07:00
dahlia 21a3a81c7a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-24 01:54:28 -07:00
dahlia 0cdea5c2f3 correct some errors in decoding of mesh asset convex decomposition data 2013-05-24 01:53:37 -07:00
Justin Clark-Casey (justincc) eb2bd9d203 minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy()
As a struct, Vector3 has already been cloned by MemberwiseClone()
2013-05-24 00:46:58 +01:00
Justin Clark-Casey (justincc) 02fe05f346 Fix issue where llSetPayPrice on either one of a clone prim in the same OpenSimulator session would change the prices on both prims.
This is because the PayPrice array refernence was being memberwise cloned and not the array itself.
Addresses http://opensimulator.org/mantis/view.php?id=6639
2013-05-24 00:41:47 +01:00
Justin Clark-Casey (justincc) e597a7d94e Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-23 23:53:44 +01:00
Justin Clark-Casey (justincc) 9b56f99326 Fix bug where a cloned object would report the wrong llGetNumberOfPrims() when avatars had been sitting on the original and a different avatar sat on the copy within the same opensim session.
This was because the sitting avatars list was being cloned rather than reset.
Addresses http://opensimulator.org/mantis/view.php?id=6649
2013-05-23 23:52:07 +01:00