Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 1 | -0/+5 |
|\ | |||||
| * | Add start GC memory and end GC memory to object stress test printouts. | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -0/+5 |
| | | | | | | | | | | This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general). This means even the current stress tests take much more memory than they need, a problem that will have to be addressed. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts) | ||||
* | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 1 | -5/+19 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-20 | 1 | -0/+6 |
| |\ | |||||
| | * | Add image not in database test for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -0/+6 |
| | | | |||||
| * | | Telehub Support: | BlueWall | 2012-01-20 | 1 | -0/+5 |
| |/ | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing. | ||||
| * | Add basic request and send image regression tests for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -5/+8 |
| | | |||||
* | | 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 | -2/+5 |
|\ \ | |/ | | | | | | | 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 | -2/+5 |
| | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-06 | 1 | -0/+179 |
|\ \ | |/ | |||||
| * | Add test for not found response from GetTexture cap handler. | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -0/+179 |
| | | | | | | | | Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite | ||||
* | | 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 |
|\ \ | |/ |