aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-031-136/+273
|\
| * Merge branch 'master' into careminsterMelanie2012-11-231-0/+1
| |\
| | * Fix recent windows build break.justincc2012-11-231-0/+1
| | | | | | | | | | | | Add missing OpenSim.Framework.Servers reference
| * | Merge branch 'master' into careminsterMelanie2012-11-221-0/+1
| |\ \ | | |/
| | * Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-221-0/+1
| | | | | | | | | | | | This helpfully lists version information, startup location and console log level
| * | Merge branch 'master' into careminsterMelanie2012-11-221-0/+46
| |\ \ | | |/
| | * Add regression test for a good request made to the asset service post handler.Justin Clark-Casey (justincc)2012-11-211-0/+46
| | | | | | | | | | | | Adds new OpenSim.Server.Handlers.Tests.dll to test suite
| * | Merge branch 'master' into careminsterMelanie2012-11-171-1/+45
| |\ \ | | |/
| | * Add basic XInventoryServicesTests.TestAddItem() regression test.Justin Clark-Casey (justincc)2012-11-171-1/+45
| | |
| * | Merge branch 'master' into careminsterMelanie2012-11-151-2/+3
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * Fix build break from 1aa0271 by adding System.Core to prebuild.xmlJustin Clark-Casey (justincc)2012-11-151-2/+3
| | |
| * | Merge branch 'master' into careminsterMelanie2012-10-121-28/+28
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * Remove now unnecessary OpenSim.Framework.Console reference from Monitoring.Justin Clark-Casey (justincc)2012-10-121-1/+0
| | | | | | | | | | | | Properly resolve circular reference which no longer appeared in Mono build as there were no using statements for it.
| | * Fix build break by moving OpenSim.Framework.Console back below HttpServer in ↵Justin Clark-Casey (justincc)2012-10-121-27/+27
| | | | | | | | | | | | | | | | | | the build order. Luckily, it turns out Framework.Monitoring doesn't need to reference Console directly.
| | * Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-111-47/+48
| | | | | | | | | | | | | | | | | | This allows different categories of stats to be shown, with options to list categories or show all stats. Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism. This commit also adds percentage stats for packets and blocks reused from the packet pool.
| * | Merge branch 'master' into careminsterMelanie2012-10-071-104/+105
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| | * Finally fix build break by allowing UserManagementModule (which constructs a ↵Justin Clark-Casey (justincc)2012-10-051-104/+105
| | | | | | | | | | | | | | | | | | packet directly) to reference OpenSim.Region.ClientStack.LindenUDP. This time I actually properly did a clean build
| * | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ Merge branch 'avination' into careminsterMelanie2012-09-161-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-09-161-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| | * | | Add basic asset connector tests to check behaviour for normal, local and ↵Justin Clark-Casey (justincc)2012-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | temporary assets. Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
| | * | | Revert "Fix prebuild.xml format for reference"BlueWall2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 96f889b20e570a05fdb7c4f42057cc66671a60cb.
| | * | | Fix prebuild.xml format for referenceBlueWall2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | Mono.Data.SQL entry was bad
| * | | | Merge branch 'master' into careminsterMelanie2012-09-021-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix Windows buildBlueWall2012-08-311-0/+1
| | | | | | | | | | | | | | | | | | | | Add reference to fix Windows build: no windows here to test, please report any issues back to IRC #opensim-dev ASAP
| * | | | Merge branch 'master' into careminsterMelanie2012-08-311-1/+41
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| | * | | Renaming existing 'torture' tests to 'performance' tests instead, since this ↵Justin Clark-Casey (justincc)2012-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better matches what they really do. nant target name changes to test-perf instead of torture, to match test-stress still not run by default
| | * | | Add VectorRenderModuleStressTests that contains a long running test that ↵Justin Clark-Casey (justincc)2012-08-291-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generates thousands of vector textures concurrently. Intended for use if there are future issues with mono crashes whilst generate dynamic textures. This test is triggered via a new test-stress nant target. Not run by default.
| * | | | Merge branch 'master' into careminsterMelanie2012-08-231-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-1/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-241-1/+0
| | | | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | touch prebuild.xmlUbitUmarov2012-09-241-0/+1
| | | | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Change the poll service to use a thread pool for replies to make sure theMelanie2012-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | event queues aren't blocked by other traffic.
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | fix buildUbitUmarov2012-09-171-2/+2
| | | | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | add suport funtions for mesh upload costsUbitUmarov2012-09-171-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-111-1/+1
|\ \ \ \ | |/ / /
| * | | fix prebuild.xmlUbitUmarov2012-09-111-1/+1
| | | |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-111-0/+1
|\ \ \ \ | |/ / /
| * | | Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-111-0/+1
| |/ / | | | | | | | | | leverage the Poll Service without blocking it's workers.
* | | dummy commitubit2012-09-111-1/+2
| | |
* | | try fixing building..ubit2012-08-161-0/+2
|/ /
* | *** TESTTTTT ** downgrade from .net 4.0 to .net3.5UbitUmarov2012-08-061-97/+97
| |
* | Merge branch 'master' into careminsterMelanie2012-08-031-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Add simple draw test for the VectorRenderModuleJustin Clark-Casey (justincc)2012-08-021-1/+1
| |
* | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-281-39/+2
| |
generated by cgit v1.1 at 2024-12-17 09:47:46 +0000