OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,587 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

818 Commits (b59275355e9dd8fbc126faf5bded8e61e84df4e8)

Author SHA1 Message Date
UbitUmarov 83868c0387 revert project name to OpenSim and not Careminster 2012-02-11 01:07:57 +00:00
UbitUmarov 12c3239666 changes needed to compile UbitODE, also changes project name to "Careminter". untested on linux 2012-02-08 15:29:48 +00: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