aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "Change string concatenation to Path.Combine to eliminate extra slashes."Melanie2012-09-061-8/+6
* 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
| * remove extra '/' in assets urlUbitUmarov2012-09-061-6/+13
* | Make friend notifies and closing child agents async because both canMelanie2012-09-043-43/+48
* | Merge branch 'ubitwork' into avinationMelanie2012-09-044-3/+19
|\ \ | |/
| * bug fixUbitUmarov2012-09-041-4/+6
| * a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-043-3/+11
| * let avatar keep flying in tps to same region. (still bad for otherUbitUmarov2012-09-041-0/+6
* | 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
|/
* 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
| * | 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
* | | | move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-303-4/+8
| |_|/ |/| |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-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
| * | Remove Justin's addition to avoid sending incoming packets to inactive clientsMelanie2012-08-291-9/+9
| * | 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
| * | | Fix a nullref while object is being createdMelanie2012-08-281-1/+2
* | | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacingUbitUmarov2012-08-303-35/+38
| |/ / |/| |
* | | A few more changes to keyframesUbitUmarov2012-08-294-65/+117
* | | [Potentially broken] keyframes changes.. since it's there, use timer forUbitUmarov2012-08-291-115/+165
* | | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-288-115/+311
|/ /
* | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internalUbitUmarov2012-08-261-2/+2
|/
* Merge branch 'ubitwork' into avinationMelanie2012-08-246-5/+9
|\
| * let setLinkPrimParams terminate even if there are no more parts.UbitUmarov2012-08-161-2/+3
| * fix vs2010 buildUbitUmarov2012-08-165-3/+6
* | Remove debug spamMelanie2012-08-241-2/+2
* | Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-243-51/+107
* | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-233-3/+39
* | Make terrain save every 1000 frames instead of every 50. Database load is a s...Melanie2012-08-221-1/+1
* | Fix group return stuffMelanie2012-08-211-1/+1
* | Allow updates sent for right pec to go to the clientMelanie2012-08-211-1/+1
* | Implement seeing busy status in LSLMelanie2012-08-211-0/+7
* | Cause a persistence save if prim flags changeMelanie2012-08-211-0/+2
* | Add Camera Offsets to serializationMelanie2012-08-211-0/+14
* | Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
* | Make the console output from the reigon console hookableMelanie2012-08-182-0/+11
* | Fix a typoMelanie2012-08-181-1/+1
|/
* Merge branch 'master' into careminsterMelanie2012-08-1614-223/+466
|\
| * Do a proper null check to avoid the overloaded operator == trapMelanie2012-08-161-1/+1
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-1513-222/+465
| |\