aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-241-1/+0
| | |
| * | touch prebuild.xmlUbitUmarov2012-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.
| * | fix buildUbitUmarov2012-09-171-2/+2
| | |
| * | add suport funtions for mesh upload costsUbitUmarov2012-09-171-0/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | fix prebuild.xmlUbitUmarov2012-09-111-1/+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.
* | | 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.
* | *** 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
| |
* | Merge branch 'master' into careminsterMelanie2012-07-281-23/+63
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-251-26/+29
| | | | | | | | with other monitoring code from OpenSim.Framework
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-24/+23
| | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| * Add experimental "OpenSim object memory churn" statistics to output of ↵Justin Clark-Casey (justincc)2012-07-251-0/+1
| | | | | | | | | | | | | | | | region console "show stats" command This aims to capture the amount of memory that OpenSim turns over whilst operating a region. This memory is not lost - apart from leaks it is reclaimed by the garbage collector. However, the more memory that gets turned over the more work the GC has to do to reclaim it.
* | Fix merge issues in prebuildMelanie2012-07-231-33/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-07-231-0/+25
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled ↵Robert Adams2012-07-201-58/+58
| | | | | | | | before BulletSim is
| * Remove an added but unnecessary dependency in prebuild.xmlRobert Adams2012-07-201-1/+0
| |
| * Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a ↵Robert Adams2012-07-201-0/+1
| | | | | | | | simple, high performance logger for high frequency logging (physics sub-operations, for instance).
* | Merge branch 'master' into careminsterMelanie2012-07-121-0/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Fix build break for windows with missing package for IScriptEngine in ↵Justin Clark-Casey (justincc)2012-07-111-0/+1
| | | | | | | | prebuild.xml for OpenSim.Region.CoreModules.Tests.dll
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-111-0/+1
| | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
* | Merge branch 'master' into careminsterMelanie2012-07-111-0/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵Justin Clark-Casey (justincc)2012-07-101-0/+1
| | | | | | | | | | | | avatars rather than throwing an exception. Extends sitting avatar regression tests to test new sitters information
* | Merge branch 'master' into careminsterMelanie2012-06-151-0/+1
|\ \ | |/
| * Make the "debug http" command available for robust as well as the simulator. ↵Justin Clark-Casey (justincc)2012-06-151-0/+1
| | | | | | | | | | | | This allows one to see incoming requests as they happen. This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
* | Merge branch 'master' into careminsterMelanie2012-06-071-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Mantis 6044 Building master currently fails.Talun2012-06-071-0/+1
| | | | | | | | | | | | Add missing reference to System.Core Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-04-271-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * Fix prebuild.xmlBlueWall2012-04-271-1/+1
| | | | | | | | adding a reference to a dll requires 'path="..."'
generated by cgit v1.1 at 2024-10-12 02:26:24 +0000