aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix the whitespace formatting error introduced by the last patchMelanie2012-08-181-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-187-108/+111
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactoring for Vector3 operator & constructor tweaksSignpostMarv2012-08-187-109/+111
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-183-30/+46
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-183-28/+46
| |\
| | * adding null return to fix buildingSignpostMarv2012-08-171-1/+1
| | |
| | * fixing bug that get/set the wrong property for prim types other than sphere ↵SignpostMarv2012-08-171-2/+4
| | | | | | | | | | | | & box
| | * implementedSignpostMarv2012-08-172-0/+14
| | |
| | * attempt to handle InvalidCastException in a manner similar to Second LifeSignpostMarv2012-08-172-2/+17
| | |
| | * adding a clip method to handle Vector3 objects to enable a minor amount of ↵SignpostMarv2012-08-171-6/+5
| | | | | | | | | | | | refactoring
| | * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-151-20/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-162-1/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Do a proper null check to avoid the overloaded operator == trapMelanie2012-08-161-1/+1
| |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-151-0/+2
| |\
| | * adding ATTACH_*_PEC constantsSignpostMarv2012-08-151-0/+2
| | |
| * | Implementing PRIM_LINK_TARGET in a non-recursive fashionSignpostMarv2012-08-151-49/+74
| |/
| * Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-151-31/+39
| | | | | | | | permissions and add support for this (incomplete!) to LSL
* | Remove AreUpdatesSuspended flag because it does nothingMelanie2012-08-161-12/+0
| |
* | Change case of areUpdatesSuspended to upper case as is proper for a propertyMelanie2012-08-161-12/+12
| |
* | Fix casts and calls for link primitive param setting for avatarsMelanie2012-08-161-4/+14
| |
* | Do a proper null check to avoid the overloaded operator == trapMelanie2012-08-151-1/+1
| |
* | Implementing PRIM_LINK_TARGET in a non-recursive fashionSignpostMarv2012-08-151-116/+106
| |
* | Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-151-29/+22
| | | | | | | | permissions and add support for this (incomplete!) to LSL
* | Merge branch 'master' into careminsterMelanie2012-08-141-5/+20
|\ \ | |/
| * Prevent race conditions when one thread removes an NPC SP before another ↵Justin Clark-Casey (justincc)2012-08-141-5/+20
| | | | | | | | thread has retreived it after checking whether the NPC exists.
* | Merge branch 'master' into careminsterMelanie2012-08-141-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.Melanie2012-08-141-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-08-131-6/+68
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * attempt at replicating behaviour of llList2thing functions in SLSignpostMarv2012-08-131-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 careminsterMelanie2012-08-071-0/+6
|\ \ | |/
| * Release http-in URLs when llResetScript is calledMelanie2012-08-071-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-08-033-0/+19
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵Justin Clark-Casey (justincc)2012-08-031-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 keySignpostMarv2012-08-023-0/+19
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2012-08-011-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-011-5/+6
| | | | | | | | on every single sensor sweep.
* | Merge branch 'master' into careminsterMelanie2012-08-012-37/+80
|\ \ | |/
| * Resolve a deadlock between INPCModule and SensorRepeat by replacing the ↵Justin Clark-Casey (justincc)2012-07-311-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 exportMic Bowman2012-07-311-2/+37
| | | | | | | | constants to the script engine.
* | Merge branch 'avination' into careminsterMelanie2012-07-291-2/+53
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-4/+10
| | |
| * | When controls are released by script, don't drop the permission toMelanie2012-07-291-2/+0
| | | | | | | | | | | | retake them.
| * | Implement the linefeed URL hack for ShoutCast and other servicesMelanie2012-07-271-0/+53
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-291-4/+10
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-1/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-284-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.SignpostMarv2012-07-283-0/+54
| | |
| * | Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-271-2/+0
| | |
| * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-251-0/+1
| | | | | | | | | | | | with other monitoring code from OpenSim.Framework
* | | Remove support for the OS_NPC constant. That one seems to be overly paranoidMelanie2012-07-252-4/+2
| | | | | | | | | | | | to have and confuses the issue.
generated by cgit v1.1 at 2024-11-18 03:38:02 +0000