aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2010-01-102-12/+9
|\
| * Fix a small bug in login disable codeMelanie2010-01-101-1/+1
| |
| * Add "StartDisabled" to [Startup] to make all regions start up withMelanie2010-01-101-5/+9
| | | | | | | | logins disabled until enabled from the console. Add the AccessModule (WIP)
| * Remove "login disable", "login enable" and "login status" commands.Melanie2010-01-101-7/+0
| |
* | Merge branch 'master' into careminsterMelanie2010-01-091-3/+3
|\ \ | |/
| * Fixes prim to prim collision.Revolution2010-01-091-3/+3
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2010-01-091-1/+28
|\ \ | |/
| * Implement the groups module query to make the estate allowed groups workMelanie2010-01-091-1/+28
| |
* | Merge branch 'master' into careminsterMelanie2010-01-091-45/+74
|\ \ | |/
| * Fixes the Collision errors and adds more to llGetStatusRevolution2010-01-071-45/+74
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2010-01-041-0/+7
|\ \ | |/
| * When rezzing a no-copy object on a no-rez parcel, the object vanishes fromMelanie2010-01-041-0/+7
| | | | | | | | | | inventory until relog. This patch corrects this and puts the item back into inventory.
* | 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
| | | | | | | | | | | | Applied with whitespace cleanup Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2009-12-311-271/+63
|\ \ | |/
| * This patch caused serialization errors and needs to be reexaminedMelanie2009-12-311-271/+63
| | | | | | | | | | | | Revert "[PATCH] Adds llCollisionFilter" This reverts commit eab2b4c6a96cd5b2a0f079f27a9c2ac15273d3f0.
* | Merge branch 'master' into careminsterMelanie2009-12-311-63/+271
|\ \ | |/
| * [PATCH] Adds llCollisionFilterMelanie2009-12-311-63/+271
| | | | | | | | Thank you, Revolution. Applied with minor changes.
| * * 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
| | | | | | | | type movements.
* | Add a small delay in NewAgentConnection to fix an issue with HippoMelanie2009-12-311-0/+3
| | | | | | | | (and possibly other cleints) getting their data mixed up.
* | 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
| | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation
* | Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ↵CasperW2009-12-271-11/+13
| | | | | | | | ReaderWriteLockSlim, hopefully fixes a native crash
* | Make sure that we're not bounds checking attachments. 'Cos otherwise your ↵CasperW2009-12-261-2/+2
| | | | | | | | hair will end up on your bum. Seen that before?
* | 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
| | | | | | | | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com>
* | | Fix for landing points. Only one scenario is not fully covered by this ↵CasperW2009-12-263-15/+59
|/ / | | | | | | change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point.
* | 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
| | | | | | | | doesn't pick up the old state again.
* | 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
| | | | | | | | | | | | | | | | | | Change the reader to wrap old-style definitions in new style wrappers. Change importer to not check irrelevant data that can't be reconstructed This removes the last bit of knowledge of XEngine's .state files from core.
| * | 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
| | |