Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2013-06-10 | 4 | -34/+51 |
|\ | |||||
| * | BulletSim: add failure flag for meshing failure vs asset fetch failure | Robert Adams | 2013-06-10 | 4 | -34/+51 |
| | | | | | | | | | | | | so error messages make more sense. Change some BulletSim status log messages from WARN to INFO. Update TODO list. | ||||
* | | Fix test for adding temporary assets. Code for non-local temporary assets | Mic Bowman | 2013-06-10 | 1 | -0/+20 |
|/ | | | | is there but commented out. | ||||
* | Remove Temporary from use to shortcut asset stores. The Local property | Mic Bowman | 2013-06-10 | 4 | -3/+4 |
| | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future. | ||||
* | Mantis 5346: llAxisAngle2Rot() should normalize before computing | Talun | 2013-06-10 | 1 | -0/+1 |
| | | | | | | | | Corrected to agree with http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes to normalise the vector before computing the quaternion Signed-off-by: dahlia <dahlia@nomail> | ||||
* | More on mantis #6666 -- Groups V2 remote connector. | Diva Canto | 2013-06-09 | 1 | -7/+4 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-08 | 12 | -241/+1230 |
|\ | |||||
| * | Catch exception triggered by incoming avatars using legacy profiles | BlueWall | 2013-06-08 | 1 | -1/+10 |
| | | |||||
| * | Merge branch 'profiles' | BlueWall | 2013-06-07 | 4 | -0/+998 |
| |\ | | | | | | | | | | message to explain why this merge is necessary, | ||||
| | * | SQLite support for UserProfiles | BlueWall | 2013-06-07 | 3 | -0/+995 |
| | | | |||||
| | * | Ensure selected module is the only active one | BlueWall | 2013-06-07 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-07 | 2 | -1/+30 |
| |\ \ | |||||
| * | | | Supply proper type information for the various types of requests | Melanie | 2013-06-07 | 3 | -9/+8 |
| | | | | |||||
| * | | | Adding Avination's PollService to round out the HTTP inventory changes | Melanie | 2013-06-07 | 8 | -236/+219 |
| | |/ | |/| | |||||
* | | | Groups V2 -- fix mantis #6666 | Diva Canto | 2013-06-08 | 1 | -0/+3 |
| |/ |/| | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-07 | 4 | -6/+11 |
|\ \ | |||||
| * | | minor: Comment out debug logging (at warn level) about number of objects ↵ | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -1/+1 |
| |/ | | | | | | | force selected and turn down to debug level | ||||
| * | Fix regression where multiple close agents could be sent to the wrong ↵ | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | neighbour region on root agent close. This was introduced in git master d214e2d0 (Thu May 16 17:12:02 2013) Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously. Should address http://opensimulator.org/mantis/view.php?id=6658 | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-06-07 | 2 | -4/+27 |
| |\ | |||||
| * | | In LocalFriendshipTerminated, send the original client's agentId to the ↵ | Donnie Roberts | 2013-06-07 | 2 | -4/+4 |
| | | | | | | | | | | | | friend being removed instead of the friend's own id. | ||||
* | | | Put the configuration back in FetchInventoryDesc2 cap. | Diva Canto | 2013-06-07 | 1 | -0/+29 |
| |/ |/| | |||||
* | | Mantis #6620 (removed debug message) | Diva Canto | 2013-06-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-06 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-05 | 13 | -4/+261 |
| |\ | |||||
| * | | Strengthen some assumptions. | Diva Canto | 2013-06-05 | 1 | -0/+5 |
| | | | |||||
* | | | Fix keyframe motion copyright | Melanie | 2013-06-06 | 1 | -3/+26 |
| |/ |/| | |||||
* | | Database persistence for keyframes. Contains a Migration. | Melanie | 2013-06-06 | 2 | -4/+32 |
| | | |||||
* | | Hook up Keyframe motion to almost everything. Failing to cross a sim border | Melanie | 2013-06-06 | 11 | -0/+229 |
|/ | | | | may yield unexpected results in some cases. No database persistence yet, | ||||
* | Committing Avination's Keyframe module. This is not hooked up yet and will ↵ | Melanie | 2013-06-06 | 1 | -0/+766 |
| | | | | do nothing. More commits to follow. | ||||
* | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2013-06-05 | 3 | -63/+342 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-05 | 4 | -37/+84 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-06-05 | 1 | -14/+16 |
| | |\ | |||||
| | * | | Avoid a deadlock where a script can attempt to take a ↵ | Justin Clark-Casey (justincc) | 2013-06-05 | 1 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Port Avination's inventory send throttling | Melanie | 2013-06-05 | 2 | -52/+321 |
| | | | | |||||
* | | | | Prevent processing for Npc | BlueWall | 2013-06-05 | 1 | -1/+3 |
| | | | | |||||
* | | | | Cleanup | BlueWall | 2013-06-05 | 1 | -5/+0 |
| |_|/ |/| | | |||||
* | | | Remove a couple of orphaned lines | BlueWall | 2013-06-05 | 1 | -3/+0 |
| | | | |||||
* | | | Make locking more uniform | BlueWall | 2013-06-05 | 1 | -14/+19 |
| |/ |/| | |||||
* | | BulletSim: default PhysicsTimeStep to same as the simulator's | Robert Adams | 2013-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | 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. | ||||
* | | BulletSim: fix corner case when rebuilding a compound linkset while | Robert Adams | 2013-06-05 | 1 | -11/+46 |
|/ | | | | | | 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. | ||||
* | BulletSim: experimental movement of physics execution off of heartbeat | Robert Adams | 2013-06-01 | 3 | -73/+209 |
| | | | | | | | | | | 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. | ||||
* | Adding standard OpenSim header to source files | BlueWall | 2013-05-31 | 8 | -0/+216 |
| | |||||
* | Adding back the BasicProfileModule | BlueWall | 2013-05-31 | 2 | -73/+191 |
| | |||||
* | Remove unnecessary m_scenes and m_scene from AsyncCommandManager. | Justin Clark-Casey (justincc) | 2013-05-31 | 1 | -6/+1 |
| | | | | 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. | ||||
* | Lock areas of AsyncCommandManager where multiple threads could try to ↵ | Justin Clark-Casey (justincc) | 2013-05-31 | 1 | -111/+177 |
| | | | | | | | | 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. | ||||
* | refactor: Remove unused AsyncCommandManager.PleaseShutdown | Justin Clark-Casey (justincc) | 2013-05-31 | 1 | -19/+1 |
| | |||||
* | Fill in fields with default values on profile creation | BlueWall | 2013-05-31 | 1 | -2/+48 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2013-05-30 | 13 | -176/+3631 |
|\ | |||||
| * | Merge branch 'work' contains UserProfiles with Robust service and updates ↵ | BlueWall | 2013-05-30 | 13 | -176/+3631 |
| |\ | | | | | | | | | | region module using JsonRpc messaging. Requres no databse changes (but backup existing data before use). | ||||
| | * | UserProfiles | BlueWall | 2013-05-30 | 13 | -176/+3631 |
| | | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module. |