aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge commit '75631e0267dbf58253dfcf6327b4d65f35bbaa6d' into careminsterMelanie2013-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Supply proper type information for the various types of requestsMelanie2013-06-073-9/+8
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-079-236/+220
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-075-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| | * | | | | | | | | | | minor: add dr0berts to contributors listJustin Clark-Casey (justincc)2013-06-071-2/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix regression where multiple close agents could be sent to the wrong ↵Justin Clark-Casey (justincc)2013-06-071-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/opensimJustin Clark-Casey (justincc)2013-06-072-4/+27
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Mantis #6620 (removed debug message)Diva Canto2013-06-071-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | In LocalFriendshipTerminated, send the original client's agentId to the ↵Donnie Roberts2013-06-072-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | friend being removed instead of the friend's own id.
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-062-3/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-061-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-0513-4/+261
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Strengthen some assumptions.Diva Canto2013-06-051-0/+5
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix keyframe motion copyrightMelanie2013-06-061-3/+26
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'avination-current' into careminsterMelanie2013-06-0629-52/+559
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Database persistence for keyframes. Contains a Migration.Melanie2013-06-062-4/+32
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-0611-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 ↵Melanie2013-06-061-0/+766
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do nothing. More commits to follow.
| | * | | | | | | | | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-06-054-63/+343
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-054-37/+84
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-051-14/+16
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Avoid a deadlock where a script can attempt to take a ↵Justin Clark-Casey (justincc)2013-06-051-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 throttlingMelanie2013-06-053-52/+322
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminsterMelanie2013-06-064-31/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Prevent processing for NpcBlueWall2013-06-051-1/+3
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | CleanupBlueWall2013-06-051-5/+0
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Remove a couple of orphaned linesBlueWall2013-06-051-3/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Make locking more uniformBlueWall2013-06-051-14/+19
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | BulletSim: default PhysicsTimeStep to same as the simulator'sRobert Adams2013-06-051-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 whileRobert Adams2013-06-051-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.
| * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-0434-262/+4565
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| | * | | | | | | | | | New HttpServer_OpenSim.dll with increased limits on number of connections, ↵Diva Canto2013-06-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests, etc.
| | * | | | | | | | | | BulletSim: experimental movement of physics execution off of heartbeatRobert Adams2013-06-013-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 filesBlueWall2013-05-318-0/+216
| | | | | | | | | | | |
| | * | | | | | | | | | Adding back the BasicProfileModuleBlueWall2013-05-313-75/+193
| | | | | | | | | | | |
| | * | | | | | | | | | Remove unnecessary m_scenes and m_scene from AsyncCommandManager.Justin Clark-Casey (justincc)2013-05-311-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-311-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.PleaseShutdownJustin Clark-Casey (justincc)2013-05-311-19/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Fill in fields with default values on profile creationBlueWall2013-05-311-2/+48
| | | | | | | | | | | |
| | * | | | | | | | | | Trigger Jenkins buildBlueWall2013-05-301-0/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-3020-178/+3727
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'work' contains UserProfiles with Robust service and updates ↵BlueWall2013-05-3020-178/+3727
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | region module using JsonRpc messaging. Requres no databse changes (but backup existing data before use).
| | | | * | | | | | | | | | UserProfilesBlueWall2013-05-3020-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 Adams2013-05-302-4/+21
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-303-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 Adams2013-05-302-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows object modification before the usual heartbeat operation.
| | * | | | | | | | | | | | BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini andRobert Adams2013-05-301-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-301-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.
generated by cgit v1.1 at 2025-03-20 14:24:05 +0000