Robert Adams
d5c08c44bf
Add missing reference to prebuild.xml for torture tests
2012-02-07 16:40:09 -08:00
Melanie
37049180f6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-07 21:09:04 +00:00
Justin Clark-Casey (justincc)
c22970448f
Add TestCompileAndStart100Scripts() torture test.
2012-02-07 19:42:32 +00:00
Melanie
ce5e900721
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
Justin Clark-Casey (justincc)
312e1457dd
Change SceneObjectSerializer to use common ExternalRepresentationUtils.ExecuteReadProcessors() methods.
...
Adds ability to submit a customized exception message to match logging.
2012-02-03 23:47:01 +00:00
Justin Clark-Casey (justincc)
6234264211
Refactor common deserialization processor code to generic method ExternalRepresentationUtils.ExecuteReadProcessors()
2012-02-03 22:45:50 +00:00
Melanie
1b63b21a4d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-01-31 20:53:49 +00:00
Justin Clark-Casey (justincc)
f3780b9eae
Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects.
...
These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature.
Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc.
However, data can be inconsistent due to different machine circumstances and virtual machine actions.
This area is under development.
2012-01-31 19:56:37 +00:00
Melanie
ba3b0c69f1
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
Justin Clark-Casey (justincc)
9356963bd3
Add basic request and send image regression tests for LLImageManager
2012-01-19 19:00:11 +00:00
Melanie
bde004c08e
Merge branch 'master' into careminster
2011-12-28 09:24:35 +00:00
Diva Canto
b6cfe15c7c
HG: more / love for Xmas
2011-12-24 07:44:26 -08:00
Melanie
28da235888
Merge branch 'master' into bigmerge
2011-12-06 19:01:05 +00:00
Justin Clark-Casey (justincc)
319507f521
Add test for not found response from GetTexture cap handler.
...
Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
2011-12-05 21:04:17 +00:00
Justin Clark-Casey (justincc)
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead 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.
2011-12-05 20:44:20 +00:00
Melanie
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
Melanie
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
Justin Clark-Casey (justincc)
4919c60560
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
...
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
2011-12-03 18:59:54 +00:00
Melanie
bdb5ac96d9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-11-19 22:39:15 +00:00
justincc
6dbe793112
Fix Windows build break
2011-11-17 23:10:58 +00:00
Melanie
31736b1aac
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc)
affec18625
Remove prebuild reference to now gone PumaCode.SvnDotNet.dll
2011-11-15 17:40:13 +00:00
Melanie
afca742392
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2011-11-14 20:03:47 +00:00
Justin Clark-Casey (justincc)
de895ee54a
Add very simple FriendsModuleTests.TestNoFriends()
2011-11-14 17:18:51 +00:00
Melanie
24235006f4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
Justin Clark-Casey (justincc)
5a67940acc
Add click/grab behaviour to pCampbot, which gets bots to randomly click things.
...
This can be specified on pCampbot.exe by using g in the list of behaviours for the new -behaviours,-b switch
e.g. -b p,g to get both existing physics and grabbing behaviours.
grabbing is primitive, it attempts grabs on random prims whether they're actually signalled as clickable or not.
behaviour is currently primitive overall, behaviours are just executed in a list
2011-11-03 22:31:31 +00:00
Melanie
b69f679122
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2011-11-01 23:54:09 +00:00
Justin Clark-Casey (justincc)
210868a832
Remove OpenSim.TestSuite
...
Hasn't been touched since 2009 and wasn't more than another copy of pCampBot
2011-10-31 23:10:10 +00:00
Melanie
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc)
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead 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)
2011-10-25 20:24:21 +01:00
Melanie
740077a291
Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge
2011-10-25 03:26:20 +01:00
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)
e28e2d24c7
Add new EventQueueTests with basic test to check that adding a client registers an http poll
2011-10-24 22:23:41 +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
Diva Canto
6b2b036387
Added OpenSim.Capabilities.Handlers. For the moment it has only the GetTexture handler. The region module in Linden space uses it. WARNING: nothing of this works yet, it just compiles.
2011-05-01 09:08:18 -07:00
Diva Canto
e3c27d8527
Nope, that didn't feel right. Moving all those modules to Linden space.
2011-04-30 13:24:25 -07:00
Diva Canto
3e79842312
Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll
2011-04-30 11:03:22 -07:00
Diva Canto
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00
Melanie
d1cf1fe3d7
Merge branch 'master' into careminster-presence-refactor
2011-04-30 14:37:37 +01:00
Diva Canto
e579a990b4
Removed stale client components: MXP and VWoHTTP.
2011-04-25 18:59:01 -07:00
Melanie
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01:00
Diva Canto
0d5a80ad78
Removed unused libraries: RAILS.dll and dependencies.
2011-04-24 19:14:39 -07:00
Melanie
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
Justin Clark-Casey (justincc)
6613daa82a
Add a regression test for rezzing a single object into a scene from user inventory
2011-04-13 17:46:36 +01:00
Diva Canto
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
Melanie
738daadace
Merge branch 'master' into careminster-presence-refactor
2011-04-08 04:16:29 +01:00
Justin Clark-Casey (justincc)
9d40c0dcc7
Remove the SQLite legacy adaptor. This is no longer needed now that the main adaptor works on Mac OS X.
...
The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator.
2011-04-07 23:20:04 +01:00
Melanie
a62b435a39
Merge branch 'master' into careminster-presence-refactor
2011-03-27 21:41:54 +01:00
Justin Clark-Casey (justincc)
de0730a54c
Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure.
2011-03-26 02:42:50 +00:00
Justin Clark-Casey (justincc)
ea72745d43
Log the xml/ini regions config files that opensim loads from, and the regions that it loaded from them
...
This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
2011-03-25 23:18:47 +00:00
Justin Clark-Casey (justincc)
b34743e5fe
Add an initial confidence-building TestAddObject() for prim counts.
2011-03-22 23:47:36 +00:00
BlueWall
97d46648cd
More SQLite work.
2011-03-22 16:42:12 -04:00