aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmergeMelanie2011-10-251-1/+1
|\
| * refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSit...Justin Clark-Casey (justincc)2011-10-171-1/+1
* | Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * rename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more und...Justin Clark-Casey (justincc)2011-10-171-1/+1
* | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmergeMelanie2011-10-253-0/+17
|\ \ | |/
| * Implement osNpcStand(<npc-id>)Justin Clark-Casey (justincc)2011-10-173-0/+17
* | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-254-0/+19
|\ \ | |/
| * Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-174-0/+19
* | Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmergeMelanie2011-10-251-0/+5
|\ \ | |/
| * Don't execute rest of code in XEngine.RemoveRegion() and Close() if the modul...Justin Clark-Casey (justincc)2011-10-141-0/+6
* | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-251-2/+0
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-121-2/+0
* | Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmergeMelanie2011-10-252-2/+2
|\ \ | |/
| * When shutting down XEngine, log how many scripts are being shutdown so the us...Justin Clark-Casey (justincc)2011-10-122-2/+5
* | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmergeMelanie2011-10-122-21/+32
|\ \ | |/
| * osSetParcelDetails - PARCEL_DETAILS_CLAIMDATEPixel Tomsen2011-10-112-21/+32
* | Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmergeMelanie2011-10-122-2/+2
|\ \ | |/
| * Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiom...Justin Clark-Casey (justincc)2011-10-102-2/+2
* | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmergeMelanie2011-10-122-2/+2
|\ \ | |/
| * refactor: have lsl and ossl interrogate scene.StatsReporter directly rather t...Justin Clark-Casey (justincc)2011-10-102-2/+2
* | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand...Dan Lake2011-10-041-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-031-3/+18
| |\
* | \ Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-111-4/+4
|\ \ \ | |/ /
| * | Removed redundant code in AttachmentsModule and simplified interfaces which c...Dan Lake2011-10-031-2/+1
* | | Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmergeMelanie2011-10-111-1/+1
|\ \ \ | | |/ | |/|
| * | trival tweak to trigger the continuous integration systemJustin Clark-Casey (justincc)2011-10-041-1/+1
* | | Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmergeMelanie2011-10-111-1/+1
|\ \ \ | |/ /
| * | Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather...Justin Clark-Casey (justincc)2011-10-041-1/+1
* | | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmergeMelanie2011-10-111-1/+16
|\ \ \ | |/ /
| * | For llGetTexture(), if the face texture asset is in the inventory, return the...Justin Clark-Casey (justincc)2011-10-041-1/+16
| |/
* | Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmergeMelanie2011-10-111-0/+41
|\ \ | |/
| * llGetLinkKey, llGetLinkName Fix for sitting AvatarPixel Tomsen2011-10-011-0/+41
* | Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmergeMelanie2011-10-113-0/+20
|\ \ | |/
| * llAvatarOnLinkSitTarget ImplementationPixel Tomsen2011-09-293-0/+20
* | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle...Justin Clark-Casey (justincc)2011-09-151-1/+1
* | Bring us up to date.Tom2011-09-144-51/+107
|\ \ | |/
| * minor: if the script engine fails to find a prim for a script, also print out...Justin Clark-Casey (justincc)2011-09-121-1/+1
| * Delay loading scripts until the scene has finished loadingOren Hurvitz2011-09-091-0/+3
| * llSetPrimitiveParams Prim type params precision errorsMicheil Merlin2011-09-092-44/+90
| * When invoking any of the OSSL teleport functions, do it on a separate thread ...Justin Clark-Casey (justincc)2011-09-071-6/+13
* | Merge fixes, and fix the buildTom2011-09-141-5/+7
* | First set of merge fixesTom2011-09-071-2/+1
* | Resolve merge commits, stage 1Tom2011-09-0417-426/+1404
|\ \ | |/
| * refactor: use SOG register target waypoints and rots directly instead of call...Justin Clark-Casey (justincc)2011-09-011-4/+6
| * Eliminate pointless checks of SOG.RootPart != nullJustin Clark-Casey (justincc)2011-09-013-13/+3
| * Fix issue with llGetTorque() where it would only ever return a zero vector.Justin Clark-Casey (justincc)2011-09-011-1/+1
| * Remove pointless cluttering SOP.ParentGroup != null checks.Justin Clark-Casey (justincc)2011-09-015-114/+63