aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2010-01-042-0/+9
|\
| * When rezzing a no-copy object on a no-rez parcel, the object vanishes fromMelanie2010-01-041-0/+7
| * Mark GetUserInventory as obsolete. It is still used in the defaultMelanie2010-01-041-0/+2
* | Solve conflictMelanie2010-01-031-7/+0
* | Merge branch 'master' into careminsterMelanie2010-01-0356-877/+1134
|\ \ | |/
| * Cause llSetText to send prim updates.Melanie2010-01-031-0/+1
| * Formatting cleanup. Add copyright headers.Jeff Ames2010-01-0454-877/+1114
| * Add virtual method StateChange to ScriptBaseClassMelanie2010-01-021-0/+4
| * Prevent the creation of duplicate inventory folders in the case of a loginMelanie2010-01-012-2/+13
| * Put PassCollision on the ignore list for testing, since we don't save thatMelanie2009-12-311-0/+1
* | Add virtual method StateChange to ScriptBaseClassMelanie2010-01-021-0/+4
* | Merge branch 'master' into careminsterMelanie2009-12-313-64/+293
|\ \ | |/
| * Readds llCollisionFilter and adds llPassCollision.Revolution2009-12-313-64/+293
* | Merge branch 'master' into careminsterMelanie2009-12-3112-4/+878
|\ \ | |/
| * Whitespace cleanup (changed hard tabs to 4 spaces)Melanie2009-12-312-486/+486
| * Adds Friend Finding functionality.Revolution2009-12-311-0/+23
| * Adds tons of packets.Revolution2009-12-3111-3/+854
* | Merge branch 'master' into careminsterMelanie2009-12-312-315/+67
|\ \ | |/
| * This patch caused serialization errors and needs to be reexaminedMelanie2009-12-312-315/+67
* | Merge branch 'master' into careminsterMelanie2009-12-315-67/+412
|\ \ | |/
| * [PATCH] Adds llCollisionFilterMelanie2009-12-312-67/+315
| * Adds osKickUser and osSetSpeedunknown2009-12-313-0/+97
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2009-12-311-0/+5
|\ \
| * | Revert "Merge branch 'master' into careminster"Melanie2009-12-302-22/+1
| * | Merge branch 'master' into careminsterMelanie2009-12-302-1/+22
| |\ \ | | |/
| | * * Fixes Sitting on the ground.Teravus Ovares (Dan Olivares)2009-12-302-3/+13
| * | Revert "Merge branch 'master' into careminster"Melanie2009-12-303-143/+4
| * | Merge branch 'master' into careminsterMelanie2009-12-303-4/+143
| |\ \ | | |/
| | * * Makes forward and backward key reactions faster by responding to the NUDGE ...Teravus Ovares (Dan Olivares)2009-12-302-9/+35
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-12-2914-26/+49
| | |\
| | | * Fix an omission in LSL that causes a viewer crashMelanie2009-12-301-0/+5
| | * | * Attempts to resolve the megaregion terrain edit rebound.Teravus Ovares (Dan Olivares)2009-12-291-0/+82
| * | | Fix an omission in LSL that causes a viewer crashMelanie2009-12-301-0/+5
* | | | Add a small delay in NewAgentConnection to fix an issue with HippoMelanie2009-12-311-0/+3
|/ / /
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2009-12-3013-26/+44
|\ \ \
| * \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2009-12-291-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2009-12-2913-26/+44
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Change teleports so the TeleportFlags are sent to the destination sim. ItMelanie2009-12-2913-26/+44
| | | |/ | | |/|
| | * | One should not copy/paste so much :)Melanie2009-12-271-3/+3
| | * | Fix the spelling :/Melanie2009-12-271-3/+3
* | | | Fix a timer list locking issue causing XMREngine deadlocksMelanie2009-12-301-15/+17
| |_|/ |/| |
* | | Fix up the new Sirikata cient viewMelanie2009-12-271-1/+1
|/ /
* | One should not copy/paste so much :)Melanie2009-12-271-3/+3
* | Fix the spelling :/Melanie2009-12-271-3/+3
* | Merge branch 'master' into careminsterMelanie2009-12-2718-0/+29757
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-2717-0/+29754
| |\
| | * * Implements some basic Sirikata protocol work (initial handshakes).Adam Frisby2009-12-272-1/+57
| | * * Implements Sirikata ClientStack ModuleAdam Frisby2009-12-2717-0/+29698
| * | Encode the published and mature checkboxes into the user flags forMelanie2009-12-271-0/+3
| |/
| * Correct some issues with the last commitroot2009-12-261-1/+2