aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-172-303/+85
|\
| * Add a missing brace, remove a useless temp variable, enable charging.Melanie2012-09-111-6/+3
| * report mesh upload costs ( fake values)UbitUmarov2012-09-111-2/+46
| * let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-111-0/+1
| * 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-111-7/+44
| * Remove the unused NewFileAgentInventoryVariablePrice module.Melanie2012-09-111-296/+0
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-111-92/+117
|\ \ | |/
| * 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' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-101-11/+32
|\ \ | |/
| * 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-041-4/+6
|\ \ | |/
| * bug fixUbitUmarov2012-09-041-4/+6
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-042-2/+9
|\ \ | |/
| * a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-042-2/+9
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-011-0/+1
|\ \ | |/
| * Sequence inventory descendents requests to reduce inventory server load andMelanie2012-08-301-0/+1
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-301-11/+126
|\ \ | |/
| * Fix issue with the quit packet being stuck int he queue and a one packet delay.Melanie2012-08-291-2/+8
| * Remove Justin's addition to avoid sending incoming packets to inactive clientsMelanie2012-08-291-9/+9
| * Add a queue with two priority levels. This is a drop in replacement forMelanie2012-08-281-2/+111
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-253-50/+111
|\ \ | |/
| * Remove debug spamMelanie2012-08-241-2/+2
| * Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-241-49/+103
| * Allow updates sent for right pec to go to the clientMelanie2012-08-211-1/+1
| * Make the console output from the reigon console hookableMelanie2012-08-181-0/+7
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-163-4/+243
|\ \ | |/
| * Actually add the moduleMelanie2012-08-141-0/+234
| * Merge branch 'careminster' into avinationMelanie2012-08-142-4/+9
| |\
| | * Merge branch 'master' into careminsterMelanie2012-08-042-4/+9
| | |\
| | | * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAp...Justin Clark-Casey (justincc)2012-08-032-4/+9
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-041-2/+0
|\ \ \ \ | |/ / /
| * | | Remove another superflouous IsActive setMelanie2012-08-031-2/+0
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-2/+1
|\ \ \ \ | |/ / /
| * | | Remove a merge artefaci in IsActive handling and restore commented out correc...Melanie2012-08-031-2/+1
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-3/+3
|\ \ \ \ | |/ / /
| * | | clientview IsActive use is broken. Suspend it's use keeping it true ( toUbitUmarov2012-08-031-3/+3
| |/ /
* | | merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster...ubit2012-08-023-33/+62
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2012-07-282-2/+2
| |\ \ | | |/
| | * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-252-2/+2
| * | Merge branch 'master' into careminsterMelanie2012-07-251-1/+2
| |\ \ | | |/
| | * Extend region console "show queues" command to show already collected time si...Justin Clark-Casey (justincc)2012-07-241-1/+2
| * | Merge branch 'avination' into careminsterMelanie2012-07-231-1/+1
| |\ \