| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-07-13 | 4 | -118/+151 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | ||||
| | * | Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they ↵ | Diva Canto | 2013-07-11 | 1 | -2/+2 |
| | | | | | | | | | are also non-blocking handlers. | ||||
| | * | Switched TransferRequest (UDP packet handler) to sync. The permissions ↵ | Diva Canto | 2013-07-11 | 1 | -99/+115 |
| | | | | | | | | | checks may block, so they get a FireAndForget. Everything else is non-blocking. | ||||
| | * | Switched RegionHandshakeReply to Sync, because it's not doing anything blocking. | Diva Canto | 2013-07-10 | 1 | -1/+1 |
| | | | |||||
| | * | EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. ↵ | Diva Canto | 2013-07-10 | 1 | -1/+1 |
| | | | | | | | | | This _shouldn't_ screw things up, given that all this does is to dump the request in a queue. | ||||
| | * | Added show client-stats [first last] command to expose what viewers are ↵ | Diva Canto | 2013-07-10 | 2 | -15/+30 |
| | | | | | | | | | requesting. | ||||
| | * | Comment out old inbound UDP throttling hack. This would cause the UDP | Robert Adams | 2013-07-09 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | reception thread to sleep for 30ms if the number of available user worker threads got low. It doesn't look like any of the UDP packet types are marked async so this check is 1) unnecessary and 2) really crazy since it stops up the reception thread under heavy load without any indication. | ||||
| | * | Handle UUIDNameRequest UDP packet processing async instead of within the ↵ | Justin Clark-Casey (justincc) | 2013-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | main inbound UDP processing loop, to avoid any chance that this is delaying the main udp in loop. The potential impact of this should be lower now that these requests are being placed on a queue. | ||||
| | * | Fix mono warning in LLImageManagerTests | Justin Clark-Casey (justincc) | 2013-07-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-07-04 | 2 | -2/+96 |
| |\ \ | |/ | |||||
| | * | Add --default option to "debug lludp packet" command to allow packet logging ↵ | Justin Clark-Casey (justincc) | 2013-07-04 | 1 | -17/+52 |
| | | | | | | | | | to be performed immediately from client start | ||||
| | * | change "debug packet" command to "debug lludp packet" to conform with other ↵ | Justin Clark-Casey (justincc) | 2013-07-04 | 1 | -0/+59 |
| | | | | | | | | | | | | | | | "debug lludp" options also moves the implementing code into LLUDPServer.cs along with other debug commands from OpenSim.cs gets all debug lludp commands to only activate for the set scene if not root | ||||
| | * | HG: close a loophole by which if something was wrong with the ServiceURLs it ↵ | Diva Canto | 2013-07-02 | 1 | -1/+1 |
| | | | | | | | | | resulted in never ending asset requests | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-06-23 | 1 | -2/+2 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9 | Justin Clark-Casey (justincc) | 2013-06-17 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-06-08 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | minor: Comment out debug logging (at warn level) about number of objects ↵ | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -1/+1 |
| | | | | | | | | | force selected and turn down to debug level | ||||
| * | | Merge branch 'avination-current' into careminster | Melanie | 2013-06-06 | 2 | -5/+9 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | ||||
| | * | | Fix multi-wear of alpha and tattoo layers. | Melanie | 2013-05-31 | 1 | -4/+4 |
| | | | | |||||
| | * | | Update the money framework to allow sending the new style linden "serverside ↵ | Melanie | 2013-05-25 | 1 | -16/+14 |
| | | | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored! | ||||
| | * | | Explicitly zero avatar velocity on sit | Melanie | 2013-05-13 | 1 | -0/+4 |
| | | | | |||||
| | * | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | Melanie | 2013-04-28 | 6 | -164/+104 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into avination-current Conflicts: bin/Regions/Regions.ini.example | ||||
| | | * | | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵ | Melanie | 2013-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI. | ||||
| | * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-26 | 3 | -41/+58 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-16 | 2 | -22/+8 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-16 | 1 | -1/+4 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | fix STATE udp queue data rate since it is in use again, after being | UbitUmarov | 2013-01-16 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed by intel folks (?)( should it be used or removed ??) | ||||
| | * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-16 | 1 | -2/+12 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-08 | 1 | -16/+118 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-02 | 1 | -27/+60 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-13 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-13 | 1 | -7/+22 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-11 | 1 | -2/+29 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-03 | 8 | -147/+977 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 1 | -1/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-08 | 1 | -4/+49 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-04 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-01 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-30 | 1 | -11/+126 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-25 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-04 | 1 | -2/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge crap gerge branch 'ubitwork' of ↵ | ubit | 2012-08-02 | 3 | -33/+62 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into ubitwork Conflicts: bin/Regions/Regions.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-23 | 2 | -4/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-17 | 7 | -182/+267 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-16 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | backkick git | UbitUmarov | 2012-07-15 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | merge fix | ubit | 2012-07-16 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |