aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Solve conflictMelanie2010-01-031-7/+0
* Merge branch 'master' into careminsterMelanie2010-01-034-36/+43
|\
| * Formatting cleanup. Add copyright headers.Jeff Ames2010-01-044-38/+38
* | Merge branch 'master' into careminsterMelanie2009-12-312-62/+276
|\ \ | |/
| * Readds llCollisionFilter and adds llPassCollision.Revolution2009-12-312-62/+276
* | Merge branch 'master' into careminsterMelanie2009-12-311-271/+63
|\ \ | |/
| * This patch caused serialization errors and needs to be reexaminedMelanie2009-12-311-271/+63
* | Merge branch 'master' into careminsterMelanie2009-12-311-63/+271
|\ \ | |/
| * [PATCH] Adds llCollisionFilterMelanie2009-12-311-63/+271
| * * Fixes Sitting on the ground.Teravus Ovares (Dan Olivares)2009-12-302-3/+13
| * * Makes forward and backward key reactions faster by responding to the NUDGE ...Teravus Ovares (Dan Olivares)2009-12-302-9/+35
* | Add a small delay in NewAgentConnection to fix an issue with HippoMelanie2009-12-311-0/+3
* | Merge branch 'master' into careminsterMelanie2009-12-294-10/+22
|\ \ | |/
| * Change teleports so the TeleportFlags are sent to the destination sim. ItMelanie2009-12-294-10/+22
* | 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-262-1/+66
|\ \
| * | Recover out-of-region objects during db load.Kitto Flora2009-12-241-0/+24
| * | Merge branch 'master' into careminsterMelanie2009-12-241-1/+2
| |\ \ | | |/
| | * Fixes the broken build of the previous commit.Diva Canto2009-12-231-1/+2
| * | Merge branch 'master' into careminsterMelanie2009-12-231-1/+41
| |\ \ | | |/
| | * Add saving assets from gestures to IARMelanie2009-12-231-1/+41
| | * Add a data path for error messagesroot2009-12-222-6/+34
* | | Fix for landing points. Only one scenario is not fully covered by this change...CasperW2009-12-263-15/+59
|/ /
* | Add a data path for error messagesroot2009-12-222-6/+34
* | Should not commit without compilingroot2009-12-221-1/+1
* | Jumped the gun...root2009-12-221-1/+1
* | Allow 100ms for scripts to run attach(NULL_KEY) on detachroot2009-12-221-0/+12
* | Merge branch 'master' into careminsterMelanie2009-12-222-2/+3
|\ \ | |/
| * Glue code for a couple of new LSL function implementationsMelanie2009-12-222-0/+51
* | Merge branch 'master' into careminsterMelanie2009-12-211-0/+1
|\ \ | |/
| * When a script has been loaded, remove it's state entry, so recompilingMelanie2009-12-211-0/+1
* | Merge branch 'master' into casperCasperW2009-12-214-33/+61
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-211-7/+48
| |\ \ | | |/
| | * Script State Fix: Part 2Melanie2009-12-211-7/+48
| * | Merge branch 'master' into careminsterMelanie2009-12-202-4/+4
| |\ \ | | |/
| | * Fix a case where an idle sim can eat 100% of a coreMelanie2009-12-201-1/+1
| | * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-12-151-3/+3
| * | Merge branch 'tests'Kitto Flora2009-12-191-22/+9
| |\ \
| | * | Fix mantis #10 & #14Kitto Flora2009-12-191-23/+10
* | | | Fixed a nasty crash in StandUp() that occurred when the part got killed with ...CasperW2009-12-211-13/+41
|/ / /
* | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.CasperW2009-12-172-2/+14
* | | Fix GetWorldRotation(), and a host of related Sit fixes.Kitto Flora2009-12-172-37/+38
|/ /
* | Fix prim linking bug, Manis #14Kitto Flora2009-12-151-2/+8
* | Merge branch 'master' into testsKitto Flora2009-12-151-1/+17
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-141-1/+17
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-141-0/+5
| | |\
| | | * * Implements OSSL function: osGetSimulatorMemory - returns the current amount...Adam Frisby2009-12-131-0/+5
| | * | Add an option to exit an instance rather than restarting a region within itMelanie2009-12-141-1/+12
| | |/
* | | Removed excessive call to UpdateMovementAnimations which prevented GroundSit;...Kitto Flora2009-12-151-25/+23