aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | refactoring to load from self (fixes ChanneDigger being absent)SignpostMarv2012-08-271-5/+11
| | | | |
| * | | | refactoring to assign the first argument to a variableSignpostMarv2012-08-271-4/+5
| | | | |
| * | | | minor: Simplify return of vector render module name and some very minor ↵Justin Clark-Casey (justincc)2012-08-271-4/+3
| | | | | | | | | | | | | | | | | | | | removal of unncessary syntax clutter
| * | | | Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams()Justin Clark-Casey (justincc)2012-08-271-2/+32
| | | | |
| * | | | Add VectorRenderModuleTests.TestRepeatDrawContainingImage()Justin Clark-Casey (justincc)2012-08-271-0/+31
| | | | |
| * | | | Add VectorRenderModuleTests.TestRepeatDraw()Justin Clark-Casey (justincc)2012-08-271-11/+48
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-08-253-66/+110
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-2510-49/+143
| |\ \ \ \
| | * | | | implementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParamsSignpostMarv2012-08-252-11/+60
| | | | | |
| * | | | | Fix and refactor region registration. Reorder checks to short-curcuit ↵Melanie2012-08-251-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expensive and destructive ones. Properly fix region reservation and authentication. Make region moves and flags preservation work again as intended. Prevent failes reservation take-over from damging reservation data.
* | | | | | Minor formatting cleanupMelanie2012-08-251-2/+2
| | | | | |
* | | | | | Merge commit '58714b0aca71ce026226c6f76753905' into careminsterMelanie2012-08-250-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | minor formattingSignpostMarv2012-08-251-2/+2
| | | | | |
* | | | | | Merge commit '5203665bb2d68c6a4e0ea3180334b607db6ab1ce' into careminsterMelanie2012-08-250-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | refactoring to local variable for cleaner codeSignpostMarv2012-08-251-2/+5
| | | | | |
* | | | | | refactoring to local variable for cleaner codeSignpostMarv2012-08-251-2/+5
| | | | | |
* | | | | | Merge commit '2a2e120470ea530ea0a6f035c5cf28247f94532c' into careminsterMelanie2012-08-250-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | 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
| | | | | |
* | | | | | Merge commit 'a8044999fb056de0a815093953f82b33d540dd6f' into careminsterMelanie2012-08-250-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | use SceneObjectPart instead of varSignpostMarv2012-08-251-3/+3
| | | | | |
| * | | | | renaming to be similar to equivalent Set commandSignpostMarv2012-08-253-8/+8
| | | | | |
* | | | | | 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-254-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-259-37/+66
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Following on from f8a89a79, do not allow more than one 'type' folder (e.g. ↵Justin Clark-Casey (justincc)2012-08-251-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calling cards) to be created in the base "My Inventory" user folder. This is to accomodate situations where viewers will create more than one 'type' subfolder (e.g. calling cards) But at the same time to prevent multiple such 'system' folders (those in the base "My Inventory" user folder). This also makes GetFolderForType() only return a folder in the base "My Inventory" folder, if such a type folder exists
| * | | | | Allow multiple calling card type inventory folders to be created.Justin Clark-Casey (justincc)2012-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Modern viewers want to create Friends and All folders of this type inside the root Calling Cards folder.
| * | | | | minor: Fix bad log message for failure to create an inventory folderJustin Clark-Casey (justincc)2012-08-251-1/+1
| | | | | |
| * | | | | Log initial script startup info notice when xengine actually starts to do ↵Justin Clark-Casey (justincc)2012-08-252-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | this for debugging purposes, rather than before it actually starts to do this.
| * | | | | Extend "Restarting scripts in attachments" debug log message to show actual ↵Justin Clark-Casey (justincc)2012-08-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | name of user and the region they are in
| * | | | | If a connecting scene presence is replacing an existing scene presence then ↵Justin Clark-Casey (justincc)2012-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | bypass close checks.
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-241-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
| | | | | |
| * | | | | Pass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down ↵Justin Clark-Casey (justincc)2012-08-241-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into the 3-parameter AddNewSceneObject() method instead of always hardcoding true. This doesn't affect any core OpenSimulator code since all callers were passing true anyway But it allows region modules to create objects that are never persisted.
| * | | | adding sqlite journal files to .gitignoreSignpostMarv2012-08-241-0/+1
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-08-244-1/+21
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-243-3/+39
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-243-1/+80
| | |\ \ \ \
| | * | | | | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-243-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Port from Avination
| * | | | | | 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 'avination' into careminsterMelanie2012-08-243-3/+39
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-233-3/+39
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-08-242-2/+35
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs