Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
|\ \ \ | |/ / | ||||||
| * | | a forgotten file plus minor changes. Imp and SL viewer seem to preserve | UbitUmarov | 2012-09-04 | 3 | -3/+11 | |
| | | | | | | | | | | | | flight. FS 4.2.2 does not. | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-04 | 1 | -0/+6 | |
|\ \ \ | |/ / | ||||||
| * | | let avatar keep flying in tps to same region. (still bad for other | UbitUmarov | 2012-09-04 | 1 | -0/+6 | |
| |/ | | | | | | | regions ) | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-01 | 4 | -33/+111 | |
|\ \ | |/ | ||||||
| * | try to reduce potencial recursive locking | UbitUmarov | 2012-09-01 | 1 | -26/+51 | |
| | | ||||||
| * | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-08-31 | 3 | -7/+60 | |
| |\ | ||||||
| | * | Merge branch 'ubitwork' into avination | Melanie | 2012-08-30 | 3 | -35/+38 | |
| | |\ | ||||||
| | * | | Sequence inventory descendents requests to reduce inventory server load and | Melanie | 2012-08-30 | 2 | -5/+56 | |
| | | | | | | | | | | | | | | | | movement lag. | |||||
| | * | | Allow llList2Key to also act on System.String | Melanie | 2012-08-29 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-08-29 | 8 | -151/+565 | |
| | |\ \ | ||||||
| | * | | | Make llCollisionSprite not throw anymore | Melanie | 2012-08-25 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-30 | 3 | -4/+8 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | move keyframemotion.copy from sop.copy to sog.copy, where there is | UbitUmarov | 2012-08-30 | 3 | -4/+8 | |
| | |_|/ | |/| | | | | | | | | | | newgroup information avaiable. | |||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-30 | 3 | -35/+38 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-08-30 | 2 | -12/+128 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacing | UbitUmarov | 2012-08-30 | 3 | -35/+38 | |
| | | | | | | | | | | | | | | | | | | | | fromdata(seralize). for now its called with null group since sop.copy() hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them. | |||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-30 | 2 | -12/+128 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | 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. | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-08-29 | 7 | -137/+435 | |
| |\ \ \ | | |/ / | ||||||
| * | | | 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. | |||||
| * | | | Fix a nullref while object is being created | Melanie | 2012-08-28 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-29 | 4 | -65/+117 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | A few more changes to keyframes | UbitUmarov | 2012-08-29 | 4 | -65/+117 | |
| | | | | ||||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-29 | 1 | -115/+165 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | [Potentially broken] keyframes changes.. since it's there, use timer for | UbitUmarov | 2012-08-29 | 1 | -115/+165 | |
| | | | | | | | | | | | | | | | | crossing retries and not still another thread, etc... | |||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-28 | 8 | -117/+313 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | [possible still very broken] mess around keyframes. timer events | UbitUmarov | 2012-08-28 | 8 | -115/+311 | |
| |/ / | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing... | |||||
| * | | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal | UbitUmarov | 2012-08-26 | 1 | -2/+2 | |
| |/ | | | | | | | DataFormat enum, using values from the KFM constants | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-25 | 14 | -66/+189 | |
|\ \ | |/ | ||||||
| * | Merge branch 'ubitwork' into avination | Melanie | 2012-08-24 | 6 | -5/+9 | |
| |\ | ||||||
| | * | let setLinkPrimParams terminate even if there are no more parts. | UbitUmarov | 2012-08-16 | 1 | -2/+3 | |
| | | | ||||||
| * | | Remove debug spam | Melanie | 2012-08-24 | 1 | -2/+2 | |
| | | |