| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | |\ | |||||
| | | * | 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 | ||||
| | * | | In SOP, replaced many references to private members with the public properties | Dan Lake | 2011-11-10 | 1 | -243/+233 |
| | | | | |||||
| * | | | 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 | 1 | -2/+4 |
| | | |\ | |||||
| | | * | | 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 | 1 | -10/+15 |
| |\ \ \ | |/ / | |||||
| | * | | Implement nudging support for strafing motion | Melanie | 2011-11-10 | 1 | -2/+4 |
| | |/ | |||||
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-10 | 2 | -3/+7 |
| | |\ | |||||
| | | * | Fix misaligned sit animation on scripted sit caused by the default sit | Melanie | 2011-11-10 | 1 | -2/+6 |
| | | | | | | | | | | | | | animation being run after the scripted one. | ||||
| | * | | When updating SOG, a physics taint should not override a full update with a ↵ | Dan Lake | 2011-11-10 | 1 | -10/+15 |
| | | | | | | | | | | | | | terse update | ||||
| * | | | Implement nudging support for strafing motion | Melanie | 2011-11-10 | 1 | -2/+4 |
| | | | | |||||
| * | | | Fix misaligned sit animation on scripted sit caused by the default sit | Melanie | 2011-11-10 | 1 | -2/+6 |
| | | | | | | | | | | | | | animation being run after the scripted one. | ||||
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -1/+1 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | minor: Correct misleading method doc on SOG.UpdateRootRotation() | Justin Clark-Casey (justincc) | 2011-11-09 | 1 | -1/+1 |
| | |/ | |||||
| * | | Fix the ability to move the seated avatar via LSL | Melanie | 2011-11-08 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 3 | -9/+4 |
| |\ \ | |/ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | Make the AsyncSceneObjectDeleter send a list of kills. This will make large | Melanie | 2011-11-06 | 1 | -1/+7 |
| | | | | | | | | | | | marquee-selected deletions of single prims or small link sets nearly instantaneous | ||||
| | * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 3 | -24/+14 |
| | | | | | | | | | packet per prim. More to come as we change to make use of this. | ||||
| * | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2011-11-06 | 2 | -4/+9 |
| |\ \ | | | | | | | | | | into bigmerge | ||||
| | * | | Small preformance tweak | Melanie | 2011-11-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Remove backup optimization that was causing prim contents to poof | Melanie | 2011-11-05 | 1 | -3/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 2 | -2/+9 |
| |\ \ \ | |/ / |/| / | |/ | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-06 | 1 | -1/+10 |
| | |\ | |||||
| | | * | HUD attachments: Removes some more messages sent to wrong clients. | Snoopy Pfeffer | 2011-11-06 | 1 | -1/+10 |
| | | | | |||||
| | * | | Allow HG and other scene presences not linked to a user account to function. | Melanie | 2011-11-06 | 1 | -1/+4 |
| | |/ | |||||
| | * | Fix build break | Melanie | 2011-11-05 | 1 | -1/+1 |
| | | | |||||
| * | | Break out the parts of ScenePresence that differ from core | Melanie | 2011-11-05 | 1 | -141/+146 |
| | | | |||||
| * | | Fix up with core changes | Melanie | 2011-11-05 | 2 | -57/+31 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 2 | -6/+3 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Remove spammy autopilot debug | Melanie | 2011-11-05 | 1 | -3/+3 |
| | | | |||||
| | * | Remove some left over debug and reverse experimental reordering of ifs | Melanie | 2011-11-05 | 1 | -4/+2 |
| | | | |||||
| | * | Remove enableprejump config option and associated code as this is now | Melanie | 2011-11-05 | 1 | -3/+0 |
| | | | | | | | | | fully functional and cannot be disabled because that would break timings. | ||||
| | * | Porting the ScenePresenceAnimator from Avination. Jump and fall anims now work | Melanie | 2011-11-05 | 2 | -87/+136 |
| | | | | | | | | | properly. | ||||
| | * | Change puvlic m_ variable to a getter property | Melanie | 2011-11-05 | 1 | -1/+5 |
| | | | |||||
| | * | ScenePresence part of the Avination animator fixes. | Melanie | 2011-11-05 | 1 | -3/+58 |
| | | | |||||
| | * | Chnaging the sit target adjustment to a more precise approximation of SL. ↵ | Melanie | 2011-11-05 | 1 | -24/+35 |
| | | | | | | | | | | | | | Some small fixes ported from Avination. Some white space fixes. | ||||
| * | | Whitespace fix from core | Melanie | 2011-11-05 | 1 | -0/+1 |
| | | | |||||
| * | | Harmonize with core and remove extraneous comments with no information in them | Melanie | 2011-11-05 | 1 | -105/+39 |
| | | | |||||
| * | | Change m_falling public to a getter property. | Melanie | 2011-11-05 | 2 | -2/+6 |
| | | | |||||
| * | | Adapt to the core SP rework | Melanie | 2011-11-05 | 2 | -2/+6 |
| | | | |||||
| * | | Some more changes to catch up with core | Melanie | 2011-11-05 | 1 | -71/+49 |
| | | | |||||
| * | | Remove unused and broken OffsetRotation from ScenePresence | Melanie | 2011-11-05 | 1 | -29/+4 |
| | | | |||||
| * | | Some trivial changes to get closer to core | Melanie | 2011-11-05 | 1 | -12/+5 |
| | | | |||||
| * | | Change comment formatting to match core for a cleaner diff | Melanie | 2011-11-05 | 1 | -23/+23 |
| | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |