| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | Merge branch 'remove-scene-viewer' | Dan Lake | 2011-11-14 | 7 | -427/+22 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Remove SceneViewer from ScenePresence to reduce quadruple queueing of | Dan Lake | 2011-11-11 | 7 | -427/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prim update to only triple queuing. Existing method was: 1. Schedule prim for update, adding to scene update list 2. Update on SOGs during heartbeat queues update onto each SceneViewer 3. Update on SPs during heartbeat queues update onto each IClientAPI 4. ProcessEntityUpdates queues updates into UDP send stack Now the SceneViewer has been eliminated so updates are scheduled at any time and then put onto the IClientAPI priority queues immediately during SceneGraph.UpdateObjectGroups. | |||||
| | * | | | | | | Improved method doc for AddFriend() - it actually does set up a two-way ↵ | Justin Clark-Casey (justincc) | 2011-11-14 | 3 | -9/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | relationship. Rename IFriendsModule.AddFriend() to AddFriendship() | |||||
| * | | | | | | | Fix build break | Melanie | 2011-11-14 | 1 | -2/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 12 | -23/+159 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||||
| | * | | | | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-14 | 4 | -11/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Add test for adding a friend whilst online | Justin Clark-Casey (justincc) | 2011-11-14 | 4 | -7/+53 | |
| | | | | | | | | ||||||
| | * | | | | | | Add very simple FriendsModuleTests.TestNoFriends() | Justin Clark-Casey (justincc) | 2011-11-14 | 4 | -3/+91 | |
| | | | | | | | | ||||||
| | * | | | | | | If a friends identifier which is too short is given to ↵ | Justin Clark-Casey (justincc) | 2011-11-14 | 2 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring(). This is to progress http://opensimulator.org/mantis/view.php?id=5789 | |||||
| | * | | | | | | Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to ↵ | Justin Clark-Casey (justincc) | 2011-11-14 | 2 | -1/+4 | |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop a NullReferenceException being thrown if an HG IM is sent to a simulator running multiple regions This is an attempt to address http://opensimulator.org/mantis/view.php?id=5791 | |||||
| * | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-12 | 1 | -2/+3 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | doh - correct build break | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -6/+7 | |
| | | | | | | | ||||||
| | * | | | | | Add threads to the watchdog thread list before we start them. | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away. | |||||
| * | | | | | | Fix taking or returning locked objects losing permissions for owner | Melanie | 2011-11-12 | 2 | -2/+10 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 6 | -278/+399 | |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||||
| | * | | | | | Make log messages on authentication failure more explicit | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -13/+26 | |
| | | | | | | | ||||||
| | * | | | | | extract common ScenePresence setup code into Init() method for ↵ | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -39/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ScenePresenceSitTests | |||||
| | * | | | | | add SP.PhysicsActor checks to other sit/stand tests | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -0/+4 | |
| | | | | | | | ||||||
| | * | | | | | add sit and stand on ground test | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -0/+23 | |
| | | | | | | | ||||||
| | * | | | | | extract ground sit code into SP.HandleAgentSitOnGround() for consistency ↵ | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -12/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | with other sitting code. | |||||
| | * | | | | | Pick up the intended ConsolePrompt from [Startup] instead of console_prompt. | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5786 | |||||
| | * | | | | | As with prim sitting avatars, make an avatar phantom when it sits on the ↵ | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -6/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ground and solid again when it stands. This is to avoid http://opensimulator.org/mantis/view.php?id=5783 when a collision with a ground sitting avatar causes that avatar to automatically stand and sometimes not be able to move A better solution may be to keep gound sitting avatars solid but remove their collision status. However, this requires some physics code work. | |||||
| | * | | | | | Restore sending of OutPacket() for object kills removed in commit c7dd7b1. | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -26/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OutPacket() must be called within the m_killRecord lock. Otherwise the following event sequence is possible 1) LLClientView.ProcessEntityUpdates() passes the kill record check for a particular part suspends before OutPacket() 2) Another thread calls LLClientView.SendKillObject() to delete the same part and modifies the kill record 3) The same thread places the kill packet on the Task queue. 4) The earlier thread resumes and places the update packet on the Task queue after the kill packet. This results in a ghost part in the sim that only goes away after client relog. This commit also removes the unnecessary m_entityUpdates.SyncRoot locking in SendKillObject. | |||||
| | * | | | | | remove unncessary IClientAPI parameter from SP.SendSitResponse() | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -4/+3 | |
| | | | | | | | ||||||
| | * | | | | | As per mailing list last week, remove facility that would automatically move ↵ | Justin Clark-Casey (justincc) | 2011-11-11 | 2 | -228/+198 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the avatar if prim with no sit target was out of sitting range. Now, no movement occurs. Note that you can still sit on a prim with an explicit sit target from any distance, as was the case before. | |||||
| | * | | | | | Bump warp sit distance up to 10 meters, as discussed on opensim-dev mailing ↵ | Justin Clark-Casey (justincc) | 2011-11-11 | 2 | -17/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list last week. This means that if the avatar is within 10 meters of the selected target, it sits on it immediately without walking. Existing autopilot outside this range will be disabled in a later commit | |||||
| | * | | | | | update minimum mono version | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -3/+1 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-11-11 | 6 | -274/+285 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | Add new ScenePresenceSitTests with a single sit/stand test | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -0/+103 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | | one more jenkins test! | nebadon | 2011-11-10 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | one more test of jenkins! | nebadon | 2011-11-10 | 1 | -1/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | one more round with leeeeeeeeeeroy jaaaaaaenkins! | nebadon | 2011-11-10 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | take two on jenkins testing! | nebadon | 2011-11-10 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | test push to see if sir jenkins responds! | nebadon | 2011-11-10 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||||
| | * | | | | | | Fix compile error from an earlier commit | Dan Lake | 2011-11-10 | 1 | -2/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 1 | -247/+236 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | | | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-10 | 3 | -10/+35 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | In SOP, replaced many references to private members with the public properties | Dan Lake | 2011-11-10 | 1 | -243/+233 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | | Prevent linking objects while they are deeded. On unlinking deeded objects, | Melanie | 2011-11-11 | 1 | -4/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set LastOwnerID properly so the parts cannot be transferred, circumventing no trans perms | |||||
| * | | | | | | | | Prevent linking objects while they are deeded. On unlinking deeded objects, | Melanie | 2011-11-10 | 1 | -4/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set LastOwnerID properly so the parts cannot be transferred, circumventing no trans perms | |||||
| * | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 2 | -19/+15 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-10 | 2 | -19/+15 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | | * | | | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-10 | 4 | -11/+47 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | | Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant ↵ | Dan Lake | 2011-11-10 | 2 | -19/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties packet sends and so one part is not telling a different part what to do. That should be up to the SOG to manage permissions on its parts and notify clients when one of them changes. | |||||
| | * | | | | | | | Fix turn left and turn right properly. Works for both built-ins and LSL AOs | Melanie | 2011-11-10 | 2 | -6/+16 | |
| | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | | Fix turn left and turn right properly. Works for both built-ins and LSL AOs | Melanie | 2011-11-10 | 2 | -6/+16 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 4 | -19/+58 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |