aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-232-11/+12
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * this should be an if-else block in case the non-phys min/max are smaller ↵SignpostMarv2012-08-221-5/+7
| | | | | | | | than the physical min/max
| * refactoring out SetFaceColorSignpostMarv2012-08-201-2/+2
| |
| * making use of implicit operators and Util.Clip handling of Vector3SignpostMarv2012-08-201-1/+1
| |
| * single operation for PRIM_COLORSignpostMarv2012-08-201-2/+1
| |
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-2/+2
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
* | Merge branch 'avination' into careminsterMelanie2012-08-231-0/+7
|\ \
| * | Implement seeing busy status in LSLMelanie2012-08-211-0/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-184-33/+20
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | integrating redundant code into operatorSignpostMarv2012-08-181-13/+1
| | |
| * | Rot2Quaternion is now redundantSignpostMarv2012-08-182-12/+11
| | |
| * | constructor means not having to manually refer to individual propertiesSignpostMarv2012-08-181-2/+2
| | |
| * | implicit operators mean one does not need to instantiate new objects manuallySignpostMarv2012-08-182-7/+5
| | |
| * | adding missing refactor for LSL_VectorSignpostMarv2012-08-181-1/+1
| | |
| * | Fix the whitespace formatting error introduced by the last patchMelanie2012-08-181-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-185-89/+63
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactoring for Vector3 operator & constructor tweaksSignpostMarv2012-08-185-90/+63
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-182-28/+33
|\ \ \ | |/ / | | / | |/ |/| | | | | | | 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-182-26/+33
| |\
| | * 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-171-0/+4
| | |
| | * 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.
generated by cgit v1.1 at 2024-12-30 02:38:03 +0000