Robert Adams
3c097cb7a9
BulletSim: Add some comments (gasp) and log messages.
2012-09-07 16:05:22 -07:00
Robert Adams
189f51233e
BulletSim: PhysicsActorType() now returns the correct value rather than 'unknown'.
2012-09-07 16:05:16 -07:00
Robert Adams
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
Melanie
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
Melanie
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
BlueWall
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
BlueWall
550f6c4ad2
Revert "Move addin information to RegionCombinerModule.addin.xml"
...
This reverts commit ab446bc692
.
Need to look into this
2012-09-07 11:41:47 -04:00
BlueWall
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
BlueWall
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
UbitUmarov
71d2d327d0
One more redundante ParcelProprieties on login
2012-09-07 12:50:38 +01:00
UbitUmarov
c83dd021f3
stop sending duplicated parcelProprieties at login
2012-09-07 11:37:51 +01:00
UbitUmarov
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
d2b00749ef
Add missing DynamicTexture.cs file from last commit
2012-09-06 23:14:48 +01:00
Justin Clark-Casey (justincc)
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
SignpostMarv
4215877b48
adding utility method for getting SceneObjectGroup from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:56 -04:00
SignpostMarv
d2e79e26d7
adding utility method for getting SceneObjectPart from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:46 -04:00
BlueWall
8fe8fdb0c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 05:19:15 -04:00
BlueWall
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
Justin Clark-Casey (justincc)
fbfd28a61b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 00:16:40 +01:00
Justin Clark-Casey (justincc)
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
Mic Bowman
641b08aa78
Enables cast from int to float for MOD* functions;
...
Thanks SignpostMarv!
2012-09-05 09:13:16 -07:00
Melanie
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
Melanie
8a537f8f66
Merge branch 'ubitwork' into avination
2012-09-04 13:02:33 +02:00
UbitUmarov
c298ae9e75
bug fix
2012-09-04 10:51:43 +01:00
UbitUmarov
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
UbitUmarov
e1755e2d71
let avatar keep flying in tps to same region. (still bad for other
...
regions )
2012-09-04 04:56:37 +01:00
Melanie
3fb2523f5b
Remove debug spam
2012-09-04 03:20:37 +02:00
Melanie
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
SignpostMarv
07dbe46ba3
wrapping attachment functions in a region
2012-09-04 00:03:44 +01:00
SignpostMarv
ff867b59cf
Implementing functing to send messages directly to attachments
2012-09-04 00:03:44 +01:00
SignpostMarv
d4b8a13a1d
refactoring the grunt work of MessageObject into a private method with a UUID argument
2012-09-04 00:03:44 +01:00
SignpostMarv
a858c5daee
implementing a function to get the number of attachments worn
2012-09-04 00:03:43 +01:00
SignpostMarv
8d431c6359
formatting
2012-09-04 00:03:43 +01:00
SignpostMarv
663bfbb372
although the attachmentPoint argument is a uint, zero is not a valid attachment point
2012-09-04 00:03:43 +01:00
Melanie
72d20b794a
Revert "made setting rotation match Second Life"
...
This reverts commit f7b88d1c40
.
2012-09-03 21:54:02 +01:00
Melanie
f32c74b2ff
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
.
2012-09-03 21:53:55 +01:00
Melanie
574a6e3580
Revert "formatting"
...
This reverts commit fb211c64fd
.
2012-09-03 21:53:46 +01:00
Melanie
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
Melanie
29218cdb31
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
.
2012-09-03 21:52:03 +01:00
Melanie
359f9efc76
Revert "formatting"
...
This reverts commit fb211c64fd
.
2012-09-03 21:51:54 +01:00
Melanie
96b50d28f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-09-03 14:05:18 +01:00
SignpostMarv
fb211c64fd
formatting
2012-09-03 13:55:41 +01:00
SignpostMarv
a3d140b57c
no need to assign rotation to a variable now
2012-09-03 13:55:40 +01:00
SignpostMarv
f7b88d1c40
made setting rotation match Second Life
2012-09-03 13:55:40 +01:00
Melanie
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
Melanie
e2e8b09059
Merge branch 'master' into careminster
2012-09-02 22:15:55 +01:00
UbitUmarov
63e6666f22
try to reduce potencial recursive locking
2012-09-01 02:05:28 +01:00
UbitUmarov
39f5fd0f58
Merge branch 'avination' into ubitwork
2012-08-31 22:30:33 +01:00
Robert Adams
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
Robert Adams
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
Robert Adams
d3adf9b2b3
BulletSim: fix line endings.
2012-08-31 11:41:23 -07:00
Robert Adams
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
Robert Adams
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
Robert Adams
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
Melanie
cbdfca1460
Merge branch 'master' into careminster
2012-08-31 15:33:42 +01:00
SignpostMarv
dac31303b7
Type.Type is RuntimeType
2012-08-31 15:33:15 +01:00
Melanie
c0feaf54de
Merge branch 'master' into careminster
2012-08-31 14:40:30 +01:00
Melanie
edd3577b66
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-31 14:34:44 +01:00
SignpostMarv
054db94d5d
formatting
2012-08-31 14:32:33 +01:00
SignpostMarv
794c5f5a6d
adding support for static method script invocations
2012-08-31 14:32:33 +01:00
SignpostMarv
b625579780
moving assignment to new line to make next commit easier to read in diffs
2012-08-31 14:32:33 +01:00
SignpostMarv
7e41559917
using specific type instead of var
2012-08-31 14:32:33 +01:00
SignpostMarv
8cd415c2b0
formatting
2012-08-31 14:32:32 +01:00
SignpostMarv
4c58c1b116
formatting
2012-08-31 14:32:32 +01:00
SignpostMarv
e6f43023b6
adding support for finding static methods
2012-08-31 14:32:32 +01:00
SignpostMarv
bcf944db48
assign binding flags to variable
2012-08-31 14:32:32 +01:00
SignpostMarv
7a9eee8538
no need to assign result to GetMethodInfoFromType
2012-08-31 14:32:32 +01:00
SignpostMarv
05648c2c4a
changing to use Type argument instead of object
2012-08-31 14:32:31 +01:00
SignpostMarv
dff746df7b
moving code that will be common into private static method
2012-08-31 14:32:31 +01:00
SignpostMarv
973f2e8be5
adding documentation to script invokation methods
2012-08-31 14:32:31 +01:00
Melanie
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
SignpostMarv
3c019bea8c
Implementing a vastly simpler means of allowing region modules to access GetLinkParts than mantis 6236
2012-08-31 01:19:17 +01:00
Melanie
68814f904e
Replace SendBannedUserList with Avination's version. Untested in core. Not even test compiled.
2012-08-31 00:37:27 +01:00
Melanie
fd92560649
Merge branch 'avination' into careminster
2012-08-31 00:34:22 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
UbitUmarov
a7281003d8
move keyframemotion.copy from sop.copy to sog.copy, where there is
...
newgroup information avaiable.
2012-08-30 01:30:56 +01:00
UbitUmarov
1eb7d963cf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 00:31:03 +01:00
UbitUmarov
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
SignpostMarv
c76c63725b
fixing bug where last element in list is ignored
2012-08-30 00:10:28 +01:00
SignpostMarv
6b277394c0
refactoring as the list funcs either skip invalid values or recall ToDoubleList
2012-08-30 00:10:28 +01:00
Melanie
927cbc6762
Merge branch 'ubitwork' into avination
2012-08-30 00:36:37 +02:00
Melanie
211f4fb411
Sequence inventory descendents requests to reduce inventory server load and
...
movement lag.
2012-08-30 00:34:12 +02:00
Mic Bowman
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
Melanie
67f18655d5
Allow llList2Key to also act on System.String
2012-08-29 22:06:43 +02:00
Melanie
f7a60261e9
Merge branch 'ubitwork' into avination
2012-08-29 11:46:57 +02:00
Melanie
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
Melanie
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
Melanie
f671e446bf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 11:18:32 +02:00
Melanie
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
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
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
SignpostMarv
3d8f393fbe
refactoring to local variable for cleaner code
2012-08-25 21:04:43 +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
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
SignpostMarv
6e86b23012
implementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParams
2012-08-25 02:30:23 +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
3d504261b0
renaming to be similar to equivalent Set command
2012-08-25 02:30:23 +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
Melanie
7e17f4296e
Fix background inventory loading (Viewer 3) so it won't lag out the sim
2012-08-24 23:48:01 +02:00
Justin Clark-Casey (justincc)
476996bee8
If a connecting scene presence is replacing an existing scene presence then bypass close checks.
2012-08-24 22:38:07 +01:00
Justin Clark-Casey (justincc)
01771aca40
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-24 21:38:46 +01:00
Justin Clark-Casey (justincc)
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
SignpostMarv
67477290ad
stripping superfluous whitespace
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-08-24 17:44:35 +01:00
SignpostMarv
582a256646
immediately returning the string.Join operation instead of checking if the list has members
2012-08-24 17:44:14 +01:00
SignpostMarv
d188272462
refactoring using List.ConvertAll<string>
2012-08-24 17:44:14 +01:00
Melanie
7cdb564fdd
Merge branch 'master' into careminster
2012-08-24 01:22:44 +01:00
Justin Clark-Casey (justincc)
82b23f7cc1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-24 01:20:23 +01:00
Justin Clark-Casey (justincc)
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
.
Reverted pending consideration of associated issues.
2012-08-24 01:18:35 +01:00
SignpostMarv
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
Melanie
1747030d19
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-24 00:16:58 +01:00
Melanie
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
TBG Renfold
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
TBG Renfold
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
Melanie
7fca69222b
Merge branch 'avination' into careminster
2012-08-24 00:07:56 +01:00
Melanie
783773a0c0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-24 00:07:17 +01:00
Justin Clark-Casey (justincc)
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
Melanie
c1a0c7fad1
Fix bad child prim permissions that can make objects change perms after rezzing
2012-08-23 23:09:32 +02:00
Melanie
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
Melanie
97c37c370b
Merge branch 'avination' into careminster
2012-08-23 00:12:12 +01:00
SignpostMarv
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
Justin Clark-Casey (justincc)
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
Melanie
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
Melanie
526445c394
Fix group return stuff
2012-08-21 23:28:00 +02:00
Justin Clark-Casey (justincc)
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
Melanie
5273b6880a
Allow updates sent for right pec to go to the client
2012-08-21 21:20:20 +02:00
Melanie
8d2a37c5a4
Implement seeing busy status in LSL
2012-08-21 20:13:55 +02:00
Melanie
26224704de
Cause a persistence save if prim flags change
2012-08-21 19:24:41 +02:00
Melanie
f2ac1b9e8a
Add Camera Offsets to serialization
2012-08-21 16:41:08 +02:00
SignpostMarv
481c00f50a
refactoring out SetFaceColor
2012-08-20 23:10:25 +01:00
SignpostMarv
ede3b9ab07
making use of implicit operators and Util.Clip handling of Vector3
2012-08-20 23:10:25 +01:00
SignpostMarv
b863a15a82
single operation for PRIM_COLOR
2012-08-20 23:10:25 +01:00
SignpostMarv
aee4353e9c
fix typo
2012-08-20 23:10:25 +01:00
Justin Clark-Casey (justincc)
e6fb458597
no-op change for cia.vc test
2012-08-20 22:18:29 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
9aec62f0ac
Fix scripted detach of temp attachments
2012-08-20 15:59:38 +01:00
Melanie
df3623b01d
Merge branch 'avination' into careminster
2012-08-20 15:59:28 +01:00
Melanie
7f7f005da4
Merge branch 'avination' into careminster
2012-08-20 15:58:47 +01:00
Melanie
f71ed7eb79
Fix scripted detach of temp attachments
2012-08-20 15:35:06 +02:00
Melanie
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
Melanie
0a959343a5
Make the console output from the reigon console hookable
2012-08-18 22:36:48 +02:00
Melanie
2efd13ae18
Fix a typo
2012-08-18 22:36:42 +02:00
Melanie
8769e4ee73
Add a reference to OpenMetaverseType.dll to compiled script assemblies.
2012-08-18 19:08:38 +01:00
Melanie
914f97cb76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-18 19:01:05 +01:00
SignpostMarv
d72d599056
integrating redundant code into operator
2012-08-18 18:30:00 +01:00
SignpostMarv
ca33619e11
Rot2Quaternion is now redundant
2012-08-18 18:30:00 +01:00
SignpostMarv
ffdde05bb7
constructor means not having to manually refer to individual properties
2012-08-18 18:29:59 +01:00
SignpostMarv
fb84ff96a9
implicit operators mean one does not need to instantiate new objects manually
2012-08-18 18:29:59 +01:00
SignpostMarv
52d7af05bc
adding missing refactor for LSL_Vector
2012-08-18 18:29:59 +01:00
SignpostMarv
2b0c8bc480
Implementing operators & constructors for Quaternion
2012-08-18 18:29:59 +01:00
Melanie
2a70afeca2
Fix the whitespace formatting error introduced by the last patch
2012-08-18 14:00:10 +01:00
Melanie
5d43e27de2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-18 13:57:50 +01:00
SignpostMarv
5d7751da89
refactoring for Vector3 operator & constructor tweaks
2012-08-18 13:21:55 +01:00
Melanie
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
Melanie
9d6fe1224a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-18 12:57:49 +01:00
SignpostMarv
28d0aff2e3
adding null return to fix building
2012-08-17 23:23:03 +01:00
SignpostMarv
7068fddd2f
fixing bug that get/set the wrong property for prim types other than sphere & box
2012-08-17 23:23:03 +01:00
SignpostMarv
466d684fbe
implemented
2012-08-17 23:23:03 +01:00
SignpostMarv
74f5253a36
attempt to handle InvalidCastException in a manner similar to Second Life
2012-08-17 23:08:24 +01:00
Robert Adams
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
Justin Clark-Casey (justincc)
f57c1ac386
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-17 22:31:58 +01:00
Justin Clark-Casey (justincc)
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
Robert Adams
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
Robert Adams
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
Robert Adams
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
Robert Adams
8eda290262
BulletSim: comments and parameter changes in dynamics engine.
2012-08-17 13:34:16 -07:00
Robert Adams
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
Justin Clark-Casey (justincc)
99e339dd40
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-17 18:48:35 +01:00
SignpostMarv
e9ea911563
adding a clip method to handle Vector3 objects to enable a minor amount of refactoring
2012-08-17 18:40:49 +01:00
UbitUmarov
f9a318380b
let setLinkPrimParams terminate even if there are no more parts.
2012-08-16 22:14:56 +01:00
UbitUmarov
db3f0a3748
fix vs2010 build
2012-08-16 15:26:16 +01:00
Melanie
90ad98370a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
Melanie
9995421df1
Do a proper null check to avoid the overloaded operator == trap
2012-08-16 02:35:03 +01:00
Robert Adams
57a9879669
Correct an exception report in SceneObjectPart so it outputs the stack.
2012-08-15 16:39:00 -07:00
Robert Adams
376441e550
BulletSim: make it so objects in a linkset do not generate collisions with each other.
2012-08-15 16:29:50 -07:00
Melanie
bbac8f76fa
Remove AreUpdatesSuspended flag because it does nothing
2012-08-16 01:18:32 +02:00
Melanie
b97053269b
Change case of areUpdatesSuspended to upper case as is proper for a property
2012-08-16 01:02:20 +02:00
Melanie
4e5c19595c
Fix casts and calls for link primitive param setting for avatars
2012-08-16 01:01:03 +02:00
Melanie
5ac77316e0
Remove XML debug spam from vivox voice
2012-08-16 00:59:58 +02:00
SignpostMarv
ef4122213c
enables configurable minimum sizes for physical & non-physical prims
2012-08-15 23:35:23 +01:00
Melanie
e286a95d76
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-15 22:59:31 +01:00
Melanie
684f8208d9
Do a proper null check to avoid the overloaded operator == trap
2012-08-15 23:58:39 +02:00
SignpostMarv
0aa1f1cc3f
Implementing PRIM_LINK_TARGET in a non-recursive fashion
2012-08-15 22:58:33 +01:00
Justin Clark-Casey (justincc)
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
Melanie
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
SignpostMarv
8cd4042f9e
Implementing PRIM_LINK_TARGET in a non-recursive fashion
2012-08-15 23:51:43 +01:00
SignpostMarv
7679384829
adding ATTACH_*_PEC constants
2012-08-15 22:06:20 +01:00
Robert Adams
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
Robert Adams
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
Robert Adams
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
Robert Adams
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
Robert Adams
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
Robert Adams
77a7758cf5
BulletSim: Refactor BSConstraintCollection to add a new RemoveAndDestroyConstraint(BSConstraint xx)
2012-08-15 12:08:01 -07:00
Robert Adams
c1c1d48af1
BulletSim: add BSConstraint.RecomputConstraintVariables for the recomputation after linksets changed, etc
2012-08-15 12:07:57 -07:00
Robert Adams
6f1f299619
BulletSim: Add the class BSCharacter to the DetailLog output
2012-08-15 12:07:53 -07:00
Robert Adams
11a4b9ec1d
BulletSim: rework physics FPS calculation to make a more realistic number.
2012-08-15 12:07:49 -07:00
Melanie
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
Melanie
c27ff70d5c
Add support for the extra params to scene and the event manager
2012-08-15 18:58:39 +01:00
Melanie
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
Melanie
da0f6b926f
Add support for the extra params to scene and the event manager
2012-08-15 18:22:16 +02:00
Melanie
dc82ad0f7a
Add a skeleton for a name value storage associated with regions
2012-08-15 02:06:22 +01:00
Melanie
7d1bec00d5
Add a skeleton for a name value storage associated with regions
2012-08-15 01:08:30 +02:00
Melanie
f6562e2269
Actually add the module
2012-08-14 22:22:25 +01:00
Melanie
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
Justin Clark-Casey (justincc)
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
Melanie
4a969b45bd
Remove NPC debug spam
2012-08-14 22:02:40 +02:00
Melanie
f21fdff4f9
Actually add the module
2012-08-14 21:58:07 +02:00
Melanie
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
Melanie
5546757931
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
2012-08-14 21:37:30 +02:00
Melanie
66de4a1389
Merge branch 'careminster' into avination
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-08-14 21:44:25 +01:00
Melanie
9ec35d09f8
Merge branch 'master' into careminster
2012-08-14 21:43:23 +01:00
Melanie
e81e26498b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-08-14 16:51:47 +01:00
Melanie
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
Melanie
1be072f19e
Move inititalization to RegionLoaded to avoid a module loading order issue
2012-08-14 09:55:44 +01:00
Melanie
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
Melanie
20b66cf654
Removed more spammy NPC crap
2012-08-14 03:02:43 +02:00
Melanie
4bbdcfb5ee
Implement the temp attachments. UNTESTED
2012-08-14 01:45:02 +01:00
Melanie
12a329eb85
Comment spammy debug
2012-08-14 02:28:23 +02:00
Melanie
9b014a7167
Merge branch 'careminster' into avination
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
2012-08-14 02:34:03 +01:00
Melanie
9bd2c1b88a
As per lindn spec, disable detach and drop for temp attachments
2012-08-14 01:12:27 +01:00
Melanie
62acfabec4
Add the skeleton for the temp attachments module
2012-08-14 00:54:12 +01:00
Melanie
fe4c3a37c0
Lay some groundwork for temp attachments. Decouple attachments from inventory.
2012-08-14 00:12:15 +01:00
Melanie
2a5077ef7e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-13 19:20:47 +01:00
SignpostMarv
58c630c18e
attempt at replicating behaviour of llList2thing functions in SL
...
Committed with changes. Please don't sign comments with your name. Please
don't use your own coding style, use the OpenSim project style. Please
don't modify unrelated whitespace.
Signed-off-by: Melanie <melanie@t-data.com>
2012-08-13 19:17:19 +01:00
Melanie
93e3ab3ebd
Merge branch 'master' into careminster
2012-08-11 17:32:30 +01:00
Robert Adams
0c7ce4fc98
BulletSim: many, many detailed logging messages for physical linkset
...
debugging.
Linkset bugs fixed where accounting of children would get lost.
Moved scene based vehicle tracking logic from prim to the scene.
Added GetCollisionFlags2 method to BulletSimAPI.
Updated DLLs and SOs.
2012-08-10 16:22:44 -07:00
Robert Adams
3ca770cd2c
BulletSim: Add module names to DetailLog output. Fix some problems with linksets that were caused by checking data structures that are changed regularly from taint time code -- resulted in linksets not being unlinked properly.
2012-08-10 08:33:09 -07:00
Robert Adams
320982cae3
BulletSim: add an identifier to the TaintObject call so exceptions that happen when the taint is invoked can be debugged
2012-08-09 15:17:19 -07:00
Robert Adams
38e79b80a8
BulletSim: separate out the constraints by type. The linksets use
...
6dof constraint but eventually others will be exposed so future
features can use all the Bullet capabilities.
Force children to generate a position update when unlinked.
2012-08-09 15:01:05 -07:00
Melanie
6ed3761147
Merge branch 'master' into careminster
2012-08-09 02:37:49 +01:00
Robert Adams
5ab151c2d6
BulletSim: add avatar code to keep avatars from ending up trapped under the terrain
2012-08-08 13:48:49 -07:00
Robert Adams
19417fca41
BulletSim: Added avatar capsule scaling for size of avatar.
...
This also fixes computation of avatar mass.
Added parameter MaxPersistantManifoldPoolSize.
Fixed a parameter setting bug which caused crashes of there were
more than 400 or so physical objects. I tested up to 5000.
Updated BulletSim DLLs and SOs.
2012-08-07 17:15:06 -07:00
UbitUmarov
fef07b807d
Merge branch 'avination' into ubitwork
2012-08-07 21:59:21 +01:00
Melanie
96922543b4
Merge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster into avination
2012-08-07 20:49:49 +01:00
Melanie
1c51ae662c
Release http-in URLs when llResetScript is called
2012-08-07 20:49:26 +01:00
Melanie
d85c49c98b
Merge branch 'master' into careminster
2012-08-07 20:48:57 +01:00
Melanie
926c0b90a1
Release http-in URLs when llResetScript is called
2012-08-07 20:48:22 +01:00
Melanie
85b4eab005
Merge branch 'master' into careminster
2012-08-07 20:20:28 +01:00
UbitUmarov
eef6bb97c0
use a bit more complex mesh key identifier, plus a bug fix
2012-08-07 17:42:29 +01:00
Robert Adams
4adb3471ac
BulletSim: update SOs and DLLs to run on more Linux versions. Correct multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
2012-08-06 12:55:52 -07:00
UbitUmarov
36a1248b31
** DANGER someone should stress test more ** release unused physics meshs, including unmanaged memory allocations (allocated by managed code)
2012-08-06 09:06:46 +01:00
UbitUmarov
307c45af2a
bug fix: keep sculpt bitmaps border pixels during resolution scaling.
...
let this eventually have diferent interpolator last steps on each direction as sl seems to do.
2012-08-05 12:54:34 +01:00
UbitUmarov
493309d91a
ubitmeshing: mask out mirror and invert bits on sculpttype convertion.
...
Remove some unused
2012-08-05 10:37:25 +01:00
UbitUmarov
92d44446fa
*feature test* ubitode, let convex hull shape type work for prims other
...
than uploaded meshs, making it change the mesh level of detail from high to low.
This will work on all prims that get a internal mesh or sculpts. Mesh size
reduction will depend on particular shape. This is not as SL. There prims
do also get concave areas. Uploaded meshs work as before. A normal 10x10x10 torus gets 152 vertices in place of 900, and 198 faces in place of 1198.
2012-08-04 17:33:14 +01:00
UbitUmarov
8ad1d79003
fix build on win
2012-08-04 11:07:30 +01:00
Melanie
b9c4a637b4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-08-04 03:00:20 +01:00
Justin Clark-Casey (justincc)
374ebab574
Strip experimental tag from --publish option of "save oar" region console command
2012-08-03 23:54:17 +01:00
Justin Clark-Casey (justincc)
fb91ca6f1d
Fix old regression that stopped saving parcel owner data in OARs.
...
This was working in 0.7.2 but was accidentally removed from 0.7.3.
The --publish option for "save oar" will now save oars stripped of parcel owner information as well as scene object info.
Please use the --publish option if you want to publish oars that may be later loaded by others to the same grid from which they were saved.
2012-08-03 23:49:34 +01:00
Justin Clark-Casey (justincc)
2724cf685e
Fix build break.
2012-08-03 23:13:19 +01:00
Robert Adams
8730dc9d6a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-03 15:10:55 -07:00
Robert Adams
e7ad6ed3a3
BulletSim: pass collision subscription information to the C++ code so collisions on objects that don't care are not reported up.
2012-08-03 15:09:56 -07:00
Robert Adams
ea36d4a4cf
BulletSim: Add AddObjectForce to BulletSim API.
...
Add interface 2 enhancements to BSCharacter.
Modify AddForce and SetForce to use the new Bullet interface.
More DetailLog statements for character.
2012-08-03 15:09:52 -07:00
Justin Clark-Casey (justincc)
0e3b08fa5b
Update settings loading in AvatarFactoryModule which should have been in last commit 205f2326
2012-08-03 23:09:47 +01:00
Justin Clark-Casey (justincc)
205f2326dc
Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket.
...
All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
2012-08-03 23:02:39 +01:00
Justin Clark-Casey (justincc)
5914270ff1
Restore SOG constructor chaining removed in recent 513b77b
. This is not a functional change.
2012-08-03 22:15:06 +01:00
Justin Clark-Casey (justincc)
faffe2f2f9
Fix the recent windows compile error by putting newFont for case "R" in VectorRenderModule inside its own context, rather than disposing of the old font before using it as a prototype for the new.
2012-08-03 22:03:04 +01:00
Justin Clark-Casey (justincc)
8327e048b9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-03 21:56:48 +01:00
Justin Clark-Casey (justincc)
789e88d8bd
Move previously unadvertised SendPeriodicAppearanceUpdates setting from [Startup] to [Appearance] config section.
...
Add description and default of false (as before) to OpenSimDefaults.ini
If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds.
For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent.
However, this switch will not help with other appearance failure situations (e.g. failure to bake assets).
This setting is experimental but will not have any significant impact on the simulator if turned to true.
2012-08-03 21:36:00 +01:00
SignpostMarv
5181bdae0a
attempting to fix a build issue
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-08-03 16:14:01 -04:00
Melanie
7ff812066f
Merge branch 'ubitwork' into avination
2012-08-03 19:53:41 +02:00
UbitUmarov
b95caaa453
on presence close(), release animator and OnRegionHeartbeatEnd event
2012-08-03 20:13:51 +01:00
Melanie
eb4c092cac
Merge branch 'careminster' into avination
2012-08-03 16:48:06 +01:00
Melanie
0c00abcce1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-08-03 16:46:11 +01:00
Melanie
83deb46032
Make WaitGetScenePresence wait for up to 20 seconds
2012-08-03 16:03:40 +02:00
Melanie
b8ba224b4f
Remove another superflouous IsActive set
2012-08-03 15:33:30 +02:00
Melanie
d677db338d
Remove a merge artefaci in IsActive handling and restore commented out correct one
2012-08-03 15:22:53 +02:00
UbitUmarov
a4c59b1fd2
minor change avoiding a null reference
2012-08-03 15:21:29 +01:00
UbitUmarov
879d1cefb8
clientview IsActive use is broken. Suspend it's use keeping it true ( to
...
review later)
2012-08-03 15:19:31 +01:00
Justin Clark-Casey (justincc)
513b77b78d
refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.
2012-08-03 02:26:54 +01:00
Justin Clark-Casey (justincc)
08ec18f8a3
Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this is already its default value as it's a struct.
2012-08-03 02:08:04 +01:00
SignpostMarv
cd9fd77e2c
ImprovedTerseObjectUpdate packet does not support shape updates, thus scheduling terse updates will not (and does not) update shape information in the viewer
2012-08-03 01:55:46 +01:00
Melanie
3460319f1e
Make sure the position of a loggin-in agent is within region boundaries since
...
out of bounds positions cause a rejection of the login.
2012-08-03 02:20:57 +02:00
Oren Hurvitz
0588f27d18
Fixed a rare bug that caused Save OAR to fail because it thought it had timed-out
...
The bug manifested as follows: a large world was saved. All the assets were found. But for some unknown reason, the timeout timer was restarted. So after 1 minute it closed the Archive Writer, because it didn't receive any more assets during that minute. That caused the OAR to become corrupted because ArchiveWriteRequestExecution.Save() was still running.
2012-08-03 01:12:46 +01:00
Kevin Cozens
72075e68c7
Save membership fee to the database when a group is created.
2012-08-03 00:44:03 +01:00
Robert Adams
8b04e8a297
BulletSim: Debugging log statements added. Reduced size of updata buffer trying to find a corrupted memory problem. Update DLL and SO.
2012-08-02 16:30:23 -07:00
Justin Clark-Casey (justincc)
0cd698d82b
Delete old blank SOGSpamTest
2012-08-03 00:23:03 +01:00
Justin Clark-Casey (justincc)
eeef9d7e99
Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic textures.
...
The convention is that if an object implements IDiposable() the code must explicitly call Dispose() or call it via the using statement.
This may be particularly important for GDI+ objects since they encapsulate native code entities.
2012-08-03 00:00:54 +01:00
Justin Clark-Casey (justincc)
0dfccfc1d9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-02 23:54:32 +01:00
Melanie
68406ab8f9
Initialize the Rezzing object to UUID.Zero
2012-08-02 22:34:46 +01:00
Justin Clark-Casey (justincc)
86b005de1d
Add simple draw test for the VectorRenderModule
2012-08-02 22:14:09 +01:00
SignpostMarv
cd2c5843a8
reduced-complexity implementation of function to get rezzing object key
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-08-02 22:12:36 +01:00
Melanie
ecffcf7f65
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2012-08-01 23:03:03 +01:00
Melanie
cf16ca9bda
Create the ability for physics modules to request assets on demand by
...
themselves. For that, the physics module simply calls RequestAssetMethod, which
in turn points to Scene.PhysicsRequestAsset. This gives physics access to
the asset system without introducing unwanted knowledge of the scene class.
2012-08-01 22:37:38 +01:00
Justin Clark-Casey (justincc)
69a5beeabc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-01 00:40:31 +01:00
Justin Clark-Casey (justincc)
794363421d
Look up the NPC module when the SensorRepeat class is created, rather than on every single sensor sweep.
2012-08-01 00:39:37 +01:00
Robert Adams
c51ef38e2d
BulletSim: fix problem where resizing a primary shape (cube or sphere) would not rebuild the physics mesh. Update the DLLs and SOs to latest version.
2012-07-31 16:23:52 -07:00
Robert Adams
e38d26a2dc
BulletSim: change boolean parameters in the shape data from int's to float's to be consistant with parameter data structure
2012-07-31 16:23:48 -07:00
Melanie
8114260946
Merge branch 'master' into careminster
2012-08-01 00:08:02 +01:00
Melanie
70996603e5
Merge branch 'avination' into careminster
2012-08-01 00:07:57 +01:00
Justin Clark-Casey (justincc)
7609daca38
Resolve a deadlock between INPCModule and SensorRepeat by replacing the SensorRepeat list with a new list on add/removes rather than locking it for the duration of the sensor sweep.
...
A deadlock was observed today where NPC removal on a script thread would lock the NPC list and then try to lock the sensor list via scripted attachment removal.
Concurrently, the sensor sweep thread would lock the sensor list and then try to lock the NPC list to check NPC status.
This commit resolves the deadlock by replacing the sensor list on update rather than locking it for the duration of the sweep.
2012-07-31 23:57:57 +01:00
Justin Clark-Casey (justincc)
d89faa3c16
Fix bug in SoundModule.TriggerSound() 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 was making sound attenuate oddly when there were NPCs in the region, though it could also happen with ordinary avatars.
2012-07-31 22:52:17 +01:00
Melanie
ef3166d4fe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-31 23:38:47 +02:00
Melanie
e40e1dc9e6
Reverse a senseless change in the prioritizer. Why I would want avatars to render according to their camera position is beyond me.
2012-07-31 23:38:01 +02:00
Mic Bowman
a76a289d11
Adds support to ScriptModuleComms for region modules to export
...
constants to the script engine.
2012-07-31 10:45:37 -07:00
Robert Adams
50dbb9ffe4
BulletSim: add parameters and API calls for setting ERP and CFM.
...
Set ERP and CFM in linkset constraints.
Reorder rebuilding of object bodies so they are not rebuilt everytime
something is linked and unlinked.
2012-07-31 09:23:05 -07:00
Melanie
bd262fe3ed
Correct StandUp position and rotation
2012-07-30 03:05:57 +02:00
Melanie
e012c81d7c
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-29 16:11:20 +01:00
Melanie
277491d871
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-29 16:10:45 +01:00
Melanie
3f6dfa92ab
Return world rotation on llGetObjectDetails()'s OBJECT_ROT
2012-07-29 16:05:35 +01:00
Melanie
88d68e68c1
Return world rotation on llGetObjectDetails()'s OBJECT_ROT
2012-07-29 15:40:31 +02:00
Melanie
30784ab9e1
Fix an exception while outputting a log message
2012-07-29 15:12:03 +02:00
Melanie
659be9dd50
When controls are released by script, don't drop the permission to
...
retake them.
2012-07-29 15:11:39 +02:00
Melanie
729046e1ad
See that if controls are taken, those are released before taking new ones
2012-07-29 15:10:12 +02:00
Melanie
9163cdd7c1
Bump number of URLs to 15000 per region
2012-07-29 15:09:42 +02:00
Melanie
45b72bf01c
Fix some merge issues and a functional issue in the scene manager
2012-07-28 01:06:28 +01:00
Melanie
771d79e83e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
2012-07-28 00:39:36 +01:00
SignpostMarv
72d29bdb40
LSL/OSSL lacks Math.Min & Math.Max implementations.
2012-07-28 00:09:11 +01:00
Justin Clark-Casey (justincc)
7e89b99e6a
Avoid a race condition between the scene shutdown thread and the update thread since commit c150320
(Thu Jul 26 15:27:18 2012)
...
c150320
started explicitly disposing of the physics scene and nulling it out on region shutdown.
However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation.
This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked.
This should not affect the few other places that use this flag.
2012-07-27 23:58:53 +01:00
Justin Clark-Casey (justincc)
d4f476c7ce
Remove the LandGeom checks in OdeScene - these are pointless since LandGeom is always IntPtr.Zero and contacts returned always have a valid geometry.
...
Possibly this was for a feature that was never implemented or was otherwise removed.
Thanks to SignpostMarv for the spot of the warning that shows this parameter was never changed.
2012-07-27 23:31:19 +01:00
Justin Clark-Casey (justincc)
0d9afad3fe
Remove duplicated IScenePresence.PresenceType. This is already in ISceneAgent.PresenceType from which IScenePresence inherits.
...
No other code changes required.
2012-07-27 22:15:25 +01:00
Justin Clark-Casey (justincc)
1133f81dce
Remove a couple of compiler warnings pointed out by SignpostMarv
2012-07-27 20:40:25 +01:00
Melanie
9f6236f5bf
Implement the linefeed URL hack for ShoutCast and other services
2012-07-27 12:10:04 +02:00
Melanie
be22e3599c
Change the stair fudge factor so steps of 0.5m can be climbled to match inworldz claims and SL's realities
2012-07-27 03:24:45 +02:00
Justin Clark-Casey (justincc)
5f741143fd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-27 00:30:04 +01:00
Justin Clark-Casey (justincc)
21b1fec32d
Fix issue where RegionCombinerModule was not removing regions from its dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded).
2012-07-27 00:28:23 +01:00
Robert Adams
ce812c88cc
BulletSim: fix a recursive loop when fetching the mass of the root of a linkset.
2012-07-26 16:06:00 -07:00
Robert Adams
7d30637d51
BulletSim: refactor all the linkset logic out of the prim class
...
and into its own class. The BulletSim data structures track
individual prims as linksets of 1 so most of the prim code is not
different between a linked and unlinked object.
2012-07-26 16:05:57 -07:00