Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-12 | 7 | -40/+85 |
|\ | |||||
| * | * This fixes having to select and deselect prim to get keyframemotion to ↵ | teravus | 2013-06-12 | 1 | -0/+5 |
| | | | | | | | | start running when pulled from data storage. | ||||
| * | BulletSim: when meshing or asset fetching fails, include position | Robert Adams | 2013-06-11 | 2 | -14/+30 |
| | | | | | | | | and region with the offending object's name in the error message. | ||||
| * | Add TriggerScenePresenceUpdated events when an animation is added | Robert Adams | 2013-06-11 | 3 | -3/+9 |
| | | | | | | | | | | | | or removed. Shouldn't impact anyone as only DSG seems to use OnScenePresenceUpdated event. Some minor format changes to AnimationSet's ToString(). | ||||
| * | Uncomment Mic's code and split to create new regression ↵ | Justin Clark-Casey (justincc) | 2013-06-11 | 1 | -23/+41 |
| | | | | | | | | TestAddTemporaryAsset() and TestAddTemporaryLocalAsset() | ||||
* | | DataSnapshot: changed those annoying messages to Debug instead of Info. | Diva Canto | 2013-06-12 | 2 | -8/+8 |
|/ | |||||
* | Removed the lock entirely | Diva Canto | 2013-06-11 | 1 | -56/+52 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-11 | 9 | -68/+112 |
|\ | |||||
| * | Put the "script saved" and "notecard saved" messages back into the bottom | Melanie | 2013-06-11 | 1 | -2/+2 |
| | | | | | | | | right corner. | ||||
| * | * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ↵ | teravus | 2013-06-11 | 1 | -2/+3 |
| | | | | | | | | | | | | | | there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this. * Has a prim table migration.. that might take a while, hold on to your hats. * Fixes a null-ref when shutting down while keyframed motion is active. | ||||
| * | Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. ↵ | dahlia | 2013-06-11 | 1 | -0/+3 |
| | | | | | | | | Addresses Mantis #0006671 | ||||
| * | LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization ↵ | dahlia | 2013-06-10 | 1 | -2/+2 |
| | | | | | | | | fails | ||||
| * | llRot2Angle now checks absolute value of s rotation component before normalizing | dahlia | 2013-06-10 | 1 | -11/+3 |
| | | |||||
| * | llRot2Axis now checks absolute value of s rotation component before ↵ | dahlia | 2013-06-10 | 1 | -22/+6 |
| | | | | | | | | normalizing. Also removed some excessive division and cleaned up a bit | ||||
| * | Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669 | teravus | 2013-06-10 | 1 | -2/+4 |
| | | |||||
| * | add a Normalize() method for LSL_Rotation | dahlia | 2013-06-10 | 1 | -0/+25 |
| | | |||||
| * | 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. | ||||
* | | Really bad idea to lock m_UserCache for so long in UserManagementModule. ↵ | Diva Canto | 2013-06-11 | 1 | -13/+17 |
|/ | | | | Added a special lock object instead, if we really want to avoid concurrent executions of that code. | ||||
* | Remove Temporary from use to shortcut asset stores. The Local property | Mic Bowman | 2013-06-10 | 2 | -2/+2 |
| | | | | | | 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> | ||||
* | Catch exception triggered by incoming avatars using legacy profiles | BlueWall | 2013-06-08 | 1 | -1/+10 |
| | |||||
* | Merge branch 'profiles' | BlueWall | 2013-06-07 | 2 | -0/+4 |
|\ | | | | | | | message to explain why this merge is necessary, | ||||
| * | SQLite support for UserProfiles | BlueWall | 2013-06-07 | 1 | -0/+1 |
| | | |||||
| * | 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 |
|\ \ | |||||
| * \ | 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 | ||||
| * | | Put the configuration back in FetchInventoryDesc2 cap. | Diva Canto | 2013-06-07 | 1 | -0/+29 |
| | | | |||||
* | | | Supply proper type information for the various types of requests | Melanie | 2013-06-07 | 2 | -6/+7 |
| | | | |||||
* | | | Adding Avination's PollService to round out the HTTP inventory changes | Melanie | 2013-06-07 | 3 | -8/+8 |
| |/ |/| | |||||
* | | 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 | 1 | -3/+26 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-06 | 1 | -0/+5 |
| |\ | |||||
| * | | Fix keyframe motion copyright | Melanie | 2013-06-06 | 1 | -3/+26 |
| | | | |||||
* | | | 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. | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-05 | 11 | -0/+229 |
|\ \ | |/ | |||||
| * | 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, | ||||
* | | Strengthen some assumptions. | Diva Canto | 2013-06-05 | 1 | -0/+5 |
|/ | |||||
* | 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 | 2 | -63/+234 |
|\ | |||||
| * | 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 | 1 | -52/+213 |
| | | | | |||||
* | | | | Prevent processing for Npc | BlueWall | 2013-06-05 | 1 | -1/+3 |
| |_|/ |/| | | |||||
* | | | 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. |