| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -0/+3 |
|\ |
|
| * | Add missing property to llGetLinkPrimitiveParams | BlueWall | 2011-11-26 | 1 | -0/+3 |
* | | Remove unused and broken OffsetRotation from ScenePresence | Melanie | 2011-11-05 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -5/+4 |
|\ \
| |/ |
|
| * | Rename ForEachAvatar back to ForEachScenePresence. The other changes | Dan Lake | 2011-11-03 | 1 | -6/+6 |
| * | Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to | Dan Lake | 2011-11-03 | 1 | -10/+9 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -9/+5 |
|\ \
| |/ |
|
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-02 | 1 | -315/+362 |
| |\ |
|
| * | | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. | Dan Lake | 2011-11-02 | 1 | -9/+6 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 1 | -322/+350 |
|\ \ \
| | |/
| |/| |
|
| * | | Restore the recursive calling of PRIM_LINK_TARGET because the version I made | Melanie | 2011-11-02 | 1 | -327/+334 |
| * | | Some positioning fixes from AVN trunk | Melanie | 2011-11-02 | 1 | -1/+42 |
| * | | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario | Melanie | 2011-11-02 | 1 | -4/+3 |
| |/ |
|
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 1 | -8/+8 |
|\ \
| |/ |
|
| * | Added new ForEachRootScenePresence to Scene since almost every delegate passe... | Dan Lake | 2011-10-27 | 1 | -10/+10 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -4/+23 |
|\ \
| |/ |
|
| * | Implementation of PRIM_OMEGA, but only for setting | SignpostMarv Martin | 2011-10-26 | 1 | -4/+17 |
| * | Implementing PRIM_LINK_TARGET, but only for setting params | SignpostMarv Martin | 2011-10-26 | 1 | -4/+13 |
* | | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+0 |
|\ \
| |/ |
|
| * | Add "show scripts" command to show all scripts currently known to the script ... | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+0 |
* | | 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 '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 '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiom... | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -1/+1 |
* | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather t... | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -1/+1 |
* | | 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 | 1 | -0/+14 |
|\ \
| |/ |
|
| * | llAvatarOnLinkSitTarget Implementation | Pixel Tomsen | 2011-09-29 | 1 | -0/+14 |
* | | 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 | 1 | -19/+57 |
|\ \
| |/ |
|
| * | llSetPrimitiveParams Prim type params precision errors | Micheil Merlin | 2011-09-09 | 1 | -19/+57 |
* | | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -5/+7 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -231/+370 |
|\ \
| |/ |
|