| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -15/+97 | |
| |\ \ | |/ | ||||||
| | * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -15/+97 | |
| | | | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse. | |||||
| * | | Implement ChangeInventoryItemFlagsPacket handling | Melanie | 2011-12-04 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -6/+9 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| | * | Add test for removing a friendship. | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -6/+9 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -2/+9 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||||
| | * | Add very simple FriendsModuleTests.TestNoFriends() | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -2/+9 | |
| | | | ||||||
| | * | 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. | |||||
| * | | 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 | 1 | -4/+4 | |
| |\ \ | |/ | | | | | | | 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 | 1 | -4/+4 | |
| | | | | | | | | | the others | |||||
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 | |
| |\ \ | |/ | | | | | | | | | 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 | 1 | -2/+2 | |
| | | | | | | | | | 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 | |||||
| * | | Bring us up to date. | Tom | 2011-09-14 | 1 | -0/+4 | |
| |\ \ | |/ | ||||||
| | * | Fix unit tests from RegionSettings commit | Justin Clark-Casey (justincc) | 2011-09-09 | 1 | -0/+4 | |
| | | | ||||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -6/+7 | |
| |\ \ | |/ | ||||||
| | * | Don't try to save changed attachment states when an NPC with attachments is ↵ | Justin Clark-Casey (justincc) | 2011-08-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | 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 | |||||
| | * | 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 | 1 | -3/+4 | |
| | | | | | | | | | agent | |||||
| | * | get rid of vestigal move to parameters | Justin Clark-Casey (justincc) | 2011-08-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fix LLTextBox to work with the updated libOMV | Melanie | 2011-07-23 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix LLTextBox to work with the updated libOMV | Melanie | 2011-07-23 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Fill in the new OwnerData field in the LLUDP ScriptDialog message. | Justin Clark-Casey (justincc) | 2011-05-31 | 1 | -1/+1 | |
| | | | | | | | | | | | If we don't do this then viewer 2.8 crashes. Resolves http://opensimulator.org/mantis/view.php?id=5510 | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-14 | 1 | -2/+11 | |
| |\ \ | |/ | ||||||
| | * | When loading an OAR that doesn't have parcels, create a default parcel | Oren Hurvitz | 2011-05-14 | 1 | -2/+11 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 1 | -9/+2 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' into test-merge0418 | Mic Bowman | 2011-04-18 | 2 | -295/+0 | |
| | |\ | ||||||
| | * | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 1 | -9/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code. | |||||
| * | | | Fix up client implementations | Melanie | 2011-04-17 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 2 | -295/+0 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | remove mock asset service for tests in favour of always using the real one | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -123/+0 | |
| | | | | ||||||
| | * | | Remove the mock inventory service for tests and just use the real one all ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -186/+0 | |
| | | | | | | | | | | | | | the time with an in-memory data plugin | |||||
| | * | | Make all the objects in a coalescence reappears after being loaded from an ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -4/+18 | |
| | |/ | | | | | | | | | | | | | IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing. From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug. It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups. | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | counts populated by LandManagementModule. In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci Counts are showing odd behaviour at the moment, this will be addressed shortly. | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-19 | 1 | -2/+5 | |
| |\ \ | |/ | ||||||
| | * | Put some CapabilitiesModule null checks in Scene | Justin Clark-Casey (justincc) | 2011-02-18 | 1 | -2/+5 | |
| | | | | | | | | | Stop tests setting up a capabilities module by default | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 1 | -0/+5 | |
| |\ \ | |/ | ||||||
| | * | When an oar is loaded, do not create a default parcel before loading the ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | parcels from the OAR. The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one. Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event). | |||||
| | * | Fix OAR parcel loading so that old parcels are replaced by the new instead ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -0/+5 | |
| | | | | | | | | | | | | | of merged. The --merge switch will still merge the old and new land parcelling. | |||||
| | * | Implement SendPlacesReply | Melanie | 2010-12-30 | 1 | -0/+4 | |
| | | | ||||||
| * | | Implement SendPlacesReply | Melanie | 2010-12-30 | 1 | -0/+4 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+5 | |
| |\ \ | |/ | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |