Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | When shutting down XEngine, log how many scripts are being shutdown so the ↵ | Justin Clark-Casey (justincc) | 2011-10-12 | 2 | -2/+5 |
| | | | | | | | | user knows why they are waiting. | ||||
* | | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge | Melanie | 2011-10-12 | 2 | -21/+32 |
|\ \ | |/ | |||||
| * | osSetParcelDetails - PARCEL_DETAILS_CLAIMDATE | Pixel Tomsen | 2011-10-11 | 2 | -21/+32 |
| | | | | | | | | | | | | | | 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 | 3 | -0/+20 |
|\ \ | |/ | |||||
| * | llAvatarOnLinkSitTarget Implementation | Pixel Tomsen | 2011-09-29 | 3 | -0/+20 |
| | | | | | | | | 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 | 4 | -51/+107 |
|\ \ | |/ | |||||
| * | minor: if the script engine fails to find a prim for a script, also print ↵ | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -1/+1 |
| | | | | | | | | out that prim's local id in the error message. | ||||
| * | 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 |
| | | | | | | | | | | | | | | 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 |
| | | |||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 17 | -426/+1404 |
|\ \ | |/ | |||||
| * | refactor: use SOG register target waypoints and rots directly instead of ↵ | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -4/+6 |
| | | | | | | | | calling through the SOP, which doesn't make conceptual sense anyway. | ||||
| * | Eliminate pointless checks of SOG.RootPart != null | Justin Clark-Casey (justincc) | 2011-09-01 | 3 | -13/+3 |
| | | | | | | | | It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized | ||||
| * | Fix issue with llGetTorque() where it would only ever return a zero vector. | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -1/+1 |
| | | |||||
| * | Remove pointless cluttering SOP.ParentGroup != null checks. | Justin Clark-Casey (justincc) | 2011-09-01 | 5 | -114/+63 |
| | | | | | | | | | | The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database. At all other times it's not possible for a SOP not to have a SOG parent. | ||||
| * | refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid ↵ | Justin Clark-Casey (justincc) | 2011-08-27 | 2 | -14/+14 |
| | | | | | | | | pointless duplication of identical values | ||||
| * | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar | Justin Clark-Casey (justincc) | 2011-08-26 | 3 | -7/+7 |
| | | | | | | | | This does a tiny bit to reduce code complexity, memory requirement and the cpu time of pointlessly setting this field to the same value in every SOP | ||||
| * | llSetPrimitiveParams correct prim hollow for cases where limit should be 70%. | Micheil Merlin | 2011-08-25 | 2 | -51/+111 |
| | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Fix llAttachToAvatar() | Justin Clark-Casey (justincc) | 2011-08-24 | 3 | -2/+22 |
| | | | | | | | | | | | | Apart from one obvious bug, this was failing because attempting to serialize the script from inside the script (as part of saving the attachment as an inventory asset) was triggering an extremely long delay. So we now don't do this. The state will be serialized anyway when the avatar normally logs out. The worst that can happen is that if the client/server crashes, the attachment scripts start without previous state. | ||||
| * | rename AttachmentsModule.ShowDetachInUserInventory() to ↵ | Justin Clark-Casey (justincc) | 2011-08-23 | 1 | -1/+1 |
| | | | | | | | | DetachSingleAttachmentToInv() for consistency and to reflect it's actual behaviour | ||||
| * | Protect a check for default texture entry when setting alpha values. Apparently | Mic Bowman | 2011-08-23 | 1 | -3/+10 |
| | | | | | | | | if all faces have their own textures then the default texture is null | ||||
| * | Thanks Neil Canham for fixing bulk inventory updates, no sending ↵ | Snoopy Pfeffer | 2011-08-22 | 1 | -1/+1 |
| | | | | | | | | BulkInventoryUpdate after accepting inventory items. | ||||
| * | Add avatar and attachments to llRegionSay | BlueWall | 2011-08-20 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | llRegionSay will now message avatars on chan 0 and will message attachments on the avatar that listen on channels other than 0. This behavior is consistant with the LL implementation as tested on regions in Agni with one exception: this implementation does not include issue: https://jira.secondlife.com/browse/SCR-66? | ||||
| * | Add llRegionSayTo | BlueWall | 2011-08-19 | 3 | -6/+27 |
| | | | | | | | | | | | | | | llRegionSayTo(key target, integer channel, string messasge) Allows messages to be sent region-wide to a particular prim. | ||||
| * | llGetPrimitiveParams fix prim hollow/hole shape value | Micheil Merlin | 2011-08-13 | 2 | -3/+178 |
| | |