Commit Graph

785 Commits (635b1bf18ef46f82257baa16fb1e3b068013ffc9)

Author SHA1 Message Date
Melanie f5e2bdebef Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge 2011-10-25 02:55:57 +01:00
Melanie 13d635d1d7 Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge 2011-10-25 01:37:01 +01:00
Justin Clark-Casey (justincc) c85a780583 Provide an option to allow remote calls to the CreateUser method on the 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.
2011-10-18 22:51:40 +01:00
Justin Clark-Casey (justincc) f5f7ca47ea Bring LindenUDP.Tests back from the dead. No tests are running.
Code drift means that most of this stuff doesn't compile but the structure is still useful.
2011-10-12 21:31:22 +01:00
Melanie 3a290e581a Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge
Conflicts:
	OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
2011-10-12 07:09:41 +01:00
Melanie 0ae63d0e8b Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge
Conflicts:
	OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
	OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
2011-10-11 23:16:19 +01:00
Melanie b9de3b7f5b Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge
Conflicts:
	OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
	OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
	prebuild.xml
2011-10-11 22:22:34 +01:00
Melanie f1fa059b37 Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge 2011-10-11 21:32:24 +01:00
Melanie 8fac7c0650 Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
2011-10-11 21:28:23 +01:00
Justin Clark-Casey (justincc) 71d29decc8 replace List used by m_accessIP in RemoteAdminPlugin with the more efficient HashSet 2011-10-08 01:53:10 +01:00
Justin Clark-Casey (justincc) 42fe774ad1 Remove OpenSim.Region.Examples.SimpleModule
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!
2011-10-01 01:21:20 +01:00
Justin Clark-Casey (justincc) f950338124 Remove old bullet DotNET and X libraries in preparation for BulletS
These weren't working properly anyway.
You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
2011-09-17 01:09:25 +01:00
justincc a00327d0e5 Fix build errors on Windows by adding missing OpenSim.Services.Base reference 2011-09-16 19:54:23 +01:00
Justin Clark-Casey (justincc) 522d6261f1 Correctly create a freshly created estate owner's default items and avatar entries on standalone if applicable. 2011-09-16 00:12:12 +01:00
Tom 66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Mic Bowman 384cb79a1a Merge branch 'master' into bulletsim
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs
2011-08-19 14:49:16 -07:00
Justin Clark-Casey (justincc) 66eb537d0c relocate AttachmentTests.cs to AttachmentsModuleTests.cs 2011-08-16 21:56:56 +01:00
BlueWall dc772c608d Fix for monodevelop
External libraries need the "path=..." set so
	Prebuild.exe can properly build the projects
2011-08-15 16:17:32 -04:00
Micheil Merlin b80dfb6572 llGetPrimitiveParams fix prim hollow/hole shape value 2011-08-13 15:34:08 +01:00
Justin Clark-Casey (justincc) 77625dae36 Revert "llGetPrimitveParams fix prim hollow/hole shape return value"
This reverts commit d0bcaf1f16.

Accidentally applied only the prebuild.xml conflict fix.  But the full application seems to generate a regression test error anyway.
2011-08-13 01:13:17 +01:00
Micheil Merlin d0bcaf1f16 llGetPrimitveParams fix prim hollow/hole shape return value 2011-08-13 01:02:07 +01:00
Justin Clark-Casey (justincc) 50945dd560 add regression test for osNpcCreate when cloning an in-region avatar 2011-08-11 21:43:26 +01:00
Justin Clark-Casey (justincc) 5d694a224f Add missing System.Xml reference which is required to build on Windows but not mono 2011-08-11 20:05:11 +01:00
Justin Clark-Casey (justincc) 92e96d394a When an NPC is created, stop telling neighbouring regions to expect a child agent 2011-08-09 23:11:07 +01:00
Justin Clark-Casey (justincc) 795c8e6c22 Add osOwnerSaveAppearance() to help with setting up NPC appearances. Not yet ready for user use.
Adds regression test.
2011-08-09 22:05:47 +01:00
Justin Clark-Casey (justincc) e869eeb0bf Implement first draft functions for saving and loading NPC appearance from 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.
2011-08-09 03:51:34 +01:00
Dan Lake 81fe1cfad6 Merge branch 'bulletsim' of ssh://opensimulator.org/var/git/opensim into bulletsim 2011-07-20 15:04:23 -07:00
Dan Lake 2c11f7fc38 Merge branch 'master' into bulletsim 2011-07-20 15:01:32 -07:00
Mic Bowman 1f3e42adf3 reorder bulletsim and convex decomposition projects in prebuild.xml. seems
to fix the build on mono/linux.
2011-07-12 11:14:48 -07:00
Justin Clark-Casey (justincc) d31e0a67f7 temporarily fix the build break with building the OdePlugin tests assembly.
This needs to be fixed properly.
2011-07-12 03:26:22 +01:00
Justin Clark-Casey (justincc) 7442f064f5 Make OdePlugin tests build from their own directory rather than from the 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.
2011-07-12 02:58:14 +01:00
Dan Lake 38f0cf4bf4 Moved ConvexDecompositionDotNet.dll to bin directory to fix picky references on Linux 2011-07-11 15:26:50 -07:00
Dan Lake b9cbe92f30 Merge branch 'master' into bulletsim 2011-07-11 12:23:20 -07:00
Justin Clark-Casey (justincc) f99b89990c Add scratch AvatarFactoryModuleTests with one test to do a partial check on AvatarFactoryModule.SetAppearance()
Baked texture set not yet checked, nor persistence of data in avatar service
This is a foundation for later npc related tests.
2011-07-09 02:21:56 +01:00
root 47cf9c8fe0 Merge branch 'master' into careminster-presence-refactor 2011-07-05 04:01:59 +01:00
Justin Clark-Casey (justincc) 46f5893d55 Add basic flotsam asset cache test for retrieved cached asset.
Disabled temporarily since file system caching disrupts subsequent test runs
2011-07-04 21:35:15 +01:00
Justin Clark-Casey (justincc) 513d63455e Create a very basic initial test which just creates an 'npc' and tests that the scene presence exists 2011-07-02 01:01:40 +01:00
Robert Adams 302d72701d BulletSim initial checkin 2011-06-20 17:24:42 -07:00
Melanie 9b1d3f0c38 Merge branch 'master' into careminster-presence-refactor 2011-06-13 12:38:17 +01:00
Diva Canto fd57c91b4a First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD. 2011-06-12 15:37:42 -07:00
Melanie 326c46ba70 Merge branch 'master' into careminster-presence-refactor 2011-06-09 02:05:04 +01:00
Diva Canto 78e76bba38 Removed unused dependency (that happened to have the wrong path) 2011-06-05 18:50:21 -07:00
Diva Canto 3c15c0b264 Added test IM client. 2011-06-02 09:39:09 -07:00
Diva Canto d21e9c755f HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights. 2011-05-19 16:54:46 -07:00
Melanie e7e88c4db1 Merge branch 'master' into careminster-presence-refactor 2011-05-05 13:28:15 +01:00
Melanie 1bdac6ed19 Fix up nant linux build break 2011-05-05 13:27:44 +01:00
Melanie 4f588ad7ba Fix up some paths in prebuild 2011-05-05 12:52:31 +01:00
Melanie 3149e6e851 Fix up some paths in prebuild 2011-05-05 12:13:56 +01:00
Melanie 4beb0c9b9b Merge branch 'master' into careminster-presence-refactor 2011-05-05 09:49:10 +01:00
Diva Canto 10180760b7 Works! 2011-05-02 08:48:55 -07:00