aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* changes needed to compile UbitODE, also changes project name to ↵UbitUmarov2012-02-081-2/+33
| | | | "Careminter". untested on linux
* Merge branch 'master' into careminsterMelanie2012-02-071-0/+2
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add TestCompileAndStart100Scripts() torture test.Justin Clark-Casey (justincc)2012-02-071-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-02-041-0/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-031-0/+1
| | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging.
| * Refactor common deserialization processor code to generic method ↵Justin Clark-Casey (justincc)2012-02-031-0/+1
| | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors()
* | Merge branch 'master' into careminsterMelanie2012-01-311-1/+33
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * Add torture tests to test adding 10,000, 100,000 and 200,000 single prim ↵Justin Clark-Casey (justincc)2012-01-311-1/+33
| | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-01-211-0/+2
|\ \ | |/
| * Add basic request and send image regression tests for LLImageManagerJustin Clark-Casey (justincc)2012-01-191-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2011-12-281-0/+1
|\ \ | |/
| * HG: more / love for XmasDiva Canto2011-12-241-0/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-061-0/+50
|\ \ | |/
| * Add test for not found response from GetTexture cap handler.Justin Clark-Casey (justincc)2011-12-051-0/+50
| | | | | | | | Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
* | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+4
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-1/+4
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into bigmergeMelanie2011-12-051-0/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-031-0/+1
| | | | | | | | | | 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.
* | Merge branch 'master' into bigmergeMelanie2011-11-191-0/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix Windows build breakjustincc2011-11-171-0/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-171-1/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Remove prebuild reference to now gone PumaCode.SvnDotNet.dllJustin Clark-Casey (justincc)2011-11-151-1/+0
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-141-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Add very simple FriendsModuleTests.TestNoFriends()Justin Clark-Casey (justincc)2011-11-141-0/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-041-0/+1
|\ \ | |/ | | | | | | | | | | | | 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
| * Add click/grab behaviour to pCampbot, which gets bots to randomly click things.Justin Clark-Casey (justincc)2011-11-031-0/+1
| | | | | | | | | | | | | | 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
* | Merge branch 'master' into bigmergeMelanie2011-11-011-28/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Remove OpenSim.TestSuiteJustin Clark-Casey (justincc)2011-10-311-28/+0
| | | | | | | | Hasn't been touched since 2009 and wasn't more than another copy of pCampBot
* | Merge branch 'master' into bigmergeMelanie2011-10-261-61/+65
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-251-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 bigmergeMelanie2011-10-251-0/+36
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client ↵Justin Clark-Casey (justincc)2011-10-241-0/+36
| | | | | | | | registers an http poll
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-251-0/+1
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the ↵Justin Clark-Casey (justincc)2011-10-181-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 bigmergeMelanie2011-10-251-11/+9
|\ \ | |/
| * Bring LindenUDP.Tests back from the dead. No tests are running.Justin Clark-Casey (justincc)2011-10-121-11/+9
| | | | | | | | Code drift means that most of this stuff doesn't compile but the structure is still useful.
* | Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmergeMelanie2011-10-121-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-081-0/+1
| | | | | | | | HashSet
* | Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmergeMelanie2011-10-111-28/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Examples/SimpleModule/ComplexObject.cs OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
| * Remove OpenSim.Region.Examples.SimpleModuleJustin Clark-Casey (justincc)2011-10-011-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 bigmergeMelanie2011-10-111-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 BulletSJustin Clark-Casey (justincc)2011-09-171-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 bigmergeMelanie2011-10-111-0/+1
|\ \ | |/
| * Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-161-0/+1
| |
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-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-161-0/+2
| | | | | | | | entries on standalone if applicable.
* | Resolve merge commits, stage 1Tom2011-09-041-9/+82
|\ \ | |/
| * Merge branch 'master' into bulletsimMic Bowman2011-08-191-0/+13
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| | * relocate AttachmentTests.cs to AttachmentsModuleTests.csJustin Clark-Casey (justincc)2011-08-161-0/+1
| | |
| | * Fix for monodevelopBlueWall2011-08-151-1/+1
| | | | | | | | | | | | | | | External libraries need the "path=..." set so Prebuild.exe can properly build the projects
generated by cgit v1.1 at 2024-12-14 11:16:27 +0000