aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-175-307/+119
|\
| * Add a missing brace, remove a useless temp variable, enable charging.Melanie2012-09-111-6/+3
| |
| * report mesh upload costs ( fake values)UbitUmarov2012-09-112-3/+68
| |
| * let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-112-1/+11
| | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still)
| * Merge branch 'avination' into ubitworkUbitUmarov2012-09-113-305/+45
| |\
| | * Removing the variable prica handler again. It's never called, was misnamed andMelanie2012-09-111-332/+0
| | | | | | | | | | | | probably never worked past the mesh beta.
| | * Re-add the module and fix a typoMelanie2012-09-111-0/+332
| | |
| | * Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePriceMelanie2012-09-111-332/+0
| | | | | | | | | | | | which is the name actually used in viewer code.
| | * Add cost calculation suppor tto the VariablePrice one as wellMelanie2012-09-112-9/+44
| | |
| | * Revert "Remove the unused NewFileAgentInventoryVariablePrice module."Melanie2012-09-111-0/+296
| | | | | | | | | | | | | | | | | | It's actually used. This reverts commit 94a8e5572b1529190a174f29f866b65e7b2ccc0e.
| | * Add the option to have variable costing for uploadsMelanie2012-09-112-9/+46
| | |
| | * Remove the unused NewFileAgentInventoryVariablePrice module.Melanie2012-09-111-296/+0
| | |
* | | 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-115-93/+124
|\ \ | |/
| * Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-112-81/+118
| | | | | | | | leverage the Poll Service without blocking it's workers.
| * Remove commented codeMelanie2012-09-101-11/+0
| |
| * Merge branch 'ubitwork' into avinationMelanie2012-09-102-12/+34
| |\
| * | Reduce max concurrent endpoint connections from 50 to 6 (was 2 before)Melanie2012-09-091-1/+1
| | |
| * | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-092-1/+4
| | | | | | | | | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly.
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-084-23/+93
| |\ \
| * | | Set the maximum number of concurrent connections to a service endpointMelanie2012-09-071-0/+2
| | | | | | | | | | | | | | | | | | | | to 50. This doesn't work on stock mono but it works in Avination and also under Windoze.
* | | | dummy commitubit2012-09-111-1/+2
| | | |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-102-12/+34
|\ \ \ \ | | |_|/ | |/| |
| * | | add a extra httppool thread to compensate for webfetchinventoryUbitUmarov2012-09-101-1/+2
| | | |
| * | | webFetchInventory: change control event to simple flag, adjust lockingUbitUmarov2012-09-101-11/+32
| | |/ | |/|
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-081-4/+49
|\ \ \ | |/ /
| * | llClientView: try to have only one thread per client processingUbitUmarov2012-09-081-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 ubitworkubit2012-09-074-20/+45
|\ \ \ | |/ /
| * | One more redundante ParcelProprieties on loginUbitUmarov2012-09-071-0/+2
| | |
| * | stop sending duplicated parcelProprieties at loginUbitUmarov2012-09-071-18/+39
| | |
| * | remove fireandforget call to EnableChildAgents at end on CompleteMovement,UbitUmarov2012-09-071-1/+3
| |/ | | | | | | since this is already on own thread and its at the end of it.
| * Prevent double slashes, try #4UbitUmarov2012-09-061-1/+1
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-061-8/+9
|\ \ | |/
| * Prevent double slashes, try #3Melanie2012-09-061-0/+3
| |
| * Revert "Change string concatenation to Path.Combine to eliminate extra slashes."Melanie2012-09-061-8/+6
| | | | | | | | This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9.
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-069-173/+192
|\ \ | |/
| * Merge branch 'ubitwork' into avinationMelanie2012-09-061-6/+8
| |\
| | * Change string concatenation to Path.Combine to eliminate extra slashes.Melanie2012-09-061-6/+8
| | | | | | | | | | | | Windoze barfs on them.
| | * Revert " remove extra '/' in assets url"Melanie2012-09-061-13/+6
| | | | | | | | | | | | This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486.
| * | Make friend notifies and closing child agents async because both canMelanie2012-09-043-43/+48
| | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-044-3/+19
| |\ \
| * | | Remove debug spamMelanie2012-09-041-6/+6
| | | |
| * | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-043-97/+113
| | | | | | | | | | | | | | | | it's own sub-method
| * | | Prevent a nullref if SimStatsReporter tries to report on a sim where psysics areMelanie2012-09-031-14/+17
| | | | | | | | | | | | | | | | not yet initialized
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-061-6/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | remove extra '/' in assets urlUbitUmarov2012-09-061-6/+13
| | |/ | |/|
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-041-4/+6
|\ \ \ | |/ /
| * | bug fixUbitUmarov2012-09-041-4/+6
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-043-3/+11
|\ \ \ | |/ /