Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 5 | -307/+119 |
|\ | |||||
| * | Add a missing brace, remove a useless temp variable, enable charging. | Melanie | 2012-09-11 | 1 | -6/+3 |
| | | |||||
| * | report mesh upload costs ( fake values) | UbitUmarov | 2012-09-11 | 2 | -3/+68 |
| | | |||||
| * | let LLSDAssetUploadRequest include asset_resources information plus let | UbitUmarov | 2012-09-11 | 2 | -1/+11 |
| | | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still) | ||||
| * | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-09-11 | 3 | -305/+45 |
| |\ | |||||
| | * | Removing the variable prica handler again. It's never called, was misnamed and | Melanie | 2012-09-11 | 1 | -332/+0 |
| | | | | | | | | | | | | probably never worked past the mesh beta. | ||||
| | * | Re-add the module and fix a typo | Melanie | 2012-09-11 | 1 | -0/+332 |
| | | | |||||
| | * | Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice | Melanie | 2012-09-11 | 1 | -332/+0 |
| | | | | | | | | | | | | which is the name actually used in viewer code. | ||||
| | * | Add cost calculation suppor tto the VariablePrice one as well | Melanie | 2012-09-11 | 2 | -9/+44 |
| | | | |||||
| | * | Revert "Remove the unused NewFileAgentInventoryVariablePrice module." | Melanie | 2012-09-11 | 1 | -0/+296 |
| | | | | | | | | | | | | | | | | | | It's actually used. This reverts commit 94a8e5572b1529190a174f29f866b65e7b2ccc0e. | ||||
| | * | Add the option to have variable costing for uploads | Melanie | 2012-09-11 | 2 | -9/+46 |
| | | | |||||
| | * | Remove the unused NewFileAgentInventoryVariablePrice module. | Melanie | 2012-09-11 | 1 | -296/+0 |
| | | | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-11 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | fix prebuild.xml | UbitUmarov | 2012-09-11 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-11 | 5 | -93/+124 |
|\ \ | |/ | |||||
| * | Revamp the v3 inventory sending. Uses threads and some nifty mechanics to | Melanie | 2012-09-11 | 2 | -81/+118 |
| | | | | | | | | leverage the Poll Service without blocking it's workers. | ||||
| * | Remove commented code | Melanie | 2012-09-10 | 1 | -11/+0 |
| | | |||||
| * | Merge branch 'ubitwork' into avination | Melanie | 2012-09-10 | 2 | -12/+34 |
| |\ | |||||
| * | | Reduce max concurrent endpoint connections from 50 to 6 (was 2 before) | Melanie | 2012-09-09 | 1 | -1/+1 |
| | | | |||||
| * | | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM | Melanie | 2012-09-09 | 2 | -1/+4 |
| | | | | | | | | | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly. | ||||
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-08 | 4 | -23/+93 |
| |\ \ | |||||
| * | | | Set the maximum number of concurrent connections to a service endpoint | Melanie | 2012-09-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | to 50. This doesn't work on stock mono but it works in Avination and also under Windoze. | ||||
* | | | | dummy commit | ubit | 2012-09-11 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-10 | 2 | -12/+34 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | add a extra httppool thread to compensate for webfetchinventory | UbitUmarov | 2012-09-10 | 1 | -1/+2 |
| | | | | |||||
| * | | | webFetchInventory: change control event to simple flag, adjust locking | UbitUmarov | 2012-09-10 | 1 | -11/+32 |
| | |/ | |/| | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-08 | 1 | -4/+49 |
|\ \ \ | |/ / | |||||
| * | | llClientView: try to have only one thread per client processing | UbitUmarov | 2012-09-08 | 1 | -4/+49 |
| | | | | | | | | | | | | RegionHandleRequests. (code assumes packet handle is called async as it is not) | ||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-07 | 4 | -20/+45 |
|\ \ \ | |/ / | |||||
| * | | One more redundante ParcelProprieties on login | UbitUmarov | 2012-09-07 | 1 | -0/+2 |
| | | | |||||
| * | | stop sending duplicated parcelProprieties at login | UbitUmarov | 2012-09-07 | 1 | -18/+39 |
| | | | |||||
| * | | remove fireandforget call to EnableChildAgents at end on CompleteMovement, | UbitUmarov | 2012-09-07 | 1 | -1/+3 |
| |/ | | | | | | | since this is already on own thread and its at the end of it. | ||||
| * | Prevent double slashes, try #4 | UbitUmarov | 2012-09-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-06 | 1 | -8/+9 |
|\ \ | |/ | |||||
| * | Prevent double slashes, try #3 | Melanie | 2012-09-06 | 1 | -0/+3 |
| | | |||||
| * | Revert "Change string concatenation to Path.Combine to eliminate extra slashes." | Melanie | 2012-09-06 | 1 | -8/+6 |
| | | | | | | | | This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9. | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-06 | 9 | -173/+192 |
|\ \ | |/ | |||||
| * | Merge branch 'ubitwork' into avination | Melanie | 2012-09-06 | 1 | -6/+8 |
| |\ | |||||
| | * | Change string concatenation to Path.Combine to eliminate extra slashes. | Melanie | 2012-09-06 | 1 | -6/+8 |
| | | | | | | | | | | | | Windoze barfs on them. | ||||
| | * | Revert " remove extra '/' in assets url" | Melanie | 2012-09-06 | 1 | -13/+6 |
| | | | | | | | | | | | | This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486. | ||||
| * | | Make friend notifies and closing child agents async because both can | Melanie | 2012-09-04 | 3 | -43/+48 |
| | | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive | ||||
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-04 | 4 | -3/+19 |
| |\ \ | |||||
| * | | | Remove debug spam | Melanie | 2012-09-04 | 1 | -6/+6 |
| | | | | |||||
| * | | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into | Melanie | 2012-09-04 | 3 | -97/+113 |
| | | | | | | | | | | | | | | | | it's own sub-method | ||||
| * | | | Prevent a nullref if SimStatsReporter tries to report on a sim where psysics are | Melanie | 2012-09-03 | 1 | -14/+17 |
| | | | | | | | | | | | | | | | | not yet initialized | ||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-06 | 1 | -6/+13 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | remove extra '/' in assets url | UbitUmarov | 2012-09-06 | 1 | -6/+13 |
| | |/ | |/| | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-04 | 1 | -4/+6 |
|\ \ \ | |/ / | |||||
| * | | bug fix | UbitUmarov | 2012-09-04 | 1 | -4/+6 |
| | | | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-04 | 3 | -3/+11 |
|\ \ \ | |/ / |