Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 2 | -23/+17 |
|\ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Continuation of previous checkin. Found more places where ↵ | Dan Lake | 2011-10-27 | 1 | -15/+9 |
| | | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence. | ||||
| * | Added new ForEachRootScenePresence to Scene since almost every delegate ↵ | Dan Lake | 2011-10-27 | 1 | -10/+10 |
| | | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 2 | -10/+84 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Added optional owner classes to existing OSSL agent Permissions | Michelle Argus | 2011-10-26 | 1 | -6/+61 |
| | | | | | | | | | | | | PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes. Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Implementation of PRIM_OMEGA, but only for setting | SignpostMarv Martin | 2011-10-26 | 1 | -4/+17 |
| | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Implementing PRIM_LINK_TARGET, but only for setting params | SignpostMarv Martin | 2011-10-26 | 1 | -4/+13 |
| | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Add case to Lightshare/Windlight | BlueWall | 2011-10-22 | 1 | -0/+3 |
| | | | | | | | | Thanks thomax for a patch to add handling for Sun/Moon pos. | ||||
* | | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵ | Dan Lake | 2011-10-19 | 1 | -1/+1 |
| | | | | | | | | scene presence by client ID. | ||||
* | | 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 |
| | | | | | | | | | | | | engine in the current region. Also added synonym of "scripts show" | ||||
* | | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | refactor: Use SOP.SitTargetAvatar instead of calling a special ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+1 |
| | | | | | | | | GetAvatarOnSitTarget() which returned exactly the same thing | ||||
* | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -0/+11 |
| | | | | | | | | Allows you to stand an NPC that has sat. | ||||
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+11 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE) e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE); At the moment, sit only succeeds if the part has a sit target set. NPC immediately sits on the target even if miles away - they do not walk up to it. This method is in development - it may change so please don't trust it yet. Standing will follow shortly since that's kind of important once you're sitting :) | ||||
* | | 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 '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge | Melanie | 2011-10-12 | 1 | -21/+28 |
|\ \ | |/ | |||||
| * | osSetParcelDetails - PARCEL_DETAILS_CLAIMDATE | Pixel Tomsen | 2011-10-11 | 1 | -21/+28 |
| | | | | | | | | | | | | | | this new flag set parcels claim date value 0 for this flag set current unixstamp http://opensimulator.org/mantis/view.php?id=5725 | ||||
* | | Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge | Melanie | 2011-10-12 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | Convert getLastReportedSimFPS() and getLastReportedSimStats() into more ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 2 | -2/+2 |
| | | | | | | | | idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter | ||||
* | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 2 | -2/+2 |
| | | | | | | | | | | | | than going through scene I know this goes against the law of demeter but I don't think it's that useful here and I'd rather get rid of nasty little wrapper methods | ||||
* | | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | ||||
| * | Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵ | Dan Lake | 2011-10-04 | 1 | -1/+1 |
| | | | | | | | | handlers for attachments to call public interface and rearranged module file into sections | ||||
| * | 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 |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | Removed redundant code in AttachmentsModule and simplified interfaces which ↵ | Dan Lake | 2011-10-03 | 1 | -2/+1 |
| | | | | | | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still. | ||||
* | | | 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, ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | rather than "" As per http://wiki.secondlife.com/wiki/LlGetTexture | ||||
* | | | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+16 |
|\ \ \ | |/ / | |||||
| * | | For llGetTexture(), if the face texture asset is in the inventory, return ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+16 |
| |/ | | | | | | | | | | | | | | | the inventory name rather than the asset UUID This is as per http://wiki.secondlife.com/wiki/LlGetTexture Applied patch in http://opensimulator.org/mantis/view.php?id=4552 with an additional break statement if an inventory item is found to exit early. Thanks Michelle Argus! | ||||
* | | 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 |
| | | | | | | | | | | | | when an avatar sits on a prim, we get now his key & name ;-) http://opensimulator.org/mantis/view.php?id=4476 | ||||
* | | Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+14 |
|\ \ | |/ | |||||
| * | llAvatarOnLinkSitTarget Implementation | Pixel Tomsen | 2011-09-29 | 1 | -0/+14 |
| | | | | | | | | http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget | ||||
* | | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
* | | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| * | refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to ↵ | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -1/+1 |
| | | | | | | | | | | | | reflect what it actually does This also makes it consistent with some other methods that send data to the client. | ||||
* | | Bring us up to date. | Tom | 2011-09-14 | 2 | -25/+70 |
|\ \ | |/ | |||||
| * | llSetPrimitiveParams Prim type params precision errors | Micheil Merlin | 2011-09-09 | 1 | -19/+57 |
| | | |||||
| * | When invoking any of the OSSL teleport functions, do it on a separate thread ↵ | Justin Clark-Casey (justincc) | 2011-09-07 | 1 | -6/+13 |
| | | | | | | | | | | | | | | rather than the script thread. This is to prevent the aborting of attachment script threads on teleport from aborting the one actually doing the teleport. This allows OSSL teleport functions to work when invoked on scripts in attachments (and huds, I assume) | ||||
* | | 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 |
| | |