190f9c258b
Restarting to work on HGSuitcaseInventoryService: added the ability for the outside world to retrieve appearance items. Not ACLed yet.
2012-09-13 10:00:29 -07:00
46d8405229
Documentation of parcel-related events
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-13 09:59:25 -04:00
9598c1af9e
correcting a typo that causes c# express to complain about xml comment containing invalid xml
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-13 09:59:25 -04:00
e7932682a2
Add a logger so the prior commit will work
2012-09-12 21:24:09 +02:00
d8e9188908
Stop expiry timer when upload is complete. Log if timeout is reached.
2012-09-12 21:14:55 +02:00
5139db2638
Add a timer to time out upload caps handlers that are not used.
2012-09-12 12:56:59 +02:00
224efe7b76
minor: Comment out friends notification log spam for now.
2012-09-12 01:58:01 +01:00
ebb394bbda
Fix indentation and issues where tabs were used instead of spaces in commit 783ee949
2012-09-12 01:45:34 +01:00
4ead48f09f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-12 01:24:17 +01:00
41f3f2400e
Documentation of economy-related EventManager events
2012-09-12 01:23:47 +01:00
f06394f195
Allow an incoming identifier to be specified for a JsonStore.
2012-09-11 16:42:07 -07:00
d53a53d4c5
Make "show http-handlers" command available for ROBUST instances as well as the simulator executable.
2012-09-12 00:10:48 +01:00
fd1ee58f87
Add a missing brace, remove a useless temp variable, enable charging.
2012-09-11 22:52:11 +02:00
013e94af5d
report mesh upload costs ( fake values)
2012-09-11 23:06:29 +01:00
245763b1b0
let LLSDAssetUploadRequest include asset_resources information plus let
...
NewAgentInventoryRequest know about mesh (does nothing with it still)
2012-09-11 20:30:30 +01:00
ad1b9bbba6
documentation (OnSceneObjectPartCopy)
2012-09-11 20:12:45 +01:00
97b8739c1d
documentation (OnRemovePresence)
2012-09-11 20:12:45 +01:00
0760121eb9
documentation (OnNewPresence)
2012-09-11 20:12:44 +01:00
0a22e78f59
documentation (OnClientConnect)
2012-09-11 20:12:44 +01:00
5e51f16ceb
documentation (OnBackup)
2012-09-11 20:12:44 +01:00
fd8a7e64b9
documentation (OnTerrainTick)
2012-09-11 20:12:44 +01:00
ed5f574356
documentation (OnTerrainTainted)
2012-09-11 20:12:44 +01:00
44349f742e
documentation (OnClientMovement)
2012-09-11 20:12:43 +01:00
e3993eefa5
Documenting some of the events on OpenSim.Region.Framework.Scenes.EventManager (OnFrame)
2012-09-11 20:12:43 +01:00
19b00a5b3c
Removing the variable prica handler again. It's never called, was misnamed and
...
probably never worked past the mesh beta.
2012-09-11 17:58:46 +02:00
757a669924
Re-add the module and fix a typo
2012-09-11 17:55:33 +02:00
375ca478dd
Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice
...
which is the name actually used in viewer code.
2012-09-11 17:52:24 +02:00
a6928a479e
Add cost calculation suppor tto the VariablePrice one as well
2012-09-11 17:51:20 +02:00
ead4b8998c
Revert "Remove the unused NewFileAgentInventoryVariablePrice module."
...
It's actually used.
This reverts commit 94a8e5572b
2012-09-11 17:28:37 +02:00
bd1d9a214b
Add the option to have variable costing for uploads
2012-09-11 17:28:13 +02:00
94a8e5572b
Remove the unused NewFileAgentInventoryVariablePrice module.
2012-09-11 15:07:32 +02:00
a6753c14a5
Revamp the v3 inventory sending. Uses threads and some nifty mechanics to
...
leverage the Poll Service without blocking it's workers.
2012-09-11 10:39:43 +02:00
21c476228a
Merge branch 'avination' into careminster
2012-09-10 13:53:00 +01:00
3e1b6b8d20
Merge branch 'master' into careminster
2012-09-10 13:33:47 +01:00
8db5d79f4b
passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly error messages
2012-09-10 13:15:32 +01:00
657428a439
Remove commented code
2012-09-10 01:52:02 +02:00
761bf8c1eb
Merge branch 'ubitwork' into avination
2012-09-10 01:50:41 +02:00
b7737b7273
webFetchInventory: change control event to simple flag, adjust locking
2012-09-10 01:20:34 +01:00
bf56b30024
Adjust namespce of FlotsamCache
...
Place FloatsamCache in the same namespace as our other core asset caches
2012-09-09 14:35:48 -04:00
8321ecb7a2
Revert "Move addin information to CoreModulePlugin.addin.xml"
...
This reverts commit 2ec34580cehttp://opensimulator.org/mantis/view.php?id=6278 .
2012-09-09 13:50:44 -04:00
afb4e06f63
Reduce max concurrent endpoint connections from 50 to 6 (was 2 before)
2012-09-09 17:41:10 +02:00
0556bbefdd
Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM
...
to UUID.Zero because it ties up XMLRPC handlers needlessly.
2012-09-09 16:30:01 +02:00
0d97beefce
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
783ee949ea
implementing per-region configuration of limits on the number of prims one can have in a linkset
...
Applied with changes - patch was based on a repo different from core
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-09 12:59:25 +01:00
d734c1985c
Merge branch 'ubitwork' into avination
2012-09-08 18:03:17 +02:00
a91ca984d5
llClientView: try to have only one thread per client processing
...
RegionHandleRequests. (code assumes packet handle is called async as it is not)
2012-09-08 12:22:40 +01:00
e041f09750
refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
2012-09-08 00:44:27 +01:00
fa3edcf55c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-08 00:17:57 +01:00
874bde366a
4096 is used in various places as the maximum height of a region, refactoring to be a constant
2012-09-08 00:14:39 +01:00
126eae7100
BulletSim: Add Bullet body and shape to BSPhysObject and rename
...
'Body' to 'BSBody' for disambiguation when reading code.
Complete the API2 interface so nearly all methods on bullet
classes are available to the managed code. The efficient
single call simulation step is kept in place while all
other creation/destruction/parameterization can be done
in the managed code.
2012-09-07 16:05:28 -07:00
3c097cb7a9
BulletSim: Add some comments (gasp) and log messages.
2012-09-07 16:05:22 -07:00
189f51233e
BulletSim: PhysicsActorType() now returns the correct value rather than 'unknown'.
2012-09-07 16:05:16 -07:00
76dc29dc37
BulletSim: Modify collision flag calls to return the current flags.
...
Track current collision flags in BSPrim.
Add BulletSimAPI calls for saving and restoring rigidBodies using
construction information structure.
2012-09-07 16:05:11 -07:00
b379e790a2
Set the maximum number of concurrent connections to a service endpoint
...
to 50. This doesn't work on stock mono but it works in Avination and also
under Windoze.
2012-09-07 23:27:40 +02:00
924df14c5e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
717b11856e
Move addin attributes to RegionCombinerModule.addin.xml
...
Will help in automation of setting version info for addin dependencies.
2012-09-07 13:21:06 -04:00
550f6c4ad2
Revert "Move addin information to RegionCombinerModule.addin.xml"
...
This reverts commit ab446bc692
2012-09-07 11:41:47 -04:00
1f18ce516f
Move addin information to RegionCombinerModule.addin.xml
...
Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
2012-09-07 11:07:19 -04:00
2ec34580ce
Move addin information to CoreModulePlugin.addin.xml
...
Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases.
2012-09-07 10:18:00 -04:00
71d2d327d0
One more redundante ParcelProprieties on login
2012-09-07 12:50:38 +01:00
c83dd021f3
stop sending duplicated parcelProprieties at login
2012-09-07 11:37:51 +01:00
23be1cf1cd
remove fireandforget call to EnableChildAgents at end on CompleteMovement,
...
since this is already on own thread and its at the end of it.
2012-09-07 09:40:28 +01:00
288baaecaf
Add warning chevrons around the GC.Collect added to Warp3DImageModule in commit 5eb2526
...
Manually calling GC.Collect() really shouldnt' be necessary and is generally regarded as a bad idea.
A GC should occur anyway pretty shortly afterwards.
However, can leave this in development code for now to see if it does actually make a significant difference rather than simply doing a GC a little earlier.
2012-09-07 00:46:24 +01:00
d2b00749ef
Add missing DynamicTexture.cs file from last commit
2012-09-06 23:14:48 +01:00
8f02fd926e
If reusing dynamic textures, do not reuse small data length textures that fall below current viewer discard level 2 thresholds.
...
Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache.
This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request.
This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true
This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
2012-09-06 22:12:05 +01:00
4215877b48
adding utility method for getting SceneObjectGroup from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:56 -04:00
d2e79e26d7
adding utility method for getting SceneObjectPart from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:46 -04:00
8fe8fdb0c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 05:19:15 -04:00
5eb2526e88
0006270: Warp3D leaks memory on mono based systems
...
Thanks Hiro Lecker for a patch to reduce memory useage with Warp3D map module
2012-09-06 05:18:08 -04:00
fbfd28a61b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 00:16:40 +01:00
a0d0c9f751
If the GetTexture capability receives a request for a range of data beyond that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable.
...
This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests.
This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size.
I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank.
If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution.
However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
2012-09-06 00:11:47 +01:00
641b08aa78
Enables cast from int to float for MOD* functions;
...
Thanks SignpostMarv!
2012-09-05 09:13:16 -07:00
9ae293881a
Make friend notifies and closing child agents async because both can
...
block the heartbeat thread if the sim being contacted is unresponsive
2012-09-04 22:53:52 +02:00
8a537f8f66
Merge branch 'ubitwork' into avination
2012-09-04 13:02:33 +02:00
c298ae9e75
bug fix
2012-09-04 10:51:43 +01:00
d4fad2ba42
a forgotten file plus minor changes. Imp and SL viewer seem to preserve
...
flight. FS 4.2.2 does not.
2012-09-04 07:32:03 +01:00
e1755e2d71
let avatar keep flying in tps to same region. (still bad for other
...
regions )
2012-09-04 04:56:37 +01:00
3fb2523f5b
Remove debug spam
2012-09-04 03:20:37 +02:00
056e66b3de
Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into
...
it's own sub-method
2012-09-04 03:14:39 +02:00
07dbe46ba3
wrapping attachment functions in a region
2012-09-04 00:03:44 +01:00
ff867b59cf
Implementing functing to send messages directly to attachments
2012-09-04 00:03:44 +01:00
d4b8a13a1d
refactoring the grunt work of MessageObject into a private method with a UUID argument
2012-09-04 00:03:44 +01:00
a858c5daee
implementing a function to get the number of attachments worn
2012-09-04 00:03:43 +01:00
8d431c6359
formatting
2012-09-04 00:03:43 +01:00
663bfbb372
although the attachmentPoint argument is a uint, zero is not a valid attachment point
2012-09-04 00:03:43 +01:00
72d20b794a
Revert "made setting rotation match Second Life"
...
This reverts commit f7b88d1c40
2012-09-03 21:54:02 +01:00
f32c74b2ff
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
2012-09-03 21:53:55 +01:00
574a6e3580
Revert "formatting"
...
This reverts commit fb211c64fd
2012-09-03 21:53:46 +01:00
d297eb39e5
Revert "made setting rotation match Second Life"
...
Second Life seems to have introduced a bug, as we have confirmation that SL
behavior changed recently and changed in contradiction to their stated intention
This appears to be another of the bugs SL is notorious for. Signpost and I have
decided to back this out until SL's intention becomes clear.
This reverts commit f7b88d1c40
2012-09-03 21:52:12 +01:00
29218cdb31
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
2012-09-03 21:52:03 +01:00
359f9efc76
Revert "formatting"
...
This reverts commit fb211c64fd
2012-09-03 21:51:54 +01:00
96b50d28f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-09-03 14:05:18 +01:00
fb211c64fd
formatting
2012-09-03 13:55:41 +01:00
a3d140b57c
no need to assign rotation to a variable now
2012-09-03 13:55:40 +01:00
f7b88d1c40
made setting rotation match Second Life
2012-09-03 13:55:40 +01:00
7cfcca87c6
Prevent a nullref if SimStatsReporter tries to report on a sim where psysics are
...
not yet initialized
2012-09-03 13:25:31 +02:00
e2e8b09059
Merge branch 'master' into careminster
2012-09-02 22:15:55 +01:00
63e6666f22
try to reduce potencial recursive locking
2012-09-01 02:05:28 +01:00
39f5fd0f58
Merge branch 'avination' into ubitwork
2012-08-31 22:30:33 +01:00
ffdc798720
BulletSim: Update BulletSimAPI to match the DLL interface.
...
Major rework of terrain management which finally makes mega-regions work.
Update heightmap of terrain by rebuilding the terrain's body and shape.
There is a problem with just replacing the shape so this workaround
will do for the moment but it will need to be resolved for
mesh and hull switching.
2012-08-31 11:41:33 -07:00
ae852bb873
BulletSim: clean up some variable naming for consistancy.
...
Update DLL API for new terrain and shape/body pattern methods.
Terrain creation and modification uses new shape/body pattern.
Move debug logging callback set to initialization call so logging
is per physics engine.
2012-08-31 11:41:28 -07:00
d3adf9b2b3
BulletSim: fix line endings.
2012-08-31 11:41:23 -07:00
7c140570db
BulletSim: Changes to terrain storage and management so mega-regions work.
...
Moved all terrain code out of BSScene and into new BSTerrainManager.
Added logic to manage multiple terrains for mega-regions.
Added new functions to BulletSimAPI to match the library.
Moved all of the terrain creation and setup logic from C++ code to C# code.
The unused code has not yet been removed from either place. Soon.
Moved checks for avatar above ground and in bounds into BSCharacter.
2012-08-31 11:41:18 -07:00
7b6987ce83
BulletSim: unify physical objects under BSPhysObjects. Now BSScene and BSLinkset only know of BSPhysObject's and there is only one list to search in BSScene.
2012-08-31 11:41:12 -07:00
0376b8ddbc
BulletSim: add new interface for mesh, hull and terrain creation that will move nearly all of the logic into the C# code.
2012-08-31 11:41:07 -07:00
cbdfca1460
Merge branch 'master' into careminster
2012-08-31 15:33:42 +01:00
dac31303b7
Type.Type is RuntimeType
2012-08-31 15:33:15 +01:00
c0feaf54de
Merge branch 'master' into careminster
2012-08-31 14:40:30 +01:00
edd3577b66
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-31 14:34:44 +01:00
054db94d5d
formatting
2012-08-31 14:32:33 +01:00
794c5f5a6d
adding support for static method script invocations
2012-08-31 14:32:33 +01:00
b625579780
moving assignment to new line to make next commit easier to read in diffs
2012-08-31 14:32:33 +01:00
7e41559917
using specific type instead of var
2012-08-31 14:32:33 +01:00
8cd415c2b0
formatting
2012-08-31 14:32:32 +01:00
4c58c1b116
formatting
2012-08-31 14:32:32 +01:00
e6f43023b6
adding support for finding static methods
2012-08-31 14:32:32 +01:00
bcf944db48
assign binding flags to variable
2012-08-31 14:32:32 +01:00
7a9eee8538
no need to assign result to GetMethodInfoFromType
2012-08-31 14:32:32 +01:00
05648c2c4a
changing to use Type argument instead of object
2012-08-31 14:32:31 +01:00
dff746df7b
moving code that will be common into private static method
2012-08-31 14:32:31 +01:00
973f2e8be5
adding documentation to script invokation methods
2012-08-31 14:32:31 +01:00
1b15144208
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-08-31 01:32:18 +01:00
3c019bea8c
Implementing a vastly simpler means of allowing region modules to access GetLinkParts than mantis 6236
2012-08-31 01:19:17 +01:00
68814f904e
Replace SendBannedUserList with Avination's version. Untested in core. Not even test compiled.
2012-08-31 00:37:27 +01:00
fd92560649
Merge branch 'avination' into careminster
2012-08-31 00:34:22 +01:00
3ed0d79b00
Make ReuseDynamicTextures an experimental config setting in [Textures]. Default is false, as before.
...
If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them.
This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable).
Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry).
If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated.
CUrrently experimental. Default is false, as before.
2012-08-30 22:57:40 +01:00
d89b974680
If the compile-time DynamicTextureModule.ReuseTextures flag is set, check metadata still exists for any reused asset in case some other process has removed it from the cache.
2012-08-30 22:28:45 +01:00
a7281003d8
move keyframemotion.copy from sop.copy to sog.copy, where there is
...
newgroup information avaiable.
2012-08-30 01:30:56 +01: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
c76c63725b
fixing bug where last element in list is ignored
2012-08-30 00:10:28 +01:00
6b277394c0
refactoring as the list funcs either skip invalid values or recall ToDoubleList
2012-08-30 00:10:28 +01:00
927cbc6762
Merge branch 'ubitwork' into avination
2012-08-30 00:36:37 +02:00
211f4fb411
Sequence inventory descendents requests to reduce inventory server load and
...
movement lag.
2012-08-30 00:34:12 +02:00
3d736d575f
This partially implements the LSL function to set the response
...
type for an HTTP request. Since the "official" LSL function limits
the use of the response type, it is implemented as osSetContentType
with a string for the content mime type and a threat level of high.
With this function you should be able to implement rather functional
media-on-a-prim application with much less difficulty.
2012-08-29 14:56:51 -07: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
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
3d8f393fbe
refactoring to local variable for cleaner code
2012-08-25 21:04:43 +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
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
6e86b23012
implementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParams
2012-08-25 02:30:23 +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
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
a8044999fb
use SceneObjectPart instead of var
2012-08-25 02:30:23 +01:00
3d504261b0
renaming to be similar to equivalent Set command
2012-08-25 02:30:23 +01:00
e04047152f
minor: Fix bad log message for failure to create an inventory folder
2012-08-25 00:49:38 +01:00
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
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
f1a71f544b
Merge branch 'ubitwork' into avination
2012-08-24 23:53:14 +02:00
6d48dbf8ca
Remove debug spam
2012-08-24 23:49:31 +02:00
7e17f4296e
Fix background inventory loading (Viewer 3) so it won't lag out the sim
2012-08-24 23:48:01 +02:00
476996bee8
If a connecting scene presence is replacing an existing scene presence then bypass close checks.
2012-08-24 22:38:07 +01:00
01771aca40
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-24 21:38:46 +01:00
cd325fdf02
Pass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down 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.
2012-08-24 21:36:20 +01:00
67477290ad
stripping superfluous whitespace
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-08-24 17:44:35 +01:00
582a256646
immediately returning the string.Join operation instead of checking if the list has members
2012-08-24 17:44:14 +01:00
d188272462
refactoring using List.ConvertAll<string>
2012-08-24 17:44:14 +01:00
7cdb564fdd
Merge branch 'master' into careminster
2012-08-24 01:22:44 +01:00
82b23f7cc1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-24 01:20:23 +01:00
a08687aef3
Revert "implementing function to allow scripts to self-replicate as if the owner duplicated them, using the same script delay as llRezObject()"
...
This reverts commit 2ad9d656b3
2012-08-24 01:18:35 +01:00
2ad9d656b3
implementing function to allow scripts to self-replicate as if the owner duplicated them, using the same script delay as llRezObject()
2012-08-24 00:21:42 +01:00
1747030d19
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-24 00:16:58 +01:00
c557684666
Fix bad child prim permissions that can make objects change perms after rezzing
...
Port from Avination
2012-08-24 00:15:30 +01:00
a3cbda0d74
Removed land checking as suggested by SignpostMarv.
...
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.
2012-08-24 00:13:27 +01:00
4f3fabae5b
Adds osGetHealth.
...
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.");
}
}
2012-08-24 00:13:14 +01:00
7fca69222b
Merge branch 'avination' into careminster
2012-08-24 00:07:56 +01:00
783773a0c0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-24 00:07:17 +01:00
aede42b875
If a script state save fails for some reason on shutdown/region removal, get xengine to spit out some useful information and continue to save other script states
2012-08-23 23:13:53 +01:00
c1a0c7fad1
Fix bad child prim permissions that can make objects change perms after rezzing
2012-08-23 23:09:32 +02:00
f8603a215d
Merge branch 'master' into careminster
...
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
2012-08-23 01:41:47 +01:00
97c37c370b
Merge branch 'avination' into careminster
2012-08-23 00:12:12 +01:00
4820dfd733
this should be an if-else block in case the non-phys min/max are smaller than the physical min/max
2012-08-22 23:55:01 +01:00
1369058280
Lock disposal of separate gdi+ objects under different threads since this prevents malloc heap corruption seen under Ubuntu 10.04.1 and 11.04 - probably a libcairo issue
...
In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously,
the native malloc heap can become corrupted, possibly due to a double free(). This may be due to
bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX. These problems were
seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1. They go away if disposal is perfomed
under lock.
2012-08-22 23:04:17 +01:00
450207d4d8
Make terrain save every 1000 frames instead of every 50. Database load is a sim killer.
2012-08-22 00:27:54 +02:00
526445c394
Fix group return stuff
2012-08-21 23:28:00 +02:00
9925317239
Fix bug in SoundModule.PlayAttachedSound() where every sound update to an avatar would base its gain calculation on the previous avatar's gain, instead of the original input gain
...
This is similar to commit d89faa which fixed the same kind of bug in TriggerSound()
2012-08-21 22:21:35 +01:00
5273b6880a
Allow updates sent for right pec to go to the client
2012-08-21 21:20:20 +02:00
8d2a37c5a4
Implement seeing busy status in LSL
2012-08-21 20:13:55 +02:00
26224704de
Cause a persistence save if prim flags change
2012-08-21 19:24:41 +02:00
f2ac1b9e8a
Add Camera Offsets to serialization
2012-08-21 16:41:08 +02:00
481c00f50a
refactoring out SetFaceColor
2012-08-20 23:10:25 +01:00
ede3b9ab07
making use of implicit operators and Util.Clip handling of Vector3
2012-08-20 23:10:25 +01:00
b863a15a82
single operation for PRIM_COLOR
2012-08-20 23:10:25 +01:00
aee4353e9c
fix typo
2012-08-20 23:10:25 +01:00
e6fb458597
no-op change for cia.vc test
2012-08-20 22:18:29 +01:00
812c498ef4
When loading an OAR, validate any group UUIDs and properly reconstruct parcel access lists.
...
If a group UUID is present that is not on this simulator then the object or parcel is no longer group owned.
This is a change from previous behaviour where such invalid UUIDs were kept.
This is an adaptation of patch 0002 from http://opensimulator.org/mantis/view.php?id=6105 by Oren Hurvitz of Kitely.
My adaptations are formatting only, apart from the notices about parcel owner IDs not being saved since this has now been fixed.
Thanks Oren.
2012-08-20 22:01:02 +01:00
bcbd450fe4
Add --force flag to "kick user" console command to allow bypassing of recent 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.
2012-08-20 20:24:54 +01:00
9aec62f0ac
Fix scripted detach of temp attachments
2012-08-20 15:59:38 +01:00
df3623b01d
Merge branch 'avination' into careminster
2012-08-20 15:59:28 +01:00
7f7f005da4
Merge branch 'avination' into careminster
2012-08-20 15:58:47 +01:00
f71ed7eb79
Fix scripted detach of temp attachments
2012-08-20 15:35:06 +02:00
dd0556abc9
Fix llDialog responses so that they can be heard throughout the region. This now conforms to the behaviour in SL.
2012-08-19 22:05:38 +01:00
0a959343a5
Make the console output from the reigon console hookable
2012-08-18 22:36:48 +02:00
2efd13ae18
Fix a typo
2012-08-18 22:36:42 +02:00
8769e4ee73
Add a reference to OpenMetaverseType.dll to compiled script assemblies.
2012-08-18 19:08:38 +01:00
914f97cb76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-18 19:01:05 +01:00
d72d599056
integrating redundant code into operator
2012-08-18 18:30:00 +01:00
ca33619e11
Rot2Quaternion is now redundant
2012-08-18 18:30:00 +01:00
ffdde05bb7
constructor means not having to manually refer to individual properties
2012-08-18 18:29:59 +01:00
fb84ff96a9
implicit operators mean one does not need to instantiate new objects manually
2012-08-18 18:29:59 +01:00
52d7af05bc
adding missing refactor for LSL_Vector
2012-08-18 18:29:59 +01:00
2b0c8bc480
Implementing operators & constructors for Quaternion
2012-08-18 18:29:59 +01:00
2a70afeca2
Fix the whitespace formatting error introduced by the last patch
2012-08-18 14:00:10 +01:00
5d43e27de2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-18 13:57:50 +01:00
5d7751da89
refactoring for Vector3 operator & constructor tweaks
2012-08-18 13:21:55 +01:00
aee7a31bc3
Merge branch 'master' into careminster
...
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
2012-08-18 13:17:39 +01:00
9d6fe1224a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-18 12:57:49 +01:00
28d0aff2e3
adding null return to fix building
2012-08-17 23:23:03 +01:00
7068fddd2f
fixing bug that get/set the wrong property for prim types other than sphere & box
2012-08-17 23:23:03 +01:00
466d684fbe
implemented
2012-08-17 23:23:03 +01:00
74f5253a36
attempt to handle InvalidCastException in a manner similar to Second Life
2012-08-17 23:08:24 +01:00
7243d4f842
BulletSim: Properly regenerate hulls when objects made physical.
...
This fixes the problem of non-base shapes (cubes and spheres)
falling through the terrain.
2012-08-17 14:45:18 -07:00
f57c1ac386
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-17 22:31:58 +01:00
0860a0d856
minor: Make xengine debug message on script load a scripting loading message instead.
...
This is more useful if compilation fails due to an uncatchable exception since we know what was being compiled.
2012-08-17 22:30:01 +01:00
03d76e9403
BulletSim: restore most of the Detail logging statements. Will have
...
no effect on non-logging running.
Capture region name that is passed to the physics engine and use
it for detail logging file name prefix.
Fix problem with avatars dropping when flying across region boundries.
2012-08-17 13:34:22 -07:00
5c192b9bab
Modify order of code so SOP doesn't set the physics actor flying
...
property multiple times every time Update is called.
This eliminates zillions of settings which is better for BulletSim.
The should be no functionality change.
2012-08-17 13:34:20 -07:00
ccc69d66a1
BulletSim: add parameters and functionality to specify the mesh
...
level of detail for large meshes.
Remove parameter and code for DetailLog (conditional logging into
regular log file).
2012-08-17 13:34:18 -07:00
8eda290262
BulletSim: comments and parameter changes in dynamics engine.
2012-08-17 13:34:16 -07:00
e31e23d68d
BulletSim: in BSDynamics, merge 'flags' and 'hoverFlags' as they are defined for the same bits and it makes the code less complicated.
2012-08-17 13:34:14 -07:00
99e339dd40
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-17 18:48:35 +01:00
e9ea911563
adding a clip method to handle Vector3 objects to enable a minor amount of refactoring
2012-08-17 18:40:49 +01:00
f9a318380b
let setLinkPrimParams terminate even if there are no more parts.
2012-08-16 22:14:56 +01:00
db3f0a3748
fix vs2010 build
2012-08-16 15:26:16 +01:00
90ad98370a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
9995421df1
Do a proper null check to avoid the overloaded operator == trap
2012-08-16 02:35:03 +01:00
57a9879669
Correct an exception report in SceneObjectPart so it outputs the stack.
2012-08-15 16:39:00 -07:00
376441e550
BulletSim: make it so objects in a linkset do not generate collisions with each other.
2012-08-15 16:29:50 -07:00
bbac8f76fa
Remove AreUpdatesSuspended flag because it does nothing
2012-08-16 01:18:32 +02:00
b97053269b
Change case of areUpdatesSuspended to upper case as is proper for a property
2012-08-16 01:02:20 +02:00
4e5c19595c
Fix casts and calls for link primitive param setting for avatars
2012-08-16 01:01:03 +02:00
5ac77316e0
Remove XML debug spam from vivox voice
2012-08-16 00:59:58 +02:00
ef4122213c
enables configurable minimum sizes for physical & non-physical prims
2012-08-15 23:35:23 +01:00
e286a95d76
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-15 22:59:31 +01:00
684f8208d9
Do a proper null check to avoid the overloaded operator == trap
2012-08-15 23:58:39 +02:00
0aa1f1cc3f
Implementing PRIM_LINK_TARGET in a non-recursive fashion
2012-08-15 22:58:33 +01:00
5a1b6fdf06
Don't enable the thread watchdog until all regions are ready.
...
This is to avoid false positives when the machine is under heavy load whilst starting up.
2012-08-15 22:43:32 +01:00
c313de630f
Add a real_id field to the login response if impersonation is used. The wrapper
...
script needs this for proper logging.
2012-08-15 23:31:38 +02:00
8cd4042f9e
Implementing PRIM_LINK_TARGET in a non-recursive fashion
2012-08-15 23:51:43 +01:00
7679384829
adding ATTACH_*_PEC constants
2012-08-15 22:06:20 +01:00
dd10cf01e7
BulletSim: add hinge constraint.
...
Update BulletSimAPI with new constraint related function calls.
Reorganize locking in BS6DofConstraint.
Update BS6DofConstraint to do constraint reset correctly.
Add new 'midpoint' construction of 6Dof constraint.
2012-08-15 12:08:21 -07:00
9efe7bf7ba
BulletSim: add locking to constraintCollection and rename some of the public method variables to reduce confusion between a physics scene and the real scene.
2012-08-15 12:08:17 -07:00
68f112888b
BulletSim: clean up detail logging by adding many more debug log statements and then commenting out most of the additions.
2012-08-15 12:08:13 -07:00
b05a2fc4ed
BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. Make sure the collisionCollection is reallocated each tick to fix race condition of it being cleared while still in use.
2012-08-15 12:08:09 -07:00
257446889b
BulletSim: fix problem of a null reference exception on shutdown if there were linksets in the region.
2012-08-15 12:08:05 -07:00
77a7758cf5
BulletSim: Refactor BSConstraintCollection to add a new RemoveAndDestroyConstraint(BSConstraint xx)
2012-08-15 12:08:01 -07:00
c1c1d48af1
BulletSim: add BSConstraint.RecomputConstraintVariables for the recomputation after linksets changed, etc
2012-08-15 12:07:57 -07:00
6f1f299619
BulletSim: Add the class BSCharacter to the DetailLog output
2012-08-15 12:07:53 -07:00
11a4b9ec1d
BulletSim: rework physics FPS calculation to make a more realistic number.
2012-08-15 12:07:49 -07:00
ebbf349c6a
Let the temp attachment module add a command to allow attaching without permissions and add support for this (incomplete!) to LSL
2012-08-15 19:37:16 +01:00
c27ff70d5c
Add support for the extra params to scene and the event manager
2012-08-15 18:58:39 +01:00
44dc138d8b
Let the temp attachment module add a command to allow attaching without permissions and add support for this (incomplete!) to LSL
2012-08-15 18:22:52 +02:00
da0f6b926f
Add support for the extra params to scene and the event manager
2012-08-15 18:22:16 +02:00
dc82ad0f7a
Add a skeleton for a name value storage associated with regions
2012-08-15 02:06:22 +01:00
7d1bec00d5
Add a skeleton for a name value storage associated with regions
2012-08-15 01:08:30 +02:00
f6562e2269
Actually add the module
2012-08-14 22:22:25 +01:00
faa710aee1
Allow the use of the region debug console found in recent viewers. This console
...
will be available to estate owners and managers. If the user using the console
had god privs, they can use "set console on" and "set console off" to switch on
the actual region console. This allows console access from within the viewer.
The region debug console can coexist with any other main console.
2012-08-14 22:22:20 +01:00
c42fe6c159
Prevent race conditions when one thread removes an NPC SP before another thread has retreived it after checking whether the NPC exists.
2012-08-14 21:44:06 +01:00
4a969b45bd
Remove NPC debug spam
2012-08-14 22:02:40 +02:00
f21fdff4f9
Actually add the module
2012-08-14 21:58:07 +02:00
195b69d1ea
Allow the use of the region debug console found in recent viewers. This console
...
will be available to estate owners and managers. If the user using the console
had god privs, they can use "set console on" and "set console off" to switch on
the actual region console. This allows console access from within the viewer.
The region debug console can coexist with any other main console.
2012-08-14 21:54:47 +02:00
5546757931
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
2012-08-14 21:37:30 +02:00
66de4a1389
Merge branch 'careminster' into avination
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-08-14 21:44:25 +01:00
9ec35d09f8
Merge branch 'master' into careminster
2012-08-14 21:43:23 +01:00
e81e26498b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-08-14 16:51:47 +01:00
a5b6492223
Perform ownership transfer and permission propagation as well as needed
...
updates on the new temp attachment.
2012-08-14 13:40:13 +01:00
1be072f19e
Move inititalization to RegionLoaded to avoid a module loading order issue
2012-08-14 09:55:44 +01:00
053e7279ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-14 02:11:13 +01:00
20b66cf654
Removed more spammy NPC crap
2012-08-14 03:02:43 +02:00
4bbdcfb5ee
Implement the temp attachments. UNTESTED
2012-08-14 01:45:02 +01:00
Diva Canto