| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | on log and "show scripts" messages, show script item UUID rather than asset UUID | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -4/+4 |
* | | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge | Melanie | 2011-10-25 | 3 | -7/+31 |
|\ \
| |/ |
|
| * | add current script status to "scripts show" command (running, suspended, etc.) | Justin Clark-Casey (justincc) | 2011-10-19 | 3 | -7/+31 |
* | | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+28 |
|\ \
| |/ |
|
| * | Add "show scripts" command to show all scripts currently known to the script ... | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -2/+28 |
* | | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSit... | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+1 |
* | | Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge | Melanie | 2011-10-25 | 1 | -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-17 | 1 | -1/+1 |
* | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 3 | -0/+17 |
|\ \
| |/ |
|
| * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 3 | -0/+17 |
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 4 | -0/+19 |
|\ \
| |/ |
|
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 4 | -0/+19 |
* | | Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+5 |
|\ \
| |/ |
|
| * | Don't execute rest of code in XEngine.RemoveRegion() and Close() if the modul... | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -0/+6 |
* | | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+0 |
|\ \
| |/ |
|
| * | Get rid of some traces of the old pre-ROBUST grid architecture config | Justin Clark-Casey (justincc) | 2011-10-12 | 1 | -2/+0 |
* | | Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+2 |
|\ \
| |/ |
|
| * | When shutting down XEngine, log how many scripts are being shutdown so the us... | Justin Clark-Casey (justincc) | 2011-10-12 | 2 | -2/+5 |
* | | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge | Melanie | 2011-10-12 | 2 | -21/+32 |
|\ \
| |/ |
|
| * | osSetParcelDetails - PARCEL_DETAILS_CLAIMDATE | Pixel Tomsen | 2011-10-11 | 2 | -21/+32 |
* | | Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge | Melanie | 2011-10-12 | 2 | -2/+2 |
|\ \
| |/ |
|
| * | Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiom... | Justin Clark-Casey (justincc) | 2011-10-10 | 2 | -2/+2 |
* | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 2 | -2/+2 |
|\ \
| |/ |
|
| * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather t... | Justin Clark-Casey (justincc) | 2011-10-10 | 2 | -2/+2 |
* | | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... | Dan Lake | 2011-10-04 | 1 | -1/+1 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-03 | 1 | -3/+18 |
| |\ |
|
* | \ | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+4 |
|\ \ \
| |/ / |
|
| * | | Removed redundant code in AttachmentsModule and simplified interfaces which c... | Dan Lake | 2011-10-03 | 1 | -2/+1 |
* | | | Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | trival tweak to trigger the continuous integration system | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
* | | | Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather... | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
* | | | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+16 |
|\ \ \
| |/ / |
|
| * | | For llGetTexture(), if the face texture asset is in the inventory, return the... | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+16 |
| |/ |
|
* | | Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+41 |
|\ \
| |/ |
|
| * | llGetLinkKey, llGetLinkName Fix for sitting Avatar | Pixel Tomsen | 2011-10-01 | 1 | -0/+41 |
* | | Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge | Melanie | 2011-10-11 | 3 | -0/+20 |
|\ \
| |/ |
|
| * | llAvatarOnLinkSitTarget Implementation | Pixel Tomsen | 2011-09-29 | 3 | -0/+20 |
* | | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
* | | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -1/+1 |
* | | Bring us up to date. | Tom | 2011-09-14 | 4 | -51/+107 |
|\ \
| |/ |
|
| * | minor: if the script engine fails to find a prim for a script, also print out... | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -1/+1 |
| * | Delay loading scripts until the scene has finished loading | Oren Hurvitz | 2011-09-09 | 1 | -0/+3 |
| * | llSetPrimitiveParams Prim type params precision errors | Micheil Merlin | 2011-09-09 | 2 | -44/+90 |
| * | When invoking any of the OSSL teleport functions, do it on a separate thread ... | Justin Clark-Casey (justincc) | 2011-09-07 | 1 | -6/+13 |
* | | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -5/+7 |
* | | First set of merge fixes | Tom | 2011-09-07 | 1 | -2/+1 |