aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-043-3/+11
| | | | | | | | | | | | flight. FS 4.2.2 does not.
* | | 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
| |/ | | | | | | regions )
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-014-33/+111
|\ \ | |/
| * try to reduce potencial recursive lockingUbitUmarov2012-09-011-26/+51
| |
| * Merge branch 'avination' into ubitworkUbitUmarov2012-08-313-7/+60
| |\
| | * Merge branch 'ubitwork' into avinationMelanie2012-08-303-35/+38
| | |\
| | * | Sequence inventory descendents requests to reduce inventory server load andMelanie2012-08-302-5/+56
| | | | | | | | | | | | | | | | movement lag.
| | * | Allow llList2Key to also act on System.StringMelanie2012-08-291-1/+2
| | | |
| | * | Merge branch 'ubitwork' into avinationMelanie2012-08-298-151/+565
| | |\ \
| | * | | Make llCollisionSprite not throw anymoreMelanie2012-08-251-1/+2
| | | | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-303-4/+8
|\ \ \ \ \ | |/ / / /
| * | | | move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-303-4/+8
| | |_|/ | |/| | | | | | | | | | newgroup information avaiable.
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-303-35/+38
|\ \ \ \ | |/ / /
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-08-302-12/+128
| |\ \ \ | | | |/ | | |/|
| * | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacingUbitUmarov2012-08-303-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 ubitworkubit2012-08-302-12/+128
|\ \ \ \ | | |/ / | |/| |
| * | | Fix issue with the quit packet being stuck int he queue and a one packet delay.Melanie2012-08-291-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 clientsMelanie2012-08-291-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 ubitworkMelanie2012-08-297-137/+435
| |\ \ \ | | |/ /
| * | | Add a queue with two priority levels. This is a drop in replacement forMelanie2012-08-281-2/+111
| | | | | | | | | | | | | | | | the BlockingQueue from OMV, but allows two priorities.
| * | | Fix a nullref while object is being createdMelanie2012-08-281-1/+2
| | | |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-294-65/+117
|\ \ \ \ | | |/ / | |/| |
| * | | A few more changes to keyframesUbitUmarov2012-08-294-65/+117
| | | |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-291-115/+165
|\ \ \ \ | |/ / /
| * | | [Potentially broken] keyframes changes.. since it's there, use timer forUbitUmarov2012-08-291-115/+165
| | | | | | | | | | | | | | | | crossing retries and not still another thread, etc...
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-288-117/+313
|\ \ \ \ | |/ / /
| * | | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-288-115/+311
| |/ / | | | | | | | | | threads overlaps, some null objects exceptions, region crossing...