Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 2 | -16/+56 |
|\ | |||||
| * | Add remove test for unowned avatars | Justin Clark-Casey (justincc) | 2012-01-12 | 1 | -0/+20 |
| | | |||||
| * | Add permissions checks for owned avatars to all other osNpc* functions. | Justin Clark-Casey (justincc) | 2012-01-12 | 1 | -4/+1 |
| | | | | | | | | This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like. | ||||
| * | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() ↵ | Justin Clark-Casey (justincc) | 2012-01-12 | 1 | -13/+36 |
| | | | | | | | | methods and expose on interface for external calls. | ||||
| * | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵ | Melanie | 2012-01-06 | 3 | -11/+36 |
| | | | | | | | | owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results. | ||||
* | | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵ | Melanie | 2012-01-06 | 3 | -11/+36 |
| | | | | | | | | owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵ | Dan Lake | 2011-12-12 | 1 | -1/+1 |
| | | | | | | | | IsColliding | ||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -1/+4 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | On a new client circuit, send the initial reply ack to let the client know ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | it's live before sending other data. This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before. This may stop some avatars appearing grey on login. This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces | ||||
* | | Implement ChangeInventoryItemFlagsPacket handling | Melanie | 2011-12-04 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -1/+3 |
|\ \ | |/ | |||||
| * | 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 | ||||
* | | 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 |
| | | |||||
| * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -1/+1 |
| | | | | | | | | packet per prim. More to come as we change to make use of this. | ||||
* | | 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-05 | 2 | -3/+40 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Fix NPC sitting for prims without a sit target. | Justin Clark-Casey (justincc) | 2011-11-05 | 2 | -3/+40 |
| | | | | | | | | | | | | | | | | This is to partially address http://opensimulator.org/mantis/view.php?id=5769 We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger. By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>. However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent). Hopefully this can be addressed soon. | ||||
* | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | refactor: rename some AssetHelpers.CreateAsset() methods to ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+1 |
| | | | | | | | | CreateNotecardAsset() | ||||
* | | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵ | Dan Lake | 2011-10-19 | 2 | -2/+2 |
| | | | | | | | | scene presence by client ID. | ||||
* | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+1 |
|\ \ | |/ | |||||
| * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -3/+1 |
| | | | | | | | | without a getter | ||||
* | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+23 |
|\ \ | |/ | |||||
| * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -2/+23 |
| | | | | | | | | Allows you to stand an NPC that has sat. | ||||
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 2 | -0/+42 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -0/+42 |
| | | | | | | | | | | | | | | | | | | Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE) e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE); At the moment, sit only succeeds if the part has a sit target set. NPC immediately sits on the target even if miles away - they do not walk up to it. This method is in development - it may change so please don't trust it yet. Standing will follow shortly since that's kind of important once you're sitting :) | ||||
* | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵ | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -1/+1 |
| | | | | | | | | sends entity updates (including presence ones), not just prims. | ||||
* | | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+2 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Removed redundant code in AttachmentsModule and simplified interfaces which ↵ | Dan Lake | 2011-10-03 | 1 | -4/+2 |
| | | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still. | ||||
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 2 | -75/+4 |
|\ \ | |/ | |||||
| * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 2 | -75/+4 |
| | | | | | | | | This is moved into ScenePresence for now as a general facility | ||||
* | | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Move code which handles NPC movement into Scene so that this can also be ↵ | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | used by Autopilot coming from the client side. I thought that I had implemented this but must have accidentally removed it. Adds a regression test to detect if this happens again. Temporarily disables automatic landing of NPC at a target. Will be fixed presently. | ||||
* | | Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+12 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | When calling osNpcMoveTo(), rotate the avatar in the direction of travel. | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -4/+12 |
| | | | | | | | | | | | | | | This stops the npc walking backwards if the target is directly behind. This means that the npc no longer returns to its original rotation once movement has finished. If you want this behaviour, please store and reset the original rotation after movement. This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678 | ||||
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -14/+80 |
|\ \ | |/ | |||||
| * | Fix test failure. Oversight in setting up the tests themselves. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -1/+2 |
| | | |||||
| * | Centralize module setup for NPC tests. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -41/+21 |
| | | | | | | | | This is overkill for some tests since they dont' need all the modules, but I think the gain in code readability is worth it | ||||
| * | Remember to set and unset the fire and forget method at the top of the ↵ | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -2/+10 |
| | | | | | | | | attachment and npc tests | ||||
| * | Use scene presence agent id for rezzed object ownership rather than item owner. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -0/+77 |
| | | | | | | | | These should be identical. However, the item isn't available when rezzing npc attachments. | ||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 3 | -46/+265 |
|\ \ | |/ | |||||
| * | move common code into AttachmentsModule.DeleteAttachmentsFromScene() | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -5/+1 |
| | |