Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-08-24 | 3 | -1/+18 |
|\ | |||||
| * | Revert "implementing function to allow scripts to self-replicate as if the ↵ | Justin Clark-Casey (justincc) | 2012-08-24 | 3 | -62/+0 |
| | | | | | | | | | | | | | | | | owner duplicated them, using the same script delay as llRezObject()" This reverts commit 2ad9d656b3a1a0c519c9599d7680f98eba7e82b8. Reverted pending consideration of associated issues. | ||||
| * | implementing function to allow scripts to self-replicate as if the owner ↵ | SignpostMarv | 2012-08-24 | 3 | -0/+62 |
| | | | | | | | | duplicated them, using the same script delay as llRezObject() | ||||
| * | Removed land checking as suggested by SignpostMarv. | TBG Renfold | 2012-08-24 | 1 | -12/+2 |
| | | | | | | | | | | | | | | Now whatever remaining health the avatar has is displayed (float). This will be 100% (100.000000) if no damage has occurred (as what the viewer should really be seeing anyway). Returns -1.000000 if the avatar is not found. | ||||
| * | Adds osGetHealth. | TBG Renfold | 2012-08-24 | 3 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns the amount of health (in an integer) that an avatar has left in the scene. If an avatar is not found or safe is enabled on a region, -1 is returned. Example usage: default { touch_end(integer _t) { key agentID = llDetectedKey(0); osCauseDamage(agentID, 50); llSay(0, llKey2Name(agentID) + " has " + (string)osGetHealth(agentID) + "% health left."); } } | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-23 | 2 | -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 ↵ | SignpostMarv | 2012-08-22 | 1 | -5/+7 |
| | | | | | | | | than the physical min/max | ||||
| * | refactoring out SetFaceColor | SignpostMarv | 2012-08-20 | 1 | -2/+2 |
| | | |||||
| * | making use of implicit operators and Util.Clip handling of Vector3 | SignpostMarv | 2012-08-20 | 1 | -1/+1 |
| | | |||||
| * | single operation for PRIM_COLOR | SignpostMarv | 2012-08-20 | 1 | -2/+1 |
| | | |||||
| * | Add --force flag to "kick user" console command to allow bypassing of recent ↵ | Justin Clark-Casey (justincc) | 2012-08-20 | 1 | -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 careminster | Melanie | 2012-08-23 | 1 | -0/+7 |
|\ \ | |||||
| * | | Implement seeing busy status in LSL | Melanie | 2012-08-21 | 1 | -0/+7 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 4 | -33/+20 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | integrating redundant code into operator | SignpostMarv | 2012-08-18 | 1 | -13/+1 |
| | | | |||||
| * | | Rot2Quaternion is now redundant | SignpostMarv | 2012-08-18 | 2 | -12/+11 |
| | | | |||||
| * | | constructor means not having to manually refer to individual properties | SignpostMarv | 2012-08-18 | 1 | -2/+2 |
| | | | |||||
| * | | implicit operators mean one does not need to instantiate new objects manually | SignpostMarv | 2012-08-18 | 2 | -7/+5 |
| | | | |||||
| * | | adding missing refactor for LSL_Vector | SignpostMarv | 2012-08-18 | 1 | -1/+1 |
| | | | |||||
| * | | Fix the whitespace formatting error introduced by the last patch | Melanie | 2012-08-18 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 5 | -89/+63 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | refactoring for Vector3 operator & constructor tweaks | SignpostMarv | 2012-08-18 | 5 | -90/+63 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 2 | -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/opensim | Melanie | 2012-08-18 | 2 | -26/+33 |
| |\ | |||||
| | * | adding null return to fix building | SignpostMarv | 2012-08-17 | 1 | -1/+1 |
| | | | |||||
| | * | fixing bug that get/set the wrong property for prim types other than sphere ↵ | SignpostMarv | 2012-08-17 | 1 | -2/+4 |
| | | | | | | | | | | | | & box | ||||
| | * | implemented | SignpostMarv | 2012-08-17 | 2 | -0/+14 |
| | | | |||||
| | * | attempt to handle InvalidCastException in a manner similar to Second Life | SignpostMarv | 2012-08-17 | 1 | -0/+4 |
| | | | |||||
| | * | adding a clip method to handle Vector3 objects to enable a minor amount of ↵ | SignpostMarv | 2012-08-17 | 1 | -6/+5 |
| | | | | | | | | | | | | refactoring | ||||
| | * | enables configurable minimum sizes for physical & non-physical prims | SignpostMarv | 2012-08-15 | 1 | -20/+8 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-16 | 2 | -1/+3 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | Do a proper null check to avoid the overloaded operator == trap | Melanie | 2012-08-16 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-15 | 1 | -0/+2 |
| |\ | |||||
| | * | 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 |
| | |