| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+14 |
| |\ | |||||
| | * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -3/+14 |
| | | | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743 | ||||
| * | | Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge | Melanie | 2011-10-25 | 2 | -12/+19 |
| |\ \ | |/ | |||||
| | * | redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -12/+19 |
| | | | | | | | | | can comment out some inconsistency | ||||
| * | | Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | correct misleading method doc on CreateNotecardAsset() | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | in AssetHelpers, store the actual text passed in to the method, not the ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -2/+2 |
| | | | | | | | | | string "data" | ||||
| * | | Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+6 |
| |\ \ | |/ | |||||
| | * | encode notecard assets in proper format for tests, rather than just using ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+6 |
| | | | | | | | | | whatever string is given | ||||
| * | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+5 |
| |\ \ | |/ | |||||
| | * | refactor: rename some AssetHelpers.CreateAsset() methods to ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -5/+5 |
| | | | | | | | | | CreateNotecardAsset() | ||||
| * | | 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 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+5 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -5/+5 |
| | | | | | | | | | the others | ||||
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 2 | -3/+3 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | fetch physical_prim switch from [Startup] config from inside scene, as is ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -3/+3 |
| | | | | | | | | | done for most other scene config params | ||||
| * | | 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 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -1/+1 |
| | | | | | | | | | This is moved into ScenePresence for now as a general facility | ||||
| * | | Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+82 |
| |\ \ | |/ | | | | | | | 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 | -0/+82 |
| | | | | | | | | | | | | | | | 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 | 2 | -2/+5 |
| |\ \ | |/ | |||||
| | * | Fix unit tests from RegionSettings commit | Justin Clark-Casey (justincc) | 2011-09-09 | 1 | -0/+4 |
| | | | |||||
| | * | Use scene presence agent id for rezzed object ownership rather than item owner. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -2/+1 |
| | | | | | | | | | These should be identical. However, the item isn't available when rezzing npc attachments. | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 7 | -32/+87 |
| |\ \ | |/ | |||||
| | * | get rid of appearance null checks - this is never null | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -0/+1 |
| | | | |||||
| | * | Fix bug in persisting saved appearances for npcs | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -5/+30 |
| | | | | | | | | | | | Assets have to be marked non-local as well as non-temporary to persist. This is now done. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660 | ||||
| | * | Stop NPC's getting hypergrid like names in some circumstances. | Justin Clark-Casey (justincc) | 2011-08-19 | 1 | -0/+1 |
| | | | | | | | | | | | This meant punching in another AddUser() method in IUserManagement to do a direct name to UUID associated without the account check (since NPCs don't have accounts). May address http://opensimulator.org/mantis/view.php?id=5645 | ||||
| | * | Don't try to save changed attachment states when an NPC with attachments is ↵ | Justin Clark-Casey (justincc) | 2011-08-18 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | removed from the scene. This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc. This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects | ||||
| | * | Add new regression TestRezAttachmentsOnAvatarEntrance() to do simple ↵ | Justin Clark-Casey (justincc) | 2011-08-17 | 2 | -9/+36 |
| | | | | | | | | | attachments check | ||||
| | * | early code to allow scripts to force npcs not to fly when moving to target | Justin Clark-Casey (justincc) | 2011-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path. currently implemented in osNpcMoveToTarget(), but none of this is final. | ||||
| | * | Stop trying to deregister caps or close child agents when an NPC is removed | Justin Clark-Casey (justincc) | 2011-08-10 | 1 | -1/+1 |
| | | | |||||
| | * | When an NPC is created, stop telling neighbouring regions to expect a child ↵ | Justin Clark-Casey (justincc) | 2011-08-09 | 2 | -4/+5 |
| | | | | | | | | | agent | ||||
| | * | refactor: Change SceneHelpers.AddClient() to AddScenePresence(). | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -4/+4 |
| | | | | | | | | | This seems to make more sense as we can get SP.ControllingClient | ||||
| | * | rename TestHelper => TestHelpers for consistency | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -1/+1 |
| | | | |||||
| | * | rename test SceneSetupHelpers -> SceneHelpers for consistency | Justin Clark-Casey (justincc) | 2011-08-06 | 2 | -2/+2 |
| | | | |||||
| | * | get rid of vestigal move to parameters | Justin Clark-Casey (justincc) | 2011-08-03 | 1 | -1/+1 |
| | | | |||||
| | * | Get osNpcCreate appearance working with avatars that are currently in the scene. | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -3/+3 |
| | | | | | | | | | | | | | Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing). Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing. Extended TestCreate() to check this. | ||||
| | * | Fix LLTextBox to work with the updated libOMV | Melanie | 2011-07-23 | 1 | -1/+1 |
| | | | |||||
| | * | Rename SceneSetupHelpers.AddRootAgent to AddClient() to better represent its ↵ | Justin Clark-Casey (justincc) | 2011-07-09 | 1 | -3/+3 |
| | | | | | | | | | effects and return object | ||||
| * | | Fix LLTextBox to work with the updated libOMV | Melanie | 2011-07-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 2 | -0/+20 |
| |\ \ | |/ | |||||
| | * | Add basic flotsam asset cache test for retrieved cached asset. | Justin Clark-Casey (justincc) | 2011-07-04 | 2 | -0/+20 |
| | | | | | | | | | Disabled temporarily since file system caching disrupts subsequent test runs | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 3 | -12/+95 |
| |\ \ | |/ | |||||
| | * | Extend TestGiveInventoryFolder() to test giving back the freshly received folder | Justin Clark-Casey (justincc) | 2011-06-04 | 1 | -2/+13 |
| | | | |||||
| | * | Fix give inventory tests to use different users rather than (accidentally) ↵ | Justin Clark-Casey (justincc) | 2011-06-04 | 2 | -9/+27 |
| | | | | | | | | | the same user. Extend TestGiveInventoryItem() to test giving back the same item. | ||||
| | * | create TestGetInventoryItem() | Justin Clark-Casey (justincc) | 2011-06-04 | 1 | -1/+27 |
| | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |