| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into ubitworkmaster | UbitUmarov | 2014-09-09 | 4 | -1/+52 |
| |\ | |||||
| | * | make PERMISSION_OVERRIDE_ANIMATIONS implicit for attachments | Melanie Thielker | 2014-09-09 | 1 | -1/+2 |
| | | | |||||
| | * | Plumb llSetAnimationOverride | Melanie Thielker | 2014-09-09 | 4 | -0/+50 |
| | | | |||||
| * | | limit number of prims on physical objects. Not all cases covered still | UbitUmarov | 2014-09-08 | 1 | -0/+11 |
| |/ | |||||
| * | Merge branch 'ubitworkmaster' | Melanie Thielker | 2014-08-11 | 1 | -1/+10 |
| |\ | |||||
| | * | make sensors detect sitting avatars also by the distance to the root prim | UbitUmarov | 2014-08-10 | 1 | -1/+10 |
| | | | | | | | | | of the object as sl does (as sl avatar needs to be in the arc) | ||||
| * | | LSL llListFindList fix: check types as well as content. Items must be same type | Melanie Thielker | 2014-08-10 | 1 | -2/+10 |
| |/ | | | | to be found. | ||||
| * | change how sounds work. May be bad.. needs testing | UbitUmarov | 2014-07-27 | 1 | -5/+6 |
| | | |||||
| * | Remove some already commented lines | Melanie Thielker | 2014-07-20 | 1 | -11/+0 |
| | | |||||
| * | Fix LSL portions of sit positioning | Melanie Thielker | 2014-07-20 | 1 | -36/+12 |
| | | |||||
| * | replace old Attachoffset by AttachedPos. Comented out possible merge | UbitUmarov | 2014-07-20 | 1 | -1/+1 |
| | | | | | artifacts | ||||
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 26 | -8499/+11531 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 4 | -12/+68 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | ||||
| | | * | Added osGetRegionSize(), which returns the region size in meters and ↵ | Oren Hurvitz | 2014-01-28 | 3 | -0/+29 |
| | | | | | | | | | | | | | recognizes megaregions | ||||
| | | * | Following on from 50ea2e0, only fetch scene presence for check if ↵ | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -17/+38 |
| | | | | | | | | | | | | | lightscript function has failed initial IsEstateManagerOrOwner() check | ||||
| | | * | Fixed: Windlight functions caused an error if called when the script's owner ↵ | Oren Hurvitz | 2014-01-18 | 1 | -3/+9 |
| | | | | | | | | | | | | | isn't in the scene | ||||
| | | * | Revert "Fixed: Windlight functions caused an error if called when the ↵ | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -9/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | script's owner isn't in the scene" This reverts commit 39e5785c0f5bfa9fce2549757ac895920c88825a. Did not mean to apply this yet. | ||||
| | | * | Fixed: Windlight functions caused an error if called when the script's owner ↵ | Oren Hurvitz | 2014-01-17 | 1 | -3/+9 |
| | | | | | | | | | | | | | isn't in the scene | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 1 | -0/+1 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | Fixed llTextBox error message text | David Rowe | 2014-01-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Intermediate commit. Sill errors. | Melanie | 2014-01-05 | 3 | -8624/+10024 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs | ||||
| | | * | Add lsl arg syntax checking for control event | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -9386/+9716 |
| | | | | |||||
| | | * | refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for ↵ | Justin Clark-Casey (justincc) | 2013-12-21 | 1 | -7907/+7903 |
| | | | | | | | | | | | | | consistency | ||||
| | | * | Add arg checking for at_target lsl event | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8828/+9158 |
| | | | | |||||
| | | * | Add lsl event arg checking for at_rot_target | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8915/+9306 |
| | | | | |||||
| | | * | Add lsl event argument checking for attach and on_rez | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8593/+8946 |
| | | | | |||||
| | | * | Extend TestLlGetNotecardLine() regression test to contain chars that are two ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | bytes in utf8 | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-12-07 | 2 | -7784/+8165 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | | * | Add parameter checking for land_collision, land_collision_start and ↵ | Justin Clark-Casey (justincc) | 2013-11-29 | 2 | -7784/+8165 |
| | | | | | | | | | | | | | | | | | | | land_collision_end lsl events Wrong number of parmeters now generates syntax error on compile, as seen on LL grid | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-11-23 | 5 | -8235/+8866 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat | ||||
| | | * | Add regression test to check that specifying a non-existent event raise a ↵ | Justin Clark-Casey (justincc) | 2013-11-16 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | syntax error This was the case before any of the recent changes | ||||
| | | * | Add syntax checking for no_sensor() no-arg event | Justin Clark-Casey (justincc) | 2013-11-16 | 2 | -4970/+4981 |
| | | | | |||||
| | | * | refactor common code out of no argument LSL event regression tests | Justin Clark-Casey (justincc) | 2013-11-16 | 1 | -14/+13 |
| | | | | |||||
| | | * | If anything other than a single integer is specified for events that only ↵ | Justin Clark-Casey (justincc) | 2013-11-16 | 2 | -8245/+8691 |
| | | | | | | | | | | | | | | | | | | | take a single integer, generate a syntax error on LSL script compile rather than an exception later on. This applies to events changed, collision, collision_start, collision_end, on_rez, run_time_permissions, sensor, touch, touch_start, touch_end | ||||
| | | * | Make state_exit, moving_end, moving_start, not_at_rot_target, not_at_target ↵ | Justin Clark-Casey (justincc) | 2013-11-16 | 2 | -7447/+7520 |
| | | | | | | | | | | | | | | | | | | | | | | and timer LSL events generate a syntax error if inappropriately given arguments. This matches behaviour seen on the LL grid and a previous change for state_entry. These are all the events which should take no arguments | ||||
| | | * | refactor LSL_EventTests.TestStateEntryEvent into single method to test compile | Justin Clark-Casey (justincc) | 2013-11-16 | 1 | -14/+17 |
| | | | | |||||
| | | * | refactor: replace verbose checks with String.IsNullOrEmpty where applicable. | Justin Clark-Casey (justincc) | 2013-11-15 | 2 | -3/+3 |
| | | | | | | | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845 | ||||
| | | * | Add initial test for checking that specifying a parameter in LSL ↵ | Justin Clark-Casey (justincc) | 2013-11-09 | 1 | -0/+64 |
| | | | | | | | | | | | | | | | | | | | state_entry() generates a syntax error. Same for other events to follow at a later date. | ||||
| | | * | add support for particle glow LSL functions | dahlia | 2013-11-05 | 1 | -0/+12 |
| | | | | |||||
| | | * | add support for particle blending LSL functions | dahlia | 2013-11-05 | 1 | -1/+15 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-11-08 | 6 | -7472/+7710 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| | | * | If the LSL state_entry() event definition contains any parameters, then ↵ | Justin Clark-Casey (justincc) | 2013-11-02 | 4 | -7471/+7692 |
| | | | | | | | | | | | | | | | | | | | | | | | | | generate syntax error as seen on the LL grid This is done through the parser and so generates the same syntax error message if any parameters are wrongly specified for this event. We were already enforcing event names in the parser. This is only for state_entry so far as an initial test of the approach - appears to work correctly. | ||||
| | | * | add new particle system blending rule enumerations | dahlia | 2013-10-31 | 1 | -1/+5 |
| | | | | |||||
| | | * | add new LSL constants associated with new "ribbon", "glow", and "blend" ↵ | dahlia | 2013-10-31 | 1 | -0/+13 |
| | | | | | | | | | | | | | particle system functionality. Note that this does *not* complete required server side changes for implementing the new particle system | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-11-03 | 1 | -27/+22 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | Call ScriptSleep() instead of llSleep() in routine for llEmail. | Kevin Cozens | 2013-10-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: teravus <teravus@gmail.com> | ||||
| | | * | Fixed rezzing coalesced objects from a prim's inventory | Oren Hurvitz | 2013-10-15 | 1 | -19/+22 |
| | | | | | | | | | | | | | Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed. | ||||
| | * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2013-10-06 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | careminster | ||||
| | | * \ | Merge branch 'master' of careminster:/var/git/careminster | teravus | 2013-10-04 | 4 | -242/+407 |
| | | |\ \ | |||||
| | | * | | | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵ | teravus | 2013-09-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work. (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653) | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |