| 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 | |
| | |\ \ | ||||||
| | * | | | 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 | |
| |\ \ \ | |/ / | ||||||
| | * | | Implement nudging support for strafing motion | Melanie | 2011-11-10 | 1 | -2/+4 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-11-10 | 2 | -12/+21 | |
| | |\ \ | | |/ | ||||||
| | | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-10 | 7 | -33/+58 | |
| | | |\ | ||||||
| | | * | | When updating SOG, a physics taint should not override a full update with a ↵ | Dan Lake | 2011-11-10 | 1 | -10/+15 | |
| | | | | | | | | | | | | | | | | | terse update | |||||
| | * | | | Alter commit 3758306 to allow region name to be substituted within a region ↵ | Justin Clark-Casey (justincc) | 2011-11-10 | 3 | -9/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console prompt This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash) e.g. "Region (\R) " is the current and continuing default prompt This renames custom_prompt in [Startup] to ConsolePrompt | |||||
| * | | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-10 | 2 | -10/+15 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 2 | -10/+15 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-10 | 2 | -10/+15 | |
| | | |\ \ \ | | | |/ / | ||||||
| | | | * | | convert tabs from commit 3758306 to spaces | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -3/+6 | |
| | | | | | | ||||||
| | | | * | | launch pCampbot shutdown console comand asynchronously | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -2/+5 | |
| | | | | | | ||||||
| | | | * | | Remove unused index parameter from BotManager.startupBot(). Rename ↵ | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -5/+4 | |
| | | | | | | | | | | | | | | | | | | | | | startupBot() => StartBot() | |||||
| | | * | | | 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. | |||||
| * | | | | 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 | 8 | -34/+50 | |
| |\ \ \ | |/ / | ||||||
| | * | | Add GuduleLapointe to list of contributors | BlueWall | 2011-11-10 | 1 | -0/+1 | |
| | | | | | | | | | | | | | Thanks for the patches! | |||||
| | * | | Allow custom setting for the console prompt | GuduleLapointe | 2011-11-10 | 2 | -2/+8 | |
| | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | * | | minor: Correct misleading method doc on SOG.UpdateRootRotation() | Justin Clark-Casey (justincc) | 2011-11-09 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Use IsConnected status to determine whether all pCampBots have disconnected, ↵ | Justin Clark-Casey (justincc) | 2011-11-09 | 2 | -16/+22 | |
| | | | | | | | | | | | | | | | | | | | rather than maintaining a separate count Checking IsConnected is more reliable. | |||||
| | * | | In pCampBot, don't try and pull down Primitive faces or sculpts set to null | Justin Clark-Casey (justincc) | 2011-11-09 | 1 | -6/+9 | |
| | |/ | ||||||
| | * | one final attempt and then im giving up on panda!!!!! | nebadon | 2011-11-07 | 1 | -2/+0 | |
| | | | ||||||
| | * | yet another feeble attempt at understanding panda shmanda! | nebadon | 2011-11-07 | 1 | -1/+0 | |
| | | | ||||||
| | * | another shot at making panda use mono 2.4.3!! | nebadon | 2011-11-07 | 1 | -0/+1 | |
| | | | ||||||
| | * | another panda test for good measure! | nebadon | 2011-11-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | This is a test to make sure new mono is being used with panda! | nebadon | 2011-11-07 | 1 | -0/+2 | |
| | | | ||||||
| | * | Remove unused avariable in PollServiceRequestManager | Justin Clark-Casey (justincc) | 2011-11-07 | 1 | -8/+6 | |
| | | | ||||||
| | * | Correct test failure in sit position check of TestSitAndStandWithNoTarget() | Justin Clark-Casey (justincc) | 2011-11-07 | 1 | -1/+3 | |
| | | | | | | | | | | | | | Curiously, a Vector3.ToString() will not display the last two places of the float. In this case, the failure of the assertion would confusingly report Expected: <0, 0, 0.8454993> But was: <0, 0, 0.8454993> when actual Z figure is 0.845499337 Should fully address http://opensimulator.org/mantis/view.php?id=5779 | |||||
| * | | 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-07 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | |||||
| | * | That such a trivial change can be so difficult to get right. Fix it this time. | Melanie | 2011-11-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fix build break | Melanie | 2011-11-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fix up failing test to compensate for changed sit target offset | Melanie | 2011-11-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fix up failing test to compensate for changed sit target offset | Melanie | 2011-11-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 6 | -11/+15 | |
| |\ \ | |/ | | | | | | | | | | | | | | | | | 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 | 10 | -51/+52 | |
| | | | | | | | | | 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 | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |