Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-08-29 | 12 | -149/+617 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | ||||
| * | implementing rule tracking | SignpostMarv | 2012-08-29 | 1 | -6/+9 |
| | | |||||
| * | track originating IScriptApi method for SL-like error messages. Will add ↵ | SignpostMarv | 2012-08-29 | 3 | -13/+17 |
| | | | | | | | | rule number tracking in next commit. | ||||
| * | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵ | Justin Clark-Casey (justincc) | 2012-08-29 | 2 | -34/+66 |
| | | | | | | | | | | | | | | | | | | | | | | folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders. This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch. | ||||
| * | Add experimental DynamicTextureModule.ReuseTextures flag, currently only ↵ | Justin Clark-Casey (justincc) | 2012-08-28 | 5 | -56/+310 |
| | | | | | | | | | | | | | | | | | | | | | | configurable on compile. Disabled (status quo) by default. This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours. This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web). This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures. A downside is that this stops expiry of old temporary dynamic textures from the cache, Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours. | ||||
| * | Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). ↵ | Justin Clark-Casey (justincc) | 2012-08-28 | 3 | -7/+8 |
| | | | | | | | | Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method. | ||||
| * | copying documentation from http://opensimulator.org/wiki/Threat_level | SignpostMarv | 2012-08-28 | 1 | -0/+59 |
| | | |||||
| * | formatting | SignpostMarv | 2012-08-27 | 1 | -22/+22 |
| | | |||||
| * | refactoring to load from self (fixes ChanneDigger being absent) | SignpostMarv | 2012-08-27 | 1 | -5/+11 |
| | | |||||
| * | refactoring to assign the first argument to a variable | SignpostMarv | 2012-08-27 | 1 | -4/+5 |
| | | |||||
| * | minor: Simplify return of vector render module name and some very minor ↵ | Justin Clark-Casey (justincc) | 2012-08-27 | 1 | -4/+3 |
| | | | | | | | | removal of unncessary syntax clutter | ||||
| * | Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams() | Justin Clark-Casey (justincc) | 2012-08-27 | 1 | -2/+32 |
| | | |||||
| * | Add VectorRenderModuleTests.TestRepeatDrawContainingImage() | Justin Clark-Casey (justincc) | 2012-08-27 | 1 | -0/+31 |
| | | |||||
| * | Add VectorRenderModuleTests.TestRepeatDraw() | Justin Clark-Casey (justincc) | 2012-08-27 | 1 | -11/+48 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-25 | 2 | -41/+82 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | implementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParams | SignpostMarv | 2012-08-25 | 2 | -11/+60 |
| | | |||||
| * | minor formatting | SignpostMarv | 2012-08-25 | 1 | -2/+2 |
| | | |||||
| * | refactoring to local variable for cleaner code | SignpostMarv | 2012-08-25 | 1 | -2/+5 |
| | | |||||
| * | since we will be making the Get return type the remaining ruleset as with ↵ | SignpostMarv | 2012-08-25 | 2 | -18/+22 |
| | | | | | | | | the Set return type, we need to move the original return type to a ref param | ||||
| * | use SceneObjectPart instead of var | SignpostMarv | 2012-08-25 | 1 | -3/+3 |
| | | |||||
| * | renaming to be similar to equivalent Set command | SignpostMarv | 2012-08-25 | 3 | -8/+8 |
| | | |||||
* | | Minor formatting cleanup | Melanie | 2012-08-25 | 1 | -2/+2 |
| | | |||||
* | | refactoring to local variable for cleaner code | SignpostMarv | 2012-08-25 | 1 | -2/+5 |
| | | |||||
* | | since we will be making the Get return type the remaining ruleset as with ↵ | Melanie | 2012-08-25 | 2 | -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 way | Melanie | 2012-08-25 | 1 | -261/+261 |
| | | |||||
* | | Temprary restructure to avoid conflicts | Melanie | 2012-08-25 | 1 | -183/+183 |
| | | |||||
* | | use SceneObjectPart instead of var | Melanie | 2012-08-25 | 1 | -10/+8 |
| | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
* | | renaming to be similar to equivalent Set command | Melanie | 2012-08-25 | 4 | -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 careminster | Melanie | 2012-08-25 | 7 | -22/+16 |
|\ \ | |/ | |||||
| * | minor: Fix bad log message for failure to create an inventory folder | Justin Clark-Casey (justincc) | 2012-08-25 | 1 | -1/+1 |
| | | |||||
| * | Log initial script startup info notice when xengine actually starts to do ↵ | Justin Clark-Casey (justincc) | 2012-08-25 | 2 | -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-24 | 1 | -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-24 | 1 | -1/+1 |
| | | | | | | | | bypass close checks. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-24 | 1 | -15/+5 |
| |\ | |||||
| | * | stripping superfluous whitespace | SignpostMarv | 2012-08-24 | 1 | -3/+0 |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | immediately returning the string.Join operation instead of checking if the ↵ | SignpostMarv | 2012-08-24 | 1 | -11/+5 |
| | | | | | | | | | | | | list has members | ||||
| | * | refactoring using List.ConvertAll<string> | SignpostMarv | 2012-08-24 | 1 | -6/+5 |
| | | | |||||
| * | | Pass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down ↵ | Justin Clark-Casey (justincc) | 2012-08-24 | 1 | -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. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-24 | 4 | -1/+21 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-24 | 3 | -3/+39 |
| |\ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-24 | 3 | -1/+80 |
| | |\ | |||||
| | * | | Fix bad child prim permissions that can make objects change perms after rezzing | Melanie | 2012-08-24 | 3 | -3/+39 |
| | | | | | | | | | | | | | | | | Port from Avination | ||||
| * | | | 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 'avination' into careminster | Melanie | 2012-08-24 | 3 | -3/+39 |
|\ \ | |||||
| * | | Fix bad child prim permissions that can make objects change perms after rezzing | Melanie | 2012-08-23 | 3 | -3/+39 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-24 | 1 | -2/+25 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | | If a script state save fails for some reason on shutdown/region removal, get ↵ | Justin Clark-Casey (justincc) | 2012-08-23 | 1 | -2/+25 |
| | | | | | | | | | | | | xengine to spit out some useful information and continue to save other script states |