Commit Graph

21267 Commits (944b1ed2378d2eb6a89b6d5a1738aa63d30b0ae0)

Author SHA1 Message Date
UbitUmarov 2e54c3cc8f A few more changes to keyframes 2012-08-29 03:19:47 +01:00
SignpostMarv 0c3061f973 implementing rule tracking 2012-08-29 02:10:04 +01:00
SignpostMarv 3bf7bd6359 track originating IScriptApi method for SL-like error messages. Will add rule number tracking in next commit. 2012-08-29 02:10:04 +01:00
Justin Clark-Casey (justincc) 7ea832d47c Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where 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.
2012-08-29 02:01:43 +01:00
UbitUmarov 72ac0665b2 [Potentially broken] keyframes changes.. since it's there, use timer for
crossing retries and not still another thread, etc...
2012-08-29 00:35:06 +01:00
Justin Clark-Casey (justincc) c1cece4b82 Add experimental DynamicTextureModule.ReuseTextures flag, currently only 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.
2012-08-28 23:06:53 +01:00
Melanie 378a79e7cc Add a queue with two priority levels. This is a drop in replacement for
the BlockingQueue from OMV, but allows two priorities.
2012-08-28 22:17:17 +02:00
Melanie 5284e514d5 Fix a nullref while object is being created 2012-08-28 22:16:01 +02:00
Justin Clark-Casey (justincc) aa44df9c04 Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method. 2012-08-28 20:35:17 +01:00
UbitUmarov ef6e007a4c [possible still very broken] mess around keyframes. timer events
threads overlaps, some null objects exceptions, region crossing...
2012-08-28 03:21:03 +01:00
SignpostMarv 1e18f0f26a copying documentation from http://opensimulator.org/wiki/Threat_level 2012-08-28 00:12:35 +01:00
SignpostMarv 8a7fbfb06a adding some files to .gitignore that get generated when debugging in c# express with OpenSim.32BitLaunch as the startup project 2012-08-27 23:48:29 +01:00
SignpostMarv e916b1399f formatting 2012-08-27 23:39:18 +01:00
SignpostMarv 72c2d13ac6 refactoring to load from self (fixes ChanneDigger being absent) 2012-08-27 23:39:18 +01:00
SignpostMarv a6d689c529 refactoring to assign the first argument to a variable 2012-08-27 23:39:18 +01:00
Justin Clark-Casey (justincc) ab9bfe5156 minor: Simplify return of vector render module name and some very minor removal of unncessary syntax clutter 2012-08-27 23:06:37 +01:00
Justin Clark-Casey (justincc) 4e26d039d6 Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams() 2012-08-27 23:03:21 +01:00
Justin Clark-Casey (justincc) 3082fdd0f6 Add VectorRenderModuleTests.TestRepeatDrawContainingImage() 2012-08-27 22:58:20 +01:00
Justin Clark-Casey (justincc) e90168c738 Add VectorRenderModuleTests.TestRepeatDraw() 2012-08-27 22:42:40 +01:00
UbitUmarov b1d0fab954 fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal
DataFormat enum, using values from the KFM constants
2012-08-26 20:33:45 +01:00
Melanie d76ff560d4 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 23:36:33 +01:00
Melanie bfa22e2f52 Make llCollisionSprite not throw anymore 2012-08-25 23:49:37 +02:00
Melanie bc4bda4441 Minor formatting cleanup 2012-08-25 21:08:33 +01:00
Melanie 4b5b42731f Merge commit '58714b0aca71ce026226c6f76753905' into careminster 2012-08-25 21:08:26 +01:00
Melanie 924f87ef43 Merge commit '5203665bb2d68c6a4e0ea3180334b607db6ab1ce' into careminster 2012-08-25 21:04:53 +01:00
SignpostMarv 3d8f393fbe refactoring to local variable for cleaner code 2012-08-25 21:04:43 +01:00
Melanie a9a03c8b9b Merge commit '2a2e120470ea530ea0a6f035c5cf28247f94532c' into careminster 2012-08-25 21:03:56 +01:00
Melanie 86d4e45f4d since we will be making the Get return type the remaining ruleset as with 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
2012-08-25 21:03:47 +01:00
Melanie 681066050c Also move the other avatar based overload out of harms way 2012-08-25 18:32:59 +01:00
Melanie 5f1021faa6 Temprary restructure to avoid conflicts 2012-08-25 18:28:05 +01:00
Melanie 5cd8b5e1ca Merge commit 'a8044999fb056de0a815093953f82b33d540dd6f' into careminster 2012-08-25 18:25:26 +01:00
Melanie af6b242071 use SceneObjectPart instead of var
Conflicts:

	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 18:24:52 +01:00
Melanie 1eb1c1bd4b renaming to be similar to equivalent Set command
Conflicts:

	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
2012-08-25 18:19:51 +01:00
Melanie 007a45aa76 Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster 2012-08-25 18:08:10 +01:00
Melanie a5c6cb2fc9 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-08-25 17:34:08 +01:00
Melanie 6ea95a3294 Fix and refactor region registration. Reorder checks to short-curcuit 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.
2012-08-25 17:32:00 +01:00
UbitUmarov 9a80330875 Merge branch 'avination' into ubitwork 2012-08-25 15:21:51 +01:00
SignpostMarv 58714b0aca minor formatting 2012-08-25 02:30:23 +01:00
SignpostMarv 5203665bb2 refactoring to local variable for cleaner code 2012-08-25 02:30:23 +01:00
SignpostMarv 2a2e120470 since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param 2012-08-25 02:30:23 +01:00
SignpostMarv a8044999fb use SceneObjectPart instead of var 2012-08-25 02:30:23 +01:00
SignpostMarv 6e86b23012 implementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParams 2012-08-25 02:30:23 +01:00
SignpostMarv 3d504261b0 renaming to be similar to equivalent Set command 2012-08-25 02:30:23 +01:00
Justin Clark-Casey (justincc) a0d178b284 Following on from f8a89a79, do not allow more than one 'type' folder (e.g. 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
2012-08-25 02:00:17 +01:00
Justin Clark-Casey (justincc) f8a89a79eb Allow multiple calling card type inventory folders to be created.
Modern viewers want to create Friends and All folders of this type inside the root Calling Cards folder.
2012-08-25 01:09:12 +01:00
Justin Clark-Casey (justincc) e04047152f minor: Fix bad log message for failure to create an inventory folder 2012-08-25 00:49:38 +01:00
Justin Clark-Casey (justincc) f3a5e3a02b Log initial script startup info notice when xengine actually starts to do this for debugging purposes, rather than before it actually starts to do this. 2012-08-25 00:42:32 +01:00
Justin Clark-Casey (justincc) ba58331b29 Extend "Restarting scripts in attachments" debug log message to show actual name of user and the region they are in 2012-08-24 22:56:05 +01:00
Melanie f1a71f544b Merge branch 'ubitwork' into avination 2012-08-24 23:53:14 +02:00
Melanie 6d48dbf8ca Remove debug spam 2012-08-24 23:49:31 +02:00