aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2010-01-142-5/+21
|\
| * Change the error messages on region region registration. This changes URMMelanie2010-01-131-3/+3
| | | | | | | | | | and region. The non-error case should be compatible, so no version bump. Untested.
| * add interface/method documentatio nto IScriptModuleCommsJustin Clark-Casey (justincc)2010-01-111-2/+18
| |
* | Merge branch 'master' into careminsterMelanie2010-01-113-169/+169
|\ \ | |/
| * Whitespace cleanupMelanie2010-01-113-169/+169
| |
* | Merge branch 'master' into careminsterMelanie2010-01-113-5/+174
|\ \ | |/
| * Adds llRotTarget and the events at_rot_target and not_at_rot_target.Revolution2010-01-113-5/+174
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2010-01-102-77/+223
|\ \ | |/
| * Clean CRs from previous patchMelanie2010-01-101-67/+67
| |
| * Adds land collision events.Revolution2010-01-102-10/+156
| | | | | | | | | | | | CRs cleaned from patch Signed-off-by: Melanie <melanie@t-data.com>
* | 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-036-38/+45
|\ \ | |/
| * Formatting cleanup. Add copyright headers.Jeff Ames2010-01-046-40/+40
| |
* | 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-295-11/+23
|\ \ | |/
| * Change teleports so the TeleportFlags are sent to the destination sim. ItMelanie2009-12-295-11/+23
| | | | | | | | | | 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-224-6/+39
| | | | | | | | | | | | | | | | | | 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-224-6/+39
| |
* | 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
| |