| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 1 | -0/+596 | |
| |\ \ | |/ | ||||||
| | * | missing file for suport of mesh upload cost | UbitUmarov | 2012-09-17 | 1 | -0/+596 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 2 | -45/+199 | |
| |\ \ | |/ | ||||||
| | * | Revamp the HTTP textures handler to allow a maximum of four fetches | Melanie | 2012-09-14 | 1 | -44/+179 | |
| | | | | | | | | | at any time and to drop requests for avatars n longer in the scene | |||||
| | * | Allow some more connections to try to ease lag. | Melanie | 2012-09-14 | 1 | -1/+3 | |
| | | | ||||||
| | * | Add a logger so the prior commit will work | Melanie | 2012-09-12 | 1 | -0/+3 | |
| | | | ||||||
| | * | Stop expiry timer when upload is complete. Log if timeout is reached. | Melanie | 2012-09-12 | 1 | -0/+2 | |
| | | | ||||||
| | * | Add a timer to time out upload caps handlers that are not used. | Melanie | 2012-09-12 | 1 | -0/+12 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 2 | -303/+85 | |
| |\ \ | |/ | ||||||
| | * | 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 | 1 | -2/+46 | |
| | | | ||||||
| | * | let LLSDAssetUploadRequest include asset_resources information plus let | UbitUmarov | 2012-09-11 | 1 | -0/+1 | |
| | | | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still) | |||||
| | * | 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 | 1 | -7/+44 | |
| | | | ||||||
| | * | 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 | -92/+117 | |
| |\ \ | |/ | ||||||
| | * | Revamp the v3 inventory sending. Uses threads and some nifty mechanics to | Melanie | 2012-09-11 | 1 | -81/+117 | |
| | | | | | | | | | leverage the Poll Service without blocking it's workers. | |||||
| | * | Remove commented code | Melanie | 2012-09-10 | 1 | -11/+0 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-10 | 1 | -11/+32 | |
| |\ \ | |/ | ||||||
| | * | 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-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 | 2 | -2/+9 | |
| |\ \ | |/ | ||||||
| | * | a forgotten file plus minor changes. Imp and SL viewer seem to preserve | UbitUmarov | 2012-09-04 | 2 | -2/+9 | |
| | | | | | | | | | flight. FS 4.2.2 does not. | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-01 | 1 | -0/+1 | |
| |\ \ | |/ | ||||||
| | * | Sequence inventory descendents requests to reduce inventory server load and | Melanie | 2012-08-30 | 1 | -0/+1 | |
| | | | | | | | | | movement lag. | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-30 | 1 | -11/+126 | |
| |\ \ | |/ | ||||||
| | * | Fix issue with the quit packet being stuck int he queue and a one packet delay. | Melanie | 2012-08-29 | 1 | -2/+8 | |
| | | | | | | | | | Also fix semaphore excetion caused by enqueueing while dequque is taking place. | |||||
| | * | Remove Justin's addition to avoid sending incoming packets to inactive clients | Melanie | 2012-08-29 | 1 | -9/+9 | |
| | | | | | | | | | | | This also causes the initial AgentUpdate to be rejected because our processing is asynchronous. | |||||
| | * | Add a queue with two priority levels. This is a drop in replacement for | Melanie | 2012-08-28 | 1 | -2/+111 | |
| | | | | | | | | | the BlockingQueue from OMV, but allows two priorities. | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-25 | 3 | -50/+111 | |
| |\ \ | |/ | ||||||
| | * | Remove debug spam | Melanie | 2012-08-24 | 1 | -2/+2 | |
| | | | ||||||
| | * | Fix background inventory loading (Viewer 3) so it won't lag out the sim | Melanie | 2012-08-24 | 1 | -49/+103 | |
| | | | ||||||
| | * | Allow updates sent for right pec to go to the client | Melanie | 2012-08-21 | 1 | -1/+1 | |
| | | | ||||||
| | * | Make the console output from the reigon console hookable | Melanie | 2012-08-18 | 1 | -0/+7 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-16 | 3 | -4/+243 | |
| |\ \ | |/ | ||||||
| | * | Actually add the module | Melanie | 2012-08-14 | 1 | -0/+234 | |
| | | | ||||||
| | * | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 2 | -4/+9 | |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||||
| | | * | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 2 | -4/+9 | |
| | | |\ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | | | * | Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 2 | -4/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket. All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini | |||||
| * | | | | 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 | |||||
| | * | | | Remove another superflouous IsActive set | Melanie | 2012-08-03 | 1 | -2/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 1 | -2/+1 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Remove a merge artefaci in IsActive handling and restore commented out ↵ | Melanie | 2012-08-03 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | correct one | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |