aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-091-1/+2
|\
| * Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-091-1/+2
| |\
| | * Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-061-1/+2
| | | | | | | | | | | | | | | | | | | | | Some successful collision attacks have been carried out on sha1 with speculation that more are possible. http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms No successful attacks have been shown on sha256, which makes it less likely that anybody will be able to engineer an asset hash collision in the future. Tradeoff is more storage required for hashes, and more cpu to hash, though this is neglible compared to db operations and network access.
* | | Merge branch 'master' into careminsterMelanie2012-03-081-0/+1
|\ \ \ | |/ /
| * | Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Merge branch 'master' into careminsterMelanie2012-02-211-25/+0
|\ \ | |/ | | | | Conflicts:
| * Remove PhysXPlugin and wrappers.Justin Clark-Casey (justincc)2012-02-211-25/+0
| | | | | | | | | | In over 4 years this never progressed beyond an unimplemented stub. This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
| * Fix another Torture test build break on Windows.Justin Clark-Casey (justincc)2012-02-091-0/+1
| |
| * Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.Justin Clark-Casey (justincc)2012-02-091-0/+3
| |
| * Add missing reference to prebuild.xml for torture testsRobert Adams2012-02-071-0/+1
| |
* | Fix merge issues in prebuildMelanie2012-02-191-1/+5
| |
* | revert project name to OpenSim and not CareminsterUbitUmarov2012-02-111-1/+1
| |
* | 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
generated by cgit v1.1 at 2024-11-05 23:17:40 +0000