| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | adding ATTACH_*_PEC constants | SignpostMarv | 2012-08-15 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Implementing PRIM_LINK_TARGET in a non-recursive fashion | SignpostMarv | 2012-08-15 | 1 | -49/+74 | |
| | |/ | ||||||
| | * | Let the temp attachment module add a command to allow attaching without ↵ | Melanie | 2012-08-15 | 1 | -31/+39 | |
| | | | | | | | | | permissions and add support for this (incomplete!) to LSL | |||||
| * | | Remove AreUpdatesSuspended flag because it does nothing | Melanie | 2012-08-16 | 1 | -12/+0 | |
| | | | ||||||
| * | | Change case of areUpdatesSuspended to upper case as is proper for a property | Melanie | 2012-08-16 | 1 | -12/+12 | |
| | | | ||||||
| * | | Fix casts and calls for link primitive param setting for avatars | Melanie | 2012-08-16 | 1 | -4/+14 | |
| | | | ||||||
| * | | Do a proper null check to avoid the overloaded operator == trap | Melanie | 2012-08-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | Implementing PRIM_LINK_TARGET in a non-recursive fashion | SignpostMarv | 2012-08-15 | 1 | -116/+106 | |
| | | | ||||||
| * | | Let the temp attachment module add a command to allow attaching without ↵ | Melanie | 2012-08-15 | 1 | -29/+22 | |
| | | | | | | | | | permissions and add support for this (incomplete!) to LSL | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -5/+20 | |
| |\ \ | |/ | ||||||
| | * | Prevent race conditions when one thread removes an NPC SP before another ↵ | Justin Clark-Casey (justincc) | 2012-08-14 | 1 | -5/+20 | |
| | | | | | | | | | thread has retreived it after checking whether the NPC exists. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | Lay some groundwork for temp attachments. Decouple attachments from inventory. | Melanie | 2012-08-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-13 | 1 | -6/+68 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | attempt at replicating behaviour of llList2thing functions in SL | SignpostMarv | 2012-08-13 | 1 | -7/+69 | |
| | | | | | | | | | | | | | | | | | Committed with changes. Please don't sign comments with your name. Please don't use your own coding style, use the OpenSim project style. Please don't modify unrelated whitespace. Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-07 | 1 | -0/+6 | |
| |\ \ | |/ | ||||||
| | * | Release http-in URLs when llResetScript is called | Melanie | 2012-08-07 | 1 | -0/+6 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 3 | -0/+19 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | * | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -1/+1 | |
| | | | | | | | | | FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID. | |||||
| | * | reduced-complexity implementation of function to get rezzing object key | SignpostMarv | 2012-08-02 | 3 | -0/+19 | |
| | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 1 | -5/+6 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||||
| | * | Look up the NPC module when the SensorRepeat class is created, rather than ↵ | Justin Clark-Casey (justincc) | 2012-08-01 | 1 | -5/+6 | |
| | | | | | | | | | on every single sensor sweep. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 2 | -37/+80 | |
| |\ \ | |/ | ||||||
| | * | Resolve a deadlock between INPCModule and SensorRepeat by replacing the ↵ | Justin Clark-Casey (justincc) | 2012-07-31 | 1 | -35/+43 | |
| | | | | | | | | | | | | | | | | | SensorRepeat list with a new list on add/removes rather than locking it for the duration of the sensor sweep. A deadlock was observed today where NPC removal on a script thread would lock the NPC list and then try to lock the sensor list via scripted attachment removal. Concurrently, the sensor sweep thread would lock the sensor list and then try to lock the NPC list to check NPC status. This commit resolves the deadlock by replacing the sensor list on update rather than locking it for the duration of the sweep. | |||||
| | * | Adds support to ScriptModuleComms for region modules to export | Mic Bowman | 2012-07-31 | 1 | -2/+37 | |
| | | | | | | | | | constants to the script engine. | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-07-29 | 1 | -2/+53 | |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | Return world rotation on llGetObjectDetails()'s OBJECT_ROT | Melanie | 2012-07-29 | 1 | -4/+10 | |
| | | | | ||||||
| | * | | When controls are released by script, don't drop the permission to | Melanie | 2012-07-29 | 1 | -2/+0 | |
| | | | | | | | | | | | | | retake them. | |||||
| | * | | Implement the linefeed URL hack for ShoutCast and other services | Melanie | 2012-07-27 | 1 | -0/+53 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-29 | 1 | -4/+10 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | Return world rotation on llGetObjectDetails()'s OBJECT_ROT | Melanie | 2012-07-29 | 1 | -1/+11 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 4 | -2/+55 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml | |||||
| | * | | LSL/OSSL lacks Math.Min & Math.Max implementations. | SignpostMarv | 2012-07-28 | 3 | -0/+54 | |
| | | | | ||||||
| | * | | Remove a couple of compiler warnings pointed out by SignpostMarv | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -2/+0 | |
| | | | | ||||||
| | * | | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵ | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | with other monitoring code from OpenSim.Framework | |||||
| * | | | Remove support for the OS_NPC constant. That one seems to be overly paranoid | Melanie | 2012-07-25 | 2 | -4/+2 | |
| | | | | | | | | | | | | | to have and confuses the issue. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-23 | 3 | -6/+34 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml | |||||
| | * | | As per opensim-dev mailing list discussion, extend llGetDetectedType() to ↵ | Justin Clark-Casey (justincc) | 2012-07-20 | 1 | -5/+28 | |
| | | | | | | | | | | | | | | | | | | | return OS_NPC if an OS npc is detected. The detection will also return agent is the NPC has been created with the OS_NPC_SENSE_AS_AGENT option. | |||||
| | * | | As per opensim-dev mailing list conversation, introduce OS_NPC constant for ↵ | Justin Clark-Casey (justincc) | 2012-07-20 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | use with llSensor() This same constant will later be used with llGetDetectedType(). This constant has a different name from NPC to avoid possible conflict with future LSL changes. This constant has a different value to try and avoid unnecessary conflict with future constants that may use the same value. Using the 'NPC' constant with llSensor() will remain valid but is deprecated. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-20 | 4 | -3/+39 | |
| |\ \ \ | |/ / | ||||||
| | * | | Enables support for UUIDs to be returned in lists from | Mic Bowman | 2012-07-20 | 1 | -3/+13 | |
| | | | | | | | | | | | | | | | | | | | modInvoke commands. Thanks SignpostMarv!!! | |||||
| | * | | Implements a very useful OSSL function to test a string to see | Mic Bowman | 2012-07-20 | 3 | -0/+26 | |
| | | | | | | | | | | | | | | | | | | | if it is a UUID. The function is osIsUUID(). Thanks SignpostMarv! | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-07-20 | 1 | -1/+1 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Update ubitMesh primMesher with new Dahlia version on core ( reckick git | UbitUmarov | 2012-07-19 | 1 | -1/+0 | |
| | | | | | | | | | | | | | back) | |||||
| | * | | kick git | UbitUmarov | 2012-07-19 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-19 | 2 | -20/+22 | |
| |\ \ \ | |/ / |/| / | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-17 | 1 | -6/+8 | |
| | |\ | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-17 | 1 | -6/+8 | |
| | | |\ | ||||||
| | | | * | Make the scrpt running flag work properly | Melanie | 2012-07-17 | 1 | -6/+8 | |
| | | | | | ||||||
| | * | | | Revert "Revert "refactor: make llGiveInventory() use existing ↵ | Justin Clark-Casey (justincc) | 2012-07-17 | 1 | -24/+9 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetInventoryItem() method rather than iterate through TaskInventory itself."" This reverts commit 59a29f5f221a1ffe4e22c63ef9da82270442b213. The original revert was committed by mistake - it turns out this was not the cause of Mantis 6089 Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |