aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'master' into careminsterMelanie2012-08-252-41/+82
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | implementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParamsSignpostMarv2012-08-252-11/+60
| | | |
| * | | minor formattingSignpostMarv2012-08-251-2/+2
| | | |
| * | | refactoring to local variable for cleaner codeSignpostMarv2012-08-251-2/+5
| | | |
| * | | since we will be making the Get return type the remaining ruleset as with ↵SignpostMarv2012-08-252-18/+22
| | | | | | | | | | | | | | | | the Set return type, we need to move the original return type to a ref param
| * | | use SceneObjectPart instead of varSignpostMarv2012-08-251-3/+3
| | | |
| * | | renaming to be similar to equivalent Set commandSignpostMarv2012-08-253-8/+8
| | | |
* | | | Minor formatting cleanupMelanie2012-08-251-2/+2
| | | |
* | | | refactoring to local variable for cleaner codeSignpostMarv2012-08-251-2/+5
| | | |
* | | | since we will be making the Get return type the remaining ruleset as with ↵Melanie2012-08-252-137/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Set return type, we need to move the original return type to a ref param Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | | Also move the other avatar based overload out of harms wayMelanie2012-08-251-261/+261
| | | |
* | | | Temprary restructure to avoid conflictsMelanie2012-08-251-183/+183
| | | |
* | | | use SceneObjectPart instead of varMelanie2012-08-251-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | | renaming to be similar to equivalent Set commandMelanie2012-08-253-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
* | | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-15/+5
|\ \ \ \ | |/ / /
| * | | stripping superfluous whitespaceSignpostMarv2012-08-241-3/+0
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | | immediately returning the string.Join operation instead of checking if the ↵SignpostMarv2012-08-241-11/+5
| | | | | | | | | | | | | | | | list has members
| * | | refactoring using List.ConvertAll<string>SignpostMarv2012-08-241-6/+5
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-08-243-1/+18
|\ \ \ \ | |/ / /
| * | | Revert "implementing function to allow scripts to self-replicate as if the ↵Justin Clark-Casey (justincc)2012-08-243-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 ↵SignpostMarv2012-08-243-0/+62
| | | | | | | | | | | | | | | | duplicated them, using the same script delay as llRezObject()
| * | | Removed land checking as suggested by SignpostMarv.TBG Renfold2012-08-241-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 Renfold2012-08-243-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 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
| |/