aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' into casperCasperW2009-12-271-3/+5
|\ \
| * | Correct some issues with the last commitroot2009-12-271-1/+2
| * | Merge branch 'master' into careminsterMelanie2009-12-261-2/+3
| |\ \ | | |/
| | * Close a SQL injection loophole in the new database driverMelanie2009-12-261-2/+3
* | | Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to Read...CasperW2009-12-271-11/+13
|/ /
* | Make sure that we're not bounds checking attachments. 'Cos otherwise your hai...CasperW2009-12-261-2/+2
* | Merge branch 'master' into casperCasperW2009-12-2626-19/+737
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-268-1/+43
| |\ \ | | |/
| | * Add AvatarInterestsReplyMelanie2009-12-268-1/+43
| | * Make the GenericTableHandler work as intendedroot2009-12-261-2/+8
| * | Make the GenericTableHandler work as intendedroot2009-12-261-2/+8
| * | Merge branch 'master' into careminsterMelanie2009-12-261-0/+25
| |\ \ | | |/
| | * Add a generic REPLACE INTO handler for put into the generic table handlerMelanie2009-12-261-0/+25
| * | Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THISMelanie2009-12-251-1/+1
| * | Restore version suffix.Melanie2009-12-251-1/+1
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2009-12-253-2/+28
| |\ \
| | * | Recover out-of-region objects during db load.Kitto Flora2009-12-243-2/+28
| * | | Merge branch 'master' into careminsterMelanie2009-12-252-0/+17
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-251-0/+4
| | |\
| | | * Clear Shape.SculptEntry if prim type is not a sculptie in llSetPrimitiveParam...dahlia2009-12-241-0/+4
| | * | Enable the profile module to be replaced completely, even for the baseMelanie2009-12-251-0/+13
| | |/
| * | Merge branch 'master' into careminsterMelanie2009-12-243-0/+483
| |\ \ | | |/