aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-111-247/+236
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-103-10/+35
| |\
| * | In SOP, replaced many references to private members with the public propertiesDan Lake2011-11-101-243/+233
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-11-110-0/+0
|\ \ \ | | |/ | |/|
| * | Prevent linking objects while they are deeded. On unlinking deeded objects,Melanie2011-11-111-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,Melanie2011-11-101-4/+17
| | | | | | | | | | | | | | | set LastOwnerID properly so the parts cannot be transferred, circumventing no trans perms
* | | Merge branch 'master' into bigmergeMelanie2011-11-102-19/+15
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-102-19/+15
| |\ \ | | |/
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-104-11/+47
| | |\
| | * | Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant ↵Dan Lake2011-11-102-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 AOsMelanie2011-11-102-6/+16
| | |/ | |/|
* | | Fix turn left and turn right properly. Works for both built-ins and LSL AOsMelanie2011-11-102-6/+16
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-11-104-19/+58
|\ \ \ | |/ /
| * | Implement nudging support for strafing motionMelanie2011-11-101-2/+4
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-102-12/+21
| |\ \ | | |/
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-107-33/+58
| | |\
| | * | When updating SOG, a physics taint should not override a full update with a ↵Dan Lake2011-11-101-10/+15
| | | | | | | | | | | | | | | | terse update
| * | | Alter commit 3758306 to allow region name to be substituted within a region ↵Justin Clark-Casey (justincc)2011-11-103-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 bigmergeMelanie2011-11-102-10/+15
|\ \ \ \
| * \ \ \ Merge branch 'master' into bigmergeMelanie2011-11-102-10/+15
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-102-10/+15
| | |\ \ \ | | | |/ /
| | | * | convert tabs from commit 3758306 to spacesJustin Clark-Casey (justincc)2011-11-101-3/+6
| | | | |
| | | * | launch pCampbot shutdown console comand asynchronouslyJustin Clark-Casey (justincc)2011-11-101-2/+5
| | | | |
| | | * | Remove unused index parameter from BotManager.startupBot(). Rename ↵Justin Clark-Casey (justincc)2011-11-101-5/+4
| | | | | | | | | | | | | | | | | | | | startupBot() => StartBot()
| | * | | Fix misaligned sit animation on scripted sit caused by the default sitMelanie2011-11-101-2/+6
| | |/ / | | | | | | | | | | | | animation being run after the scripted one.
* | | | Implement nudging support for strafing motionMelanie2011-11-101-2/+4
|/ / /
* | | Fix misaligned sit animation on scripted sit caused by the default sitMelanie2011-11-101-2/+6
| | | | | | | | | | | | animation being run after the scripted one.
* | | Merge branch 'master' into bigmergeMelanie2011-11-108-34/+50
|\ \ \ | |/ /
| * | Add GuduleLapointe to list of contributorsBlueWall2011-11-101-0/+1
| | | | | | | | | | | | Thanks for the patches!
| * | Allow custom setting for the console promptGuduleLapointe2011-11-102-2/+8
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | minor: Correct misleading method doc on SOG.UpdateRootRotation()Justin Clark-Casey (justincc)2011-11-091-1/+1
| | |
| * | Use IsConnected status to determine whether all pCampBots have disconnected, ↵Justin Clark-Casey (justincc)2011-11-092-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 nullJustin Clark-Casey (justincc)2011-11-091-6/+9
| |/
| * one final attempt and then im giving up on panda!!!!!nebadon2011-11-071-2/+0
| |
| * yet another feeble attempt at understanding panda shmanda!nebadon2011-11-071-1/+0
| |
| * another shot at making panda use mono 2.4.3!!nebadon2011-11-071-0/+1
| |
| * another panda test for good measure!nebadon2011-11-071-1/+1
| |
| * This is a test to make sure new mono is being used with panda!nebadon2011-11-071-0/+2
| |
| * Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)2011-11-071-8/+6
| |
| * Correct test failure in sit position check of TestSitAndStandWithNoTarget()Justin Clark-Casey (justincc)2011-11-071-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 LSLMelanie2011-11-081-0/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-071-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.Melanie2011-11-071-1/+1
| |
| * Fix build breakMelanie2011-11-071-1/+1
| |
| * Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
| |
* | Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-066-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 largeMelanie2011-11-061-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 oneMelanie2011-11-0610-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 ↵Melanie2011-11-062-4/+9
|\ \ | | | | | | | | | into bigmerge
generated by cgit v1.1 at 2024-12-23 06:47:08 +0000