Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | 9 | -236/+220 | |
| | |/ | |/| | ||||||
* | | | 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 | 5 | -8/+14 | |
|\ \ | ||||||
| * | | 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 | |||||
| * | minor: add dr0berts to contributors list | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -2/+3 | |
| | | ||||||
| * | 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 | 4 | -63/+343 | |
|\ | ||||||
| * | 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 | 3 | -52/+322 | |
| | | | | ||||||
* | | | | 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. | |||||
* | New HttpServer_OpenSim.dll with increased limits on number of connections, ↵ | Diva Canto | 2013-06-04 | 1 | -0/+0 | |
| | | | | requests, etc. | |||||
* | 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 | 3 | -75/+193 | |
| | ||||||
* | 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 | |
| | ||||||
* | Trigger Jenkins build | BlueWall | 2013-05-30 | 1 | -0/+1 | |
| | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2013-05-30 | 20 | -178/+3727 | |
|\ | ||||||
| * | Merge branch 'work' contains UserProfiles with Robust service and updates ↵ | BlueWall | 2013-05-30 | 20 | -178/+3727 | |
| |\ | | | | | | | | | | region module using JsonRpc messaging. Requres no databse changes (but backup existing data before use). | |||||
| | * | UserProfiles | BlueWall | 2013-05-30 | 20 | -178/+3727 | |
| | | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module. | |||||
* | | | Trigger OnScenePresenceUpdated when the avatar's animations change. | Robert Adams | 2013-05-30 | 2 | -4/+21 | |
| | | | ||||||
* | | | Add methods to Animation and AnimationSet for easier manipulation and | Robert Adams | 2013-05-30 | 3 | -0/+156 | |
| | | | | | | | | | | | | | | | display of groups of animations (Equal(), ToString(), FromOSDArray(), ...). No functional change to animations. | |||||
* | | | Add region heartbeat start event to complement heartbeat end event. | Robert Adams | 2013-05-30 | 2 | -0/+25 | |
| | | | | | | | | | | | | This allows object modification before the usual heartbeat operation. | |||||
* | | | BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini and | Robert Adams | 2013-05-30 | 1 | -32/+25 | |
|/ / | | | | | | | replace with things someone might actually want to tune (avatar height, ...). | |||||
* | | If an exception occurs in the AsyncCommandManager loop, spit it out to log ↵ | Justin Clark-Casey (justincc) | 2013-05-30 | 1 | -8/+6 | |
|/ | | | | | | 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. | |||||
* | minor: fix warnings in GodsModule that were due to duplicate using statements | Justin Clark-Casey (justincc) | 2013-05-30 | 1 | -11/+7 | |
| | ||||||
* | Fix passing of voice distance attenuation to the Vivox voice server. | Justin Clark-Casey (justincc) | 2013-05-30 | 1 | -1/+1 | |
| | | | | | 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. | |||||
* | If on a sit request we sit the avatar on a different prim in a linkset for ↵ | Justin Clark-Casey (justincc) | 2013-05-30 | 1 | -3/+3 | |
| | | | | | | | | | 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. |