| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -61/+65 |
| |\ | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -61/+65 |
| | | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | ||||
| * | | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+36 |
| |\ \ | |/ | |||||
| | * | Add new EventQueueTests with basic test to check that adding a client ↵ | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -0/+36 |
| | | | | | | | | | registers an http poll | ||||
| * | | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Provide an option to allow remote calls to the CreateUser method on the ↵ | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | UserAccountService Default is false, as before. Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces. Only Ruths can be created at present. Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service. | ||||
| * | | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge | Melanie | 2011-10-25 | 1 | -11/+9 |
| |\ \ | |/ | |||||
| | * | Bring LindenUDP.Tests back from the dead. No tests are running. | Justin Clark-Casey (justincc) | 2011-10-12 | 1 | -11/+9 |
| | | | | | | | | | Code drift means that most of this stuff doesn't compile but the structure is still useful. | ||||
| * | | Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | ||||
| | * | replace List used by m_accessIP in RemoteAdminPlugin with the more efficient ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -0/+1 |
| | | | | | | | | | HashSet | ||||
| * | | Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge | Melanie | 2011-10-11 | 1 | -28/+0 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Examples/SimpleModule/ComplexObject.cs OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | ||||
| | * | Remove OpenSim.Region.Examples.SimpleModule | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -28/+0 |
| | | | | | | | | | | | This module is more than 2 years old and at least some of the 'example' code it gives is now misleading. Even the logs say it say some bits were broken where it was put in! | ||||
| * | | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge | Melanie | 2011-10-11 | 1 | -56/+0 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs prebuild.xml | ||||
| | * | Remove old bullet DotNET and X libraries in preparation for BulletS | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -56/+0 |
| | | | | | | | | | | | These weren't working properly anyway. You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well. | ||||
| * | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Fix build errors on Windows by adding missing OpenSim.Services.Base reference | justincc | 2011-09-16 | 1 | -0/+1 |
| | | | |||||
| * | | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+2 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs | ||||
| | * | Correctly create a freshly created estate owner's default items and avatar ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+2 |
| | | | | | | | | | entries on standalone if applicable. | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -9/+82 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-19 | 1 | -0/+13 |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| | | * | relocate AttachmentTests.cs to AttachmentsModuleTests.cs | Justin Clark-Casey (justincc) | 2011-08-16 | 1 | -0/+1 |
| | | | | |||||
| | | * | Fix for monodevelop | BlueWall | 2011-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | External libraries need the "path=..." set so Prebuild.exe can properly build the projects | ||||
| | | * | llGetPrimitiveParams fix prim hollow/hole shape value | Micheil Merlin | 2011-08-13 | 1 | -0/+1 |
| | | | | |||||
| | | * | Revert "llGetPrimitveParams fix prim hollow/hole shape return value" | Justin Clark-Casey (justincc) | 2011-08-13 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | This reverts commit d0bcaf1f16134d8d6f267744d8bcd1bace5d897f. Accidentally applied only the prebuild.xml conflict fix. But the full application seems to generate a regression test error anyway. | ||||
| | | * | llGetPrimitveParams fix prim hollow/hole shape return value | Micheil Merlin | 2011-08-13 | 1 | -0/+1 |
| | | | | |||||
| | | * | add regression test for osNpcCreate when cloning an in-region avatar | Justin Clark-Casey (justincc) | 2011-08-11 | 1 | -0/+2 |
| | | | | |||||
| | | * | Add missing System.Xml reference which is required to build on Windows but ↵ | Justin Clark-Casey (justincc) | 2011-08-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | not mono | ||||
| | | * | When an NPC is created, stop telling neighbouring regions to expect a child ↵ | Justin Clark-Casey (justincc) | 2011-08-09 | 1 | -0/+3 |
| | | | | | | | | | | | | | agent | ||||
| | | * | Add osOwnerSaveAppearance() to help with setting up NPC appearances. Not ↵ | Justin Clark-Casey (justincc) | 2011-08-09 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | yet ready for user use. Adds regression test. | ||||
| | | * | Implement first draft functions for saving and loading NPC appearance from ↵ | Justin Clark-Casey (justincc) | 2011-08-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage. This works by serializing and deserializing NPC AvatarAppearance to a notecard in the prim inventory and making the required baked textures permanent. By using notecards, we avoid lots of awkward, technical and user-unfriendly issues concerning retaining asset references and creating a new asset type. Notecards also allow different appearances to be swapped and manipulated easily. This also allows stored NPC appearances to work transparently with OARs/IARs since the UUID scan will pick up and store the necessary references from the notecard text. This works in my basic test but is not at all ready for user use or bug reporting yet. | ||||
| | * | | Merge branch 'bulletsim' of ssh://opensimulator.org/var/git/opensim into ↵ | Dan Lake | 2011-07-20 | 1 | -14/+14 |
| | |\ \ | | | | | | | | | | | | | bulletsim | ||||
| | | * | | reorder bulletsim and convex decomposition projects in prebuild.xml. seems | Mic Bowman | 2011-07-12 | 1 | -16/+16 |
| | | | | | | | | | | | | | | | | | to fix the build on mono/linux. | ||||
| | | * | | Moved ConvexDecompositionDotNet.dll to bin directory to fix picky references ↵ | Dan Lake | 2011-07-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | on Linux | ||||
| | * | | | Merge branch 'master' into bulletsim | Dan Lake | 2011-07-20 | 1 | -9/+10 |
| | |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | | * | temporarily fix the build break with building the OdePlugin tests assembly. | Justin Clark-Casey (justincc) | 2011-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | This needs to be fixed properly. | ||||
| | | * | Make OdePlugin tests build from their own directory rather than from the ↵ | Justin Clark-Casey (justincc) | 2011-07-12 | 1 | -9/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | main OdePlugin directory I suspect the former arrangement was confusing nant since file changes didn't appear to be rebuilding properly Ode tests don't currently execute because Ode.NET can't pick up the native libode dll However, this appears to also have been the case before, and these tests weren't being included in the "nant test" suite anyway. Will need to fix some time. | ||||
| | * | | Merge branch 'master' into bulletsim | Dan Lake | 2011-07-11 | 1 | -0/+4 |
| | |\ \ | | |/ | |||||
| | | * | Add scratch AvatarFactoryModuleTests with one test to do a partial check on ↵ | Justin Clark-Casey (justincc) | 2011-07-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | AvatarFactoryModule.SetAppearance() Baked texture set not yet checked, nor persistence of data in avatar service This is a foundation for later npc related tests. | ||||
| | * | | BulletSim initial checkin | Robert Adams | 2011-06-20 | 1 | -0/+58 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -0/+3 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Add basic flotsam asset cache test for retrieved cached asset. | Justin Clark-Casey (justincc) | 2011-07-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | Disabled temporarily since file system caching disrupts subsequent test runs | ||||
| | * | | Create a very basic initial test which just creates an 'npc' and tests that ↵ | Justin Clark-Casey (justincc) | 2011-07-02 | 1 | -0/+2 |
| | |/ | | | | | | | the scene presence exists | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 1 | -0/+30 |
| |\ \ | |/ | |||||
| | * | First pass at making the V2 map work. Standalones only for now. There are ↵ | Diva Canto | 2011-06-12 | 1 | -0/+30 |
| | | | | | | | | | some issues with the zoom level -- TBD. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -1/+27 |
| |\ \ | |/ | |||||
| | * | Removed unused dependency (that happened to have the wrong path) | Diva Canto | 2011-06-05 | 1 | -1/+0 |
| | | | |||||
| | * | Added test IM client. | Diva Canto | 2011-06-02 | 1 | -0/+26 |
| | | | |||||
| | * | HG Friends working to some extent: friendships offered and accepted ↵ | Diva Canto | 2011-05-19 | 1 | -0/+1 |
| | | | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 1 | -1/+2 |
| |\ \ | |/ | |||||
| | * | Fix up nant linux build break | Melanie | 2011-05-05 | 1 | -1/+2 |
| | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |