aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)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
| * Removing the variable prica handler again. It's never called, was misnamed andMelanie2012-09-111-332/+0
| * Re-add the module and fix a typoMelanie2012-09-111-0/+332
| * Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePriceMelanie2012-09-111-332/+0
| * 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
| * 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-114-93/+123
|\ \ | |/
| * Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-111-81/+117
| * 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
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-084-23/+93
| |\ \
| * | | Set the maximum number of concurrent connections to a service endpointMelanie2012-09-071-0/+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
* | | 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
| |/
| * 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
* | 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
| | * Revert " remove extra '/' in assets url"Melanie2012-09-061-13/+6
| * | Make friend notifies and closing child agents async because both canMelanie2012-09-043-43/+48
| * | 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
| * | | Prevent a nullref if SimStatsReporter tries to report on a sim where psysics areMelanie2012-09-031-14/+17
* | | | 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
|\ \ \ | |/ /
| * | a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-043-3/+11
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-041-0/+6
|\ \ \ | |/ /
| * | let avatar keep flying in tps to same region. (still bad for otherUbitUmarov2012-09-041-0/+6
| |/
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-014-33/+111
|\ \ | |/