fd92560649
Merge branch 'avination' into careminster
2012-08-31 00:34:22 +01:00
927cbc6762
Merge branch 'ubitwork' into avination
2012-08-30 00:36:37 +02:00
1eb7d963cf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 00:31:03 +01:00
c821153a4f
[possible still bad] make use of keyframemotion.copy on sop.copy, replacing
...
fromdata(seralize). for now its called with null group since sop.copy()
hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
2012-08-30 00:15:46 +01:00
211f4fb411
Sequence inventory descendents requests to reduce inventory server load and
...
movement lag.
2012-08-30 00:34:12 +02:00
67f18655d5
Allow llList2Key to also act on System.String
2012-08-29 22:06:43 +02:00
f7a60261e9
Merge branch 'ubitwork' into avination
2012-08-29 11:46:57 +02:00
74465df43f
Fix issue with the quit packet being stuck int he queue and a one packet delay.
...
Also fix semaphore excetion caused by enqueueing while dequque is taking place.
2012-08-29 11:45:28 +02:00
34f0694938
Remove Justin's addition to avoid sending incoming packets to inactive clients
...
This also causes the initial AgentUpdate to be rejected because our processing
is asynchronous.
2012-08-29 11:35:21 +02:00
f671e446bf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 11:18:32 +02:00
899337b4a0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
2012-08-29 03:31:13 +01:00
2e54c3cc8f
A few more changes to keyframes
2012-08-29 03:19:47 +01:00
0c3061f973
implementing rule tracking
2012-08-29 02:10:04 +01:00
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
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
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
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
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
5284e514d5
Fix a nullref while object is being created
2012-08-28 22:16:01 +02:00
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
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
1e18f0f26a
copying documentation from http://opensimulator.org/wiki/Threat_level
2012-08-28 00:12:35 +01:00
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
e916b1399f
formatting
2012-08-27 23:39:18 +01:00
72c2d13ac6
refactoring to load from self (fixes ChanneDigger being absent)
2012-08-27 23:39:18 +01:00
a6d689c529
refactoring to assign the first argument to a variable
2012-08-27 23:39:18 +01:00
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
4e26d039d6
Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams()
2012-08-27 23:03:21 +01:00
3082fdd0f6
Add VectorRenderModuleTests.TestRepeatDrawContainingImage()
2012-08-27 22:58:20 +01:00
e90168c738
Add VectorRenderModuleTests.TestRepeatDraw()
2012-08-27 22:42:40 +01:00
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
d76ff560d4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 23:36:33 +01:00
bfa22e2f52
Make llCollisionSprite not throw anymore
2012-08-25 23:49:37 +02:00
bc4bda4441
Minor formatting cleanup
2012-08-25 21:08:33 +01:00
4b5b42731f
Merge commit '58714b0aca71ce026226c6f76753905' into careminster
2012-08-25 21:08:26 +01:00
924f87ef43
Merge commit '5203665bb2d68c6a4e0ea3180334b607db6ab1ce' into careminster
2012-08-25 21:04:53 +01:00
3d8f393fbe
refactoring to local variable for cleaner code
2012-08-25 21:04:43 +01:00
a9a03c8b9b
Merge commit '2a2e120470ea530ea0a6f035c5cf28247f94532c' into careminster
2012-08-25 21:03:56 +01:00
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
681066050c
Also move the other avatar based overload out of harms way
2012-08-25 18:32:59 +01:00
5f1021faa6
Temprary restructure to avoid conflicts
2012-08-25 18:28:05 +01:00
5cd8b5e1ca
Merge commit 'a8044999fb056de0a815093953f82b33d540dd6f' into careminster
2012-08-25 18:25:26 +01:00
af6b242071
use SceneObjectPart instead of var
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 18:24:52 +01:00
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
007a45aa76
Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster
2012-08-25 18:08:10 +01:00
a5c6cb2fc9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-25 17:34:08 +01:00
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
9a80330875
Merge branch 'avination' into ubitwork
2012-08-25 15:21:51 +01:00
58714b0aca
minor formatting
2012-08-25 02:30:23 +01:00
5203665bb2
refactoring to local variable for cleaner code
2012-08-25 02:30:23 +01:00
Melanie